Revert "fix: resolve all ESLint errors in backend and frontend"
Build and Push Multi-Platform Images / build-and-push (push) Successful in 19s
Build and Push Multi-Platform Images / build-and-push (push) Successful in 19s
This reverts commit 07dfd7e840.
This commit is contained in:
@@ -1,24 +0,0 @@
|
||||
import type { Request } from 'express';
|
||||
import type { Permission } from './permissions.enum';
|
||||
|
||||
/** Vom JwtStrategy.validate() an `request.user` angehängte Identität. */
|
||||
export interface AuthenticatedUser {
|
||||
userId: string;
|
||||
email: string;
|
||||
name: string;
|
||||
preferredUsername: string | null;
|
||||
groups: string[];
|
||||
permissions: Permission[];
|
||||
}
|
||||
|
||||
/** Vom ApiKeyGuard an `request.apiKeyMetadata` angehängte Schlüssel-Info. */
|
||||
export interface ApiKeyMetadata {
|
||||
id: number;
|
||||
name: string;
|
||||
}
|
||||
|
||||
/** Express-Request mit der durch die Auth-Guards gesetzten Identität. */
|
||||
export interface AuthenticatedRequest extends Request {
|
||||
user?: AuthenticatedUser;
|
||||
apiKeyMetadata?: ApiKeyMetadata;
|
||||
}
|
||||
@@ -4,15 +4,6 @@ import { Strategy, ExtractJwt } from 'passport-jwt';
|
||||
import { ConfigService } from '@nestjs/config';
|
||||
import { passportJwtSecret } from 'jwks-rsa';
|
||||
import { mapGroupsToPermissions } from './permissions.enum';
|
||||
import type { AuthenticatedUser } from './authenticated-request';
|
||||
|
||||
interface JwtPayload {
|
||||
sub: string;
|
||||
email: string;
|
||||
name?: string;
|
||||
preferred_username?: string;
|
||||
groups?: string[];
|
||||
}
|
||||
|
||||
@Injectable()
|
||||
export class JwtStrategy extends PassportStrategy(Strategy, 'jwt') {
|
||||
@@ -33,12 +24,19 @@ export class JwtStrategy extends PassportStrategy(Strategy, 'jwt') {
|
||||
});
|
||||
}
|
||||
|
||||
validate(payload: JwtPayload): AuthenticatedUser {
|
||||
const groups = payload.groups ?? [];
|
||||
validate(payload: any): {
|
||||
userId: string;
|
||||
email: string;
|
||||
name: string;
|
||||
preferredUsername: string | null;
|
||||
groups: string[];
|
||||
permissions: any[];
|
||||
} {
|
||||
const groups = payload.groups || [];
|
||||
return {
|
||||
userId: payload.sub,
|
||||
email: payload.email,
|
||||
name: payload.name || payload.preferred_username || '',
|
||||
name: payload.name || payload.preferred_username,
|
||||
preferredUsername: payload.preferred_username ?? null,
|
||||
groups: groups,
|
||||
permissions: mapGroupsToPermissions(groups),
|
||||
|
||||
Reference in New Issue
Block a user