commented out unused code, small refactorings

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(
+// export const GetCurrentUser = createParamDecorator(
-  (
+//   (
-    data: keyof JwtPayloadWithRefreshToken | undefined,
+//     data: keyof JwtPayloadWithRefreshToken | undefined,
-    context: ExecutionContext
+//     context: ExecutionContext
-  ) => {
+//   ) => {
-    const request = context.switchToHttp().getRequest();
+//     const request = context.switchToHttp().getRequest();
 
-    if (!data) return request.user;
+//     if (!data) return request.user;
-    return request.user[data];
+//     return request.user[data];
-  }
+//   }
-);
+// );

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';

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';

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 };

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;
+};

backend/src/modules/auth-module/models/types/tokens.type.ts

@@ -0,0 +1,4 @@
+export type Tokens = {
+  access_token: string;
+  refresh_token: string;
+};

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 {
+import { TokenManagementService } from './token-management.service';
-  TokenManagementService,
-  TokenPayload,
-} from './token-management.service';
 
 @Injectable()
 export class AuthService {

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 = {
+import { TokenPayload, Tokens } from '../models/types';
-  access_token: string;
-  refresh_token: string;
-};
-
-export type TokenPayload = {
-  sub: string;
-  email: string;
-  iat: number;
-  exp: number;
-};
 
 @Injectable()
 export class TokenManagementService {