Browse Source

resolve comments

pull/7630/head
KenTandrian 2 days ago
parent
commit
1bb2b3d010
  1. 37
      apps/api/src/app/auth/api-key.strategy.ts
  2. 3
      apps/api/src/app/auth/auth.module.ts
  3. 2
      apps/api/src/app/auth/oidc-state.store.ts

37
apps/api/src/app/auth/api-key.strategy.ts

@ -56,31 +56,20 @@ export class ApiKeyStrategy extends PassportStrategy(
} }
private async validateApiKey(apiKey: string) { private async validateApiKey(apiKey: string) {
if (!apiKey) { if (apiKey) {
throw new HttpException( try {
getReasonPhrase(StatusCodes.UNAUTHORIZED), const { id } = await this.apiKeyService.getUserByApiKey(apiKey);
StatusCodes.UNAUTHORIZED const user = await this.userService.user({ id });
);
}
try {
const { id } = await this.apiKeyService.getUserByApiKey(apiKey);
const user = await this.userService.user({ id });
if (!user) {
throw new HttpException(
getReasonPhrase(StatusCodes.UNAUTHORIZED),
StatusCodes.UNAUTHORIZED
);
}
return user; if (user) {
} catch { return user;
throw new HttpException( }
getReasonPhrase(StatusCodes.UNAUTHORIZED), } catch {}
StatusCodes.UNAUTHORIZED
);
} }
throw new HttpException(
getReasonPhrase(StatusCodes.UNAUTHORIZED),
StatusCodes.UNAUTHORIZED
);
} }
} }

3
apps/api/src/app/auth/auth.module.ts

@ -117,10 +117,11 @@ import { OidcStrategy } from './oidc.strategy';
const clientID = configurationService.get('OIDC_CLIENT_ID'); const clientID = configurationService.get('OIDC_CLIENT_ID');
const clientSecret = configurationService.get('OIDC_CLIENT_SECRET'); const clientSecret = configurationService.get('OIDC_CLIENT_SECRET');
if (!issuer || !clientID || !clientSecret) { if (!clientID || !clientSecret || !issuer) {
logger.error( logger.error(
'OIDC configuration incomplete: issuer, clientID, or clientSecret missing' 'OIDC configuration incomplete: issuer, clientID, or clientSecret missing'
); );
throw new Error('OIDC configuration incomplete'); throw new Error('OIDC configuration incomplete');
} }

2
apps/api/src/app/auth/oidc-state.store.ts

@ -26,7 +26,6 @@ export class OidcStateStore implements SessionStore {
/** /**
* Store request state. * Store request state.
* Signature matches passport-openidconnect SessionStore
*/ */
public store( public store(
_req: Request, _req: Request,
@ -57,7 +56,6 @@ export class OidcStateStore implements SessionStore {
/** /**
* Verify request state. * Verify request state.
* Signature matches passport-openidconnect SessionStore
*/ */
public verify( public verify(
_req: Request, _req: Request,

Loading…
Cancel
Save