f.spilla/insiemesalute-3p-nx
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

chore(repo): fix jwt token strategies + fix AccountsEntity

Browse Source
This commit is contained in:
Francesco Spilla 2025-02-12 18:21:52 +01:00
parent 0148082d0a
commit d6ffa909aa
4 changed files with 8 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/ebitemp-api/src/app/modules/auth/constants/token-payload.interface.ts
View File

@ -1,5 +1,5 @@
export interface TokenPayload { export interface TokenPayload {
userId: number; sub: number;
iat?: number; iat?: number;
exp?: number; exp?: number;
} }

6
apps/ebitemp-api/src/app/modules/auth/strategies/jwt/jwt-access-token-auth.strategy.ts
View File

@ -2,9 +2,9 @@ import { Inject, Injectable, UnauthorizedException } from '@nestjs/common';
import { PassportStrategy } from '@nestjs/passport'; import { PassportStrategy } from '@nestjs/passport';
import { ExtractJwt, Strategy } from 'passport-jwt'; import { ExtractJwt, Strategy } from 'passport-jwt';
import { AuthConfig, authConfig } from '../../auth.config'; import { AuthConfig, authConfig } from '../../auth.config';
import { RequestWithUser } from '../../constants/request-with-user';
import { TokenPayload } from '../../constants/token-payload.interface'; import { TokenPayload } from '../../constants/token-payload.interface';
import { UsersAuthService } from '../../users/users-auth.service'; import { UsersAuthService } from '../../users/users-auth.service';
import { FastifyRequest } from 'fastify';
@Injectable() @Injectable()
export class JwtAccessTokenAuthStrategy extends PassportStrategy(Strategy, 'jwt-access-token') { export class JwtAccessTokenAuthStrategy extends PassportStrategy(Strategy, 'jwt-access-token') {
@ -16,8 +16,8 @@ export class JwtAccessTokenAuthStrategy extends PassportStrategy(Strategy, 'jwt-
}); });
} }
async validate(request: RequestWithUser, payload: TokenPayload) { async validate(request: FastifyRequest, payload: TokenPayload) {
const account = await this.userAuthService.getUserById(payload.userId); const account = await this.userAuthService.getUserById(payload.sub);
if (!account) throw new UnauthorizedException('Access Token Guard'); if (!account) throw new UnauthorizedException('Access Token Guard');
return account; return account;
} }

13
apps/ebitemp-api/src/app/modules/auth/strategies/jwt/jwt-refresh-token-auth.strategy.ts
View File

@ -3,7 +3,6 @@ import { PassportStrategy } from '@nestjs/passport';
import { FastifyRequest } from 'fastify'; import { FastifyRequest } from 'fastify';
import { ExtractJwt, Strategy } from 'passport-jwt'; import { ExtractJwt, Strategy } from 'passport-jwt';
import { authConfig, AuthConfig } from '../../auth.config'; import { authConfig, AuthConfig } from '../../auth.config';
import { RequestWithUser } from '../../constants/request-with-user';
import { TokenPayload } from '../../constants/token-payload.interface'; import { TokenPayload } from '../../constants/token-payload.interface';
import { UsersAuthService } from '../../users/users-auth.service'; import { UsersAuthService } from '../../users/users-auth.service';
@ -11,19 +10,15 @@ import { UsersAuthService } from '../../users/users-auth.service';
export class JwtRefreshTokenAuthStrategy extends PassportStrategy(Strategy, 'jwt-refresh-token') { export class JwtRefreshTokenAuthStrategy extends PassportStrategy(Strategy, 'jwt-refresh-token') {
constructor(@Inject(authConfig.KEY) authConfig: AuthConfig, private readonly usersAuthService: UsersAuthService) { constructor(@Inject(authConfig.KEY) authConfig: AuthConfig, private readonly usersAuthService: UsersAuthService) {
super({ super({
jwtFromRequest: ExtractJwt.fromExtractors([ jwtFromRequest: ExtractJwt.fromAuthHeaderAsBearerToken(),
(request: FastifyRequest) => {
return request?.headers?.Bearer as string;
},
]),
secretOrKey: authConfig.refreshToken.secret, secretOrKey: authConfig.refreshToken.secret,
passReqToCallback: true, passReqToCallback: true,
}); });
} }
async validate(request: RequestWithUser, payload: TokenPayload) { async validate(request: FastifyRequest, payload: TokenPayload) {
const refreshToken = request.headers?.Refresh as string; const refreshToken = (request.headers?.authorization as string| undefined)?.replace('Bearer', '')?.trim();
const account = this.usersAuthService.getUserByIdAndRefreshTokenPair(payload.userId, refreshToken); const account = this.usersAuthService.getUserByIdAndRefreshTokenPair(payload.sub, refreshToken);
if (!account) throw new UnauthorizedException('Refresh Token Guard'); if (!account) throw new UnauthorizedException('Refresh Token Guard');
return account; return account;
} }

3
apps/ebitemp-api/src/app/modules/database/entities/accounts.entity.ts
View File

@ -22,9 +22,6 @@ export class AccountsEntity {
@Column('date', { name: 'data_scadenza', nullable: true }) @Column('date', { name: 'data_scadenza', nullable: true })
dataScadenza: Date | null; dataScadenza: Date | null;
@Column('bit', { name: 'flag_primo_accesso', default: () => '(1)' })
flagPrimoAccesso: boolean;
@Column('varchar', { @Column('varchar', {
name: 'ultimo_hash_refresh_token', name: 'ultimo_hash_refresh_token',
nullable: true, nullable: true,