From 0a35fc6d264dfd9d58f3d57b8784393122f22313 Mon Sep 17 00:00:00 2001 From: Igor Propisnov Date: Fri, 31 May 2024 08:32:44 +0200 Subject: [PATCH] commented out unused code, small refactorings --- .../common/decorators/get-user.decorator.ts | 23 +++++++++---------- .../auth-module/common/decorators/index.ts | 2 +- .../modules/auth-module/models/types/index.ts | 4 +++- .../jwt-payload-with-refresh-token.type.ts | 4 ++-- .../models/types/token-payload.type.ts | 6 +++++ .../auth-module/models/types/tokens.type.ts | 4 ++++ .../auth-module/services/auth.service.ts | 6 ++--- .../services/token-management.service.ts | 12 +--------- 8 files changed, 30 insertions(+), 31 deletions(-) create mode 100644 backend/src/modules/auth-module/models/types/token-payload.type.ts create mode 100644 backend/src/modules/auth-module/models/types/tokens.type.ts diff --git a/backend/src/modules/auth-module/common/decorators/get-user.decorator.ts b/backend/src/modules/auth-module/common/decorators/get-user.decorator.ts index a442ca6..f03ed49 100644 --- a/backend/src/modules/auth-module/common/decorators/get-user.decorator.ts +++ b/backend/src/modules/auth-module/common/decorators/get-user.decorator.ts @@ -1,14 +1,13 @@ -import { createParamDecorator, ExecutionContext } from '@nestjs/common'; -import { JwtPayloadWithRefreshToken } from 'src/modules/auth-module/models/types'; +//import { JwtPayloadWithRefreshToken } from 'src/modules/auth-module/models/types'; -export const GetCurrentUser = createParamDecorator( - ( - data: keyof JwtPayloadWithRefreshToken | undefined, - context: ExecutionContext - ) => { - const request = context.switchToHttp().getRequest(); +// export const GetCurrentUser = createParamDecorator( +// ( +// data: keyof JwtPayloadWithRefreshToken | undefined, +// context: ExecutionContext +// ) => { +// const request = context.switchToHttp().getRequest(); - if (!data) return request.user; - return request.user[data]; - } -); +// if (!data) return request.user; +// return request.user[data]; +// } +// ); diff --git a/backend/src/modules/auth-module/common/decorators/index.ts b/backend/src/modules/auth-module/common/decorators/index.ts index 2a36025..6e85616 100644 --- a/backend/src/modules/auth-module/common/decorators/index.ts +++ b/backend/src/modules/auth-module/common/decorators/index.ts @@ -1,2 +1,2 @@ export * from './get-user-id.decorator'; -export * from './get-user.decorator'; +// export * from './get-user.decorator'; diff --git a/backend/src/modules/auth-module/models/types/index.ts b/backend/src/modules/auth-module/models/types/index.ts index 0e70b68..697195c 100644 --- a/backend/src/modules/auth-module/models/types/index.ts +++ b/backend/src/modules/auth-module/models/types/index.ts @@ -1,2 +1,4 @@ export * from './jwt-payload.type'; -export * from './jwt-payload-with-refresh-token.type'; +// export * from './jwt-payload-with-refresh-token.type'; +export * from './token-payload.type'; +export * from './tokens.type'; diff --git a/backend/src/modules/auth-module/models/types/jwt-payload-with-refresh-token.type.ts b/backend/src/modules/auth-module/models/types/jwt-payload-with-refresh-token.type.ts index c2e9746..6b6c80a 100644 --- a/backend/src/modules/auth-module/models/types/jwt-payload-with-refresh-token.type.ts +++ b/backend/src/modules/auth-module/models/types/jwt-payload-with-refresh-token.type.ts @@ -1,3 +1,3 @@ -import { JwtPayload } from './jwt-payload.type'; +// import { JwtPayload } from './jwt-payload.type'; -export type JwtPayloadWithRefreshToken = JwtPayload & { refresh_token: string }; +// export type JwtPayloadWithRefreshToken = JwtPayload & { refresh_token: string }; diff --git a/backend/src/modules/auth-module/models/types/token-payload.type.ts b/backend/src/modules/auth-module/models/types/token-payload.type.ts new file mode 100644 index 0000000..911ef0d --- /dev/null +++ b/backend/src/modules/auth-module/models/types/token-payload.type.ts @@ -0,0 +1,6 @@ +export type TokenPayload = { + sub: string; + email: string; + iat: number; + exp: number; +}; diff --git a/backend/src/modules/auth-module/models/types/tokens.type.ts b/backend/src/modules/auth-module/models/types/tokens.type.ts new file mode 100644 index 0000000..1c0a510 --- /dev/null +++ b/backend/src/modules/auth-module/models/types/tokens.type.ts @@ -0,0 +1,4 @@ +export type Tokens = { + access_token: string; + refresh_token: string; +}; diff --git a/backend/src/modules/auth-module/services/auth.service.ts b/backend/src/modules/auth-module/services/auth.service.ts index cea61c0..c27bb3a 100644 --- a/backend/src/modules/auth-module/services/auth.service.ts +++ b/backend/src/modules/auth-module/services/auth.service.ts @@ -11,13 +11,11 @@ import { LoginResponseDto, UserCredentialsDto, } from '../models/dto'; +import { TokenPayload } from '../models/types'; import { UserCredentialsRepository } from '../repositories/user-credentials.repository'; import { SessionService } from './session.service'; -import { - TokenManagementService, - TokenPayload, -} from './token-management.service'; +import { TokenManagementService } from './token-management.service'; @Injectable() export class AuthService { diff --git a/backend/src/modules/auth-module/services/token-management.service.ts b/backend/src/modules/auth-module/services/token-management.service.ts index 5e3e7b3..6b56f8f 100644 --- a/backend/src/modules/auth-module/services/token-management.service.ts +++ b/backend/src/modules/auth-module/services/token-management.service.ts @@ -2,17 +2,7 @@ import { Injectable } from '@nestjs/common'; import { ConfigService } from '@nestjs/config'; import { JwtService } from '@nestjs/jwt'; -type Tokens = { - access_token: string; - refresh_token: string; -}; - -export type TokenPayload = { - sub: string; - email: string; - iat: number; - exp: number; -}; +import { TokenPayload, Tokens } from '../models/types'; @Injectable() export class TokenManagementService {