Merge pull request #141 from modern-agile-team/feature/socket

Modify(hobiJeong/socket): Response의 형식을 통일시키기 위해서 interceptor를 추가 했습니다.

src/chat/controllers/chat.controller.ts

@@ -31,9 +31,11 @@ import { JwtAccessTokenGuard } from 'src/config/guards/jwt-access-token.guard';
 import { GetNotificationsResponseDto } from '../dto/get-notifications-response.dto';
 import { ApiGetChatNotifications } from '../swagger-decorators/get-chat-notifications.decorator';
 import { ApiCreateChatImage } from '../swagger-decorators/create-chat-image.decorators';
+import { SuccessResponseInterceptor } from 'src/common/interceptors/success-response.interceptor';
 
 @ApiTags('CHAT')
 @UsePipes(ValidationPipe)
+@UseInterceptors(SuccessResponseInterceptor)
 @Controller('chat-room')
 export class ChatController {
   constructor(

src/chat/events/events.gateway.ts

@@ -21,7 +21,6 @@ import {
 import { LoginChatRoomDto } from '../dto/login-chat-room.dto';
 import { WebSocketExceptionFilter } from '../exceptions/websocket-exception.filter';
 import mongoose from 'mongoose';
-
 @WebSocketGateway({ namespace: /\/ch-.+/, cors: true })
 @UsePipes(ValidationPipe)
 @UseFilters(WebSocketExceptionFilter)
@@ -85,10 +84,12 @@ export class EventsGateway
   ) {
     if (postChatDto.hasOwnProperty('content')) {
       const returnedChat = await this.chatService.createChat(postChatDto);
-      socket.to(postChatDto.roomId.toString()).emit('message', returnedChat);
+      const data = returnedChat;
+      socket.to(postChatDto.roomId.toString()).emit('message', { data });
     } else {
       const returnedChat = await this.chatService.findChatImage(postChatDto);
-      socket.to(postChatDto.roomId.toString()).emit('message', returnedChat);
+      const data = returnedChat;
+      socket.to(postChatDto.roomId.toString()).emit('message', { data });
     }
   }
 

src/common/interceptors/success-response.interceptor.ts

@@ -0,0 +1,21 @@
+import {
+  Injectable,
+  NestInterceptor,
+  ExecutionContext,
+  CallHandler,
+} from '@nestjs/common';
+import { Observable } from 'rxjs';
+import { map } from 'rxjs/operators';
+
+@Injectable()
+export class SuccessResponseInterceptor implements NestInterceptor {
+  intercept(context: ExecutionContext, next: CallHandler): Observable<any> {
+    const statusCode = context.getArgByIndex(1).statusCode;
+    return next.handle().pipe(
+      map((data) => ({
+        statusCode,
+        data,
+      })),
+    );
+  }
+}

src/common/s3/s3.service.ts

@@ -44,6 +44,7 @@ export class S3Service {
 
       return { url: fileUrl, key: filename };
     } catch (error) {
+      console.error(error);
       throw new Error('S3 업로드 오류');
     }
   }

src/config/guards/web-socket-jwt-access-token.guard.ts

@@ -0,0 +1,35 @@
+// import { ExecutionContext, Injectable } from '@nestjs/common';
+// import { TokenService } from 'src/auth/services/token.service';
+
+// @Injectable()
+// export class WebSocketJwtAccessTokenGuard {
+//   constructor(private tokenService: TokenService) {}
+
+//   async canActivate(context: ExecutionContext) {
+//     const request = context.switchToWs().getClient().handshake;
+//     const accessToken = request.headers['access_token'];
+
+//     if (!accessToken) {
+//       return false;
+//     }
+
+//     const userId = await this.tokenService.decodeToken(accessToken);
+//     request.user = { userId };
+//     console.log(request.user);
+
+//     return true;
+//   }
+// }
+
+import { Injectable, CanActivate, ExecutionContext } from '@nestjs/common';
+import { Observable } from 'rxjs';
+
+@Injectable()
+export class AuthGuard implements CanActivate {
+  canActivate(
+    context: ExecutionContext,
+  ): boolean | Promise<boolean> | Observable<boolean> {
+    const request = context.switchToHttp().getRequest();
+    return true;
+  }
+}