[ST-464] 🔍 User DB 구조 변경 (#41)

* 🔍 User 테이블 구조 변경

* 🔍 UserId 기반 변경

src/agora/agora.service.ts

@@ -23,7 +23,6 @@ export class AgoraService {
         },
       ),
     );
-    console.log('whiteboard token ', data);
     if (data?.uuid === undefined) {
       return null;
     }

src/app.module.ts

@@ -16,8 +16,6 @@ import { QuestionModule } from './question/question.module';
 import { OfferModule } from './offer/offer.module';
 import { AuthMiddleware } from './auth/auth.middleware';
 import { HttpModule } from '@nestjs/axios';
-import { JwtService } from '@nestjs/jwt';
-import { AuthRepository } from './auth/auth.repository';
 
 @Module({
   imports: [
@@ -33,7 +31,7 @@ import { AuthRepository } from './auth/auth.repository';
     // ReviewModule,
   ],
   controllers: [AppController],
-  providers: [AppService, AuthRepository, JwtService],
+  providers: [AppService],
 })
 export class AppModule implements NestModule {
   configure(consumer: MiddlewareConsumer) {

src/auth/auth.controller.ts

@@ -58,7 +58,6 @@ export class AuthController {
   @ApiResponse(AuthResponse.verifyJwt)
   @Get('token/verify')
   verifyJwt(@Query('jwt') jwt: string) {
-    console.log(jwt);
     return this.authService.verifyJwt(jwt);
   }
 

src/auth/auth.middleware.ts

@@ -12,9 +12,9 @@ export class AuthMiddleware implements NestMiddleware {
       next();
     }
     try {
-      const { vendor, userId } = await this.authRepository.decodeJwt(jwt);
-      req.headers['vendor'] = vendor;
+      const { userId, role } = await this.authRepository.decodeJwt(jwt);
       req.headers['userId'] = userId;
+      req.headers['role'] = role;
       next();
     } catch (error) {
       next();

src/auth/auth.module.ts

@@ -4,10 +4,11 @@ import { AuthController } from './auth.controller';
 import { HttpModule } from '@nestjs/axios';
 import { DynamooseModule } from 'nestjs-dynamoose';
 import { UserSchema } from '../user/entities/user.schema';
-import { UploadRepository } from '../upload/upload.repository';
 import { UserRepository } from '../user/user.repository';
 import { AuthRepository } from './auth.repository';
 import { JwtService } from '@nestjs/jwt';
+import { AuthSchema } from './entities/auth.schema';
+import { UploadRepository } from '../upload/upload.repository';
 
 @Module({
   imports: [
@@ -17,6 +18,10 @@ import { JwtService } from '@nestjs/jwt';
         name: 'User',
         schema: UserSchema,
       },
+      {
+        name: 'Auth',
+        schema: AuthSchema,
+      },
     ]),
   ],
   controllers: [AuthController],

src/auth/auth.repository.ts

@@ -4,10 +4,13 @@ import { firstValueFrom } from 'rxjs';
 import { UserRepository } from '../user/user.repository';
 import * as process from 'process';
 import { JwtService } from '@nestjs/jwt';
+import { Auth, AuthKey } from './entities/auth.interface';
+import { InjectModel, Model } from 'nestjs-dynamoose';
 
 @Injectable()
 export class AuthRepository {
   constructor(
+    @InjectModel('Auth') private readonly authModel: Model<Auth, AuthKey>,
     private readonly httpService: HttpService,
     private readonly jwtService: JwtService,
     private readonly userRepository: UserRepository,
@@ -19,12 +22,11 @@ export class AuthRepository {
         const accessToken = await this.getAccessToken(vendor, code);
 
         const userId = await this.getUserIdFromAccessToken(vendor, accessToken);
-        const user = await this.userRepository.get({ vendor, userId });
+        const user = await this.userRepository.get(userId);
         const role = user.role;
 
         const jwt = this.jwtService.sign(
           {
-            vendor,
             userId,
             role,
           },
@@ -43,11 +45,10 @@ export class AuthRepository {
     }
   }
 
-  async signJwt(vendor: string, userId: string, role: string) {
+  async signJwt(userId: string, role: string) {
     try {
       return this.jwtService.sign(
         {
-          vendor,
           userId,
           role,
         },
@@ -65,7 +66,6 @@ export class AuthRepository {
     try {
       const decoded = this.jwtService.decode(jwt);
       return {
-        vendor: decoded['vendor'],
         userId: decoded['userId'],
         role: decoded['role'],
         iat: decoded['iat'],
@@ -82,7 +82,6 @@ export class AuthRepository {
         secret: process.env.JWT_SECRET_KEY,
       });
       return {
-        vendor: verified['vendor'],
         userId: verified['userId'],
         role: verified['role'],
         iat: verified['iat'],
@@ -132,7 +131,7 @@ export class AuthRepository {
             'https://kapi.kakao.com/v1/user/access_token_info',
             {
               headers: {
-                Authorization: `${accessToken}`,
+                Authorization: accessToken,
               },
             },
           ),
@@ -156,25 +155,65 @@ export class AuthRepository {
           }),
         );
 
-        return data.id.toString();
+        const authId = data.id.toString();
+        const auth = await this.authModel.get({
+          vendor,
+          authId,
+        });
+        return auth.userId;
       } catch (error) {
         throw new Error('사용자를 찾을 수 없습니다.');
       }
     }
   }
 
   async getUserFromAccessToken(vendor: string, accessToken: string) {
-    if (vendor === 'kakao') {
-      try {
-        const userId = await this.getUserIdFromAccessToken(vendor, accessToken);
+    try {
+      const userId = await this.getUserIdFromAccessToken(vendor, accessToken);
 
-        return await this.userRepository.get({
-          vendor,
-          userId,
-        });
-      } catch (error) {
-        throw new Error('사용자를 찾을 수 없습니다.');
-      }
+      return await this.userRepository.get(userId);
+    } catch (error) {
+      throw new Error('사용자를 찾을 수 없습니다.');
     }
   }
+
+  async createAuth(
+    vendor: string,
+    authId: string,
+    userId: string,
+    role: string,
+  ) {
+    try {
+      return await this.authModel.create({
+        vendor,
+        authId,
+        userId,
+        role,
+      });
+    } catch (error) {
+      throw new Error('인증정보를 생성하는데 실패했습니다.');
+    }
+  }
+
+  async getAuth(vendor: string, authId: string) {
+    try {
+      return await this.authModel.get({
+        vendor,
+        authId,
+      });
+    } catch (error) {
+      throw new Error('인증정보를 가져오는데 실패했습니다.');
+    }
+  }
+
+  async getUserIdFromAuth(vendor: string, authId: string) {
+    const auth = await this.getAuth(vendor, authId);
+    if (auth === undefined) {
+      throw new Error('인증정보를 찾을 수 없습니다.');
+    }
+
+    return auth.userId;
+  }
+
+  async delete(userId: string) {}
 }

src/auth/auth.service.ts

@@ -102,7 +102,7 @@ export class AuthService {
         vendor,
         accessToken,
       );
-      return new Success('성공적으로 사용자 ID를 가져왔습니다.', userId);
+      return new Success('성공적으로 사용자 ID를 가져왔습니다.', { userId });
     } catch (error) {
       return new Fail(error.message);
     }

src/auth/entities/auth.entity.ts

@@ -9,4 +9,8 @@ export class AccessToken {
   static userKey(headers: Headers) {
     return { vendor: headers['vendor'], userId: headers['userId'] };
   }
+
+  static userId(headers: Headers) {
+    return headers['userId'];
+  }
 }

src/auth/entities/auth.interface.ts

@@ -0,0 +1,9 @@
+export interface AuthKey {
+  vendor: string;
+  authId: string;
+}
+
+export interface Auth extends AuthKey {
+  userId: string;
+  role: string;
+}

src/auth/entities/auth.schema.ts

@@ -0,0 +1,18 @@
+import { Schema } from 'dynamoose';
+
+export const AuthSchema = new Schema({
+  vendor: {
+    type: String,
+    hashKey: true,
+  },
+  authId: {
+    type: String,
+    rangeKey: true,
+  },
+  userId: {
+    type: String,
+  },
+  role: {
+    type: String,
+  },
+});

src/offer/offer.repository.ts

@@ -20,7 +20,6 @@ export class OfferRepository {
   ) {
     try {
       const teacher = await this.userModel.get({
-        vendor: userKey.vendor,
         id: userKey.userId,
       });
 
@@ -48,7 +47,6 @@ export class OfferRepository {
     questionId: string,
   ) {
     const user = await this.userModel.get({
-      vendor: userKey.vendor,
       id: userKey.userId,
     });
     if (user === undefined) {
@@ -67,10 +65,7 @@ export class OfferRepository {
     const teachers = question.teacherIds.map(async (teacherId) => {
       const vendor = teacherId.split('#')[0];
       const id = teacherId.split('#')[1];
-      return await this.userModel.get({
-        vendor,
-        id,
-      });
+      return await this.userModel.get({ id });
     });
     return await Promise.all(teachers);
   }
@@ -129,10 +124,7 @@ export class OfferRepository {
     questionId: string,
     teacherId: string,
   ) {
-    const user: User = await this.userModel.get({
-      vendor: userKey.vendor,
-      id: userKey.userId,
-    });
+    const user: User = await this.userModel.get({ id: userKey.userId });
     if (user === undefined) {
       throw new Error('사용자를 찾을 수 없습니다.');
     } else if (user.role === 'teacher') {

src/question/question.repository.ts

@@ -3,7 +3,6 @@ import { InjectModel, Model } from 'nestjs-dynamoose';
 import { Question, QuestionKey } from './entities/question.interface';
 import { CreateQuestionDto } from './dto/create-question.dto';
 import { User, UserKey } from '../user/entities/user.interface';
-import { HttpErrorByCode } from '@nestjs/common/utils/http-error-by-code.util';
 
 @Injectable()
 export class QuestionRepository {
@@ -20,18 +19,11 @@ export class QuestionRepository {
     createQuestionDto: CreateQuestionDto,
     problemImage: string,
   ): Promise<Question> {
-    let user: User;
-    try {
-      user = await this.userModel.get({
-        vendor: userKey.vendor,
-        id: userKey.userId,
-      });
-    } catch (error) {
-      throw new ErrorEvent['404']('사용자를 찾을 수 없습니다.');
-    }
-
-    if (user.role === 'teacher') {
-      throw new ErrorEvent['403']('선생님은 질문을 생성할 수 없습니다.');
+    const user: User = await this.userModel.get({ id: userKey.userId });
+    if (user === undefined) {
+      throw new Error('사용자를 찾을 수 없습니다.');
+    } else if (user.role === 'teacher') {
+      throw new Error('선생님은 질문을 생성할 수 없습니다.');
     }
 
     try {
@@ -55,7 +47,7 @@ export class QuestionRepository {
         createdAt: new Date().toISOString(),
       });
     } catch (error) {
-      throw new HttpErrorByCode['400']('질문을 생성할 수 없습니다.');
+      throw new Error('질문을 생성할 수 없습니다.');
     }
   }
 
@@ -76,35 +68,29 @@ export class QuestionRepository {
     userKey: { vendor: string; userId: string },
     questionId: string,
   ) {
-    let user: User;
-    try {
-      user = await this.userModel.get({
-        vendor: userKey.vendor,
-        id: userKey.userId,
-      });
-    } catch (error) {
-      throw new ErrorEvent['404']('사용자를 찾을 수 없습니다.');
+    const user: User = await this.userModel.get({ id: userKey.userId });
+    if (user === undefined) {
+      throw new Error('사용자를 찾을 수 없습니다.');
+    } else if (user.role === 'teacher') {
+      throw new Error('선생님은 질문을 삭제할 수 없습니다.');
     }
 
-    if (user.role === 'teacher') {
-      throw new ErrorEvent['403']('선생님은 질문을 삭제할 수 없습니다.');
+    const question: Question = await this.questionModel.get({
+      id: questionId,
+    });
+    if (
+      question.student.id !== userKey.userId ||
+      question.student.vendor !== userKey.vendor
+    ) {
+      return new Error('질문을 삭제할 권한이 없습니다.');
     }
 
     try {
-      const question: Question = await this.questionModel.get({
-        id: questionId,
-      });
-      if (
-        question.student.id !== userKey.userId ||
-        question.student.vendor !== userKey.vendor
-      ) {
-        return new ErrorEvent['403']('질문을 삭제할 권한이 없습니다.');
-      }
       return await this.questionModel.delete({
         id: questionId,
       });
     } catch (error) {
-      throw new ErrorEvent['400']('질문을 삭제할 수 없습니다.');
+      throw new Error('질문을 삭제할 수 없습니다.');
     }
   }
 }