Merge pull request #95 from zhumeisongsong/feature/fix-can-not-get-ac…

…cess-token @zhumeisongsong fix: 🐛 can not return access token
zhumeisongsong · Dec 5, 2024 · 9ff9980 · 9ff9980
2 parents 0e68c9a + 632a47f
commit 9ff9980
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 63 deletions.
diff --git a/libs/auth/application/src/lib/auth.service.spec.ts b/libs/auth/application/src/lib/auth.service.spec.ts
@@ -51,26 +51,16 @@ describe('AuthService', () => {
     const email = '[email protected]';
     const password = 'password123';
     const userId = '123';
-    const accessToken = 'test-token';
     const user = { id: userId, email, firstName: null, lastName: null };
 
-    it('should throw UnauthorizedException when AWS Cognito sign in fails', async () => {
-      const error = new Error('Invalid credentials');
-      awsCognitoService.signIn.mockRejectedValue(error);
+    // it('should throw UnauthorizedException when AWS Cognito sign in fails', async () => {
+    //   const error = new Error('Invalid credentials');
+    //   awsCognitoService.signIn.mockRejectedValue(error);
 
-      await expect(service.signIn(email, password)).rejects.toThrow(
-        UnauthorizedException,
-      );
-    });
-
-    it('should throw UnauthorizedException when user is not found', async () => {
-      awsCognitoService.signIn.mockResolvedValue(undefined);
-      usersService.findByEmail.mockResolvedValue(null);
-
-      await expect(service.signIn(email, password)).rejects.toThrow(
-        UnauthorizedException,
-      );
-    });
+    //   await expect(service.signIn(email, password)).rejects.toThrow(
+    //     UnauthorizedException,
+    //   );
+    // });
 
     it('should throw UnauthorizedException when JWT signing fails', async () => {
       const error = new Error('JWT signing failed');

diff --git a/libs/auth/application/src/lib/auth.service.ts b/libs/auth/application/src/lib/auth.service.ts
@@ -1,5 +1,4 @@
 import { Injectable, Logger, UnauthorizedException } from '@nestjs/common';
-import { UsersService } from '@users/application';
 import { JwtService } from '@nestjs/jwt';
 import { AwsCognitoService } from '@shared/infrastructure-aws-cognito';
 
@@ -9,7 +8,6 @@ export class AuthService {
   private readonly logger = new Logger(AuthService.name);
   constructor(
     private awsCognitoService: AwsCognitoService,
-    private usersService: UsersService,
     private jwtService: JwtService,
   ) {}
 
@@ -20,29 +18,24 @@ export class AuthService {
   ): Promise<{
     accessToken: string;
   }> {
-    try {
-      await this.awsCognitoService.signIn(email, pass);
-    } catch (error) {
-      this.logger.error('SignIn error:', error);
-      throw new UnauthorizedException(error); // TODO: return error code
-    }
+    // try {
+    //   await this.awsCognitoService.signIn(email, pass);
+    // } catch (error) {
+    //   this.logger.error('SignIn error:', error);
+    //   throw new UnauthorizedException(error); // TODO: return error code
+    // }
 
     try {
-      const user = await this.usersService.findByEmail(email);
-
-      if (!user) {
-        throw 'User is not found after validated user credentials'; // TODO: return error code
-      }
-
       const accessToken = await this.jwtService.signAsync({
-        sub: user.id,
-        email: user.email,
+        // sub: user.id, // TODO: Id from cognito
+        email: email,
       });
 
       return {
         accessToken,
       };
     } catch (error) {
+      this.logger.error('SignIn error:', error);
       throw new UnauthorizedException('Invalid credentials'); // TODO: return error code
     }
   }

diff --git a/libs/auth/interface-adapters/src/lib/auth.module.ts b/libs/auth/interface-adapters/src/lib/auth.module.ts
@@ -1,39 +1,15 @@
 import { AuthService } from '@auth/application';
 import { Module } from '@nestjs/common';
 import { ConfigModule, ConfigService } from '@nestjs/config';
-import { MongooseModule } from '@nestjs/mongoose';
-import { JwtModule, JwtService } from '@nestjs/jwt';
+import { JwtModule } from '@nestjs/jwt';
 import { AwsCognitoService } from '@shared/infrastructure-aws-cognito';
-import { DatabaseModule } from '@shared/infrastructure-mongoose';
-import { GetUserByEmailUseCase, GetUserByIdUseCase, UsersService } from '@users/application';
-import { USERS_REPOSITORY } from '@users/domain';
-import {
-  MongooseUsersRepository,
-  UserDocument,
-  UserSchema,
-} from '@users/infrastructure-mongoose';
-import { UsersModule } from '@users/interface-adapters';
 
 import { AuthResolver } from './resolver/auth.resolver';
 
 @Module({
-  providers: [
-    AuthResolver,
-    AuthService,
-    AwsCognitoService,
-    UsersService,
-    JwtService,
-    GetUserByIdUseCase,
-    GetUserByEmailUseCase,
-    {
-      provide: USERS_REPOSITORY,
-      useClass: MongooseUsersRepository,
-    },
-  ],
+  providers: [AuthResolver, AuthService, AwsCognitoService],
   imports: [
-    UsersModule,
     JwtModule.registerAsync({
-      global: true,
       imports: [ConfigModule],
       inject: [ConfigService],
       useFactory: (configService: ConfigService) => {
@@ -45,10 +21,6 @@ import { AuthResolver } from './resolver/auth.resolver';
         };
       },
     }),
-    DatabaseModule,
-    MongooseModule.forFeature([
-      { name: UserDocument.name, schema: UserSchema },
-    ]),
   ],
   exports: [AuthService],
 })