Merge branch 'dev' into 127-feedback-페이지-자잘한-버그-수정-및-스타일링

Author: seyoung8239

backend/rest/src/auth/controller/auth.controller.ts

@@ -1,17 +1,7 @@
-import {
-	Controller,
-	Get,
-	HttpCode,
-	Logger,
-	Param,
-	Query,
-	Req,
-	Res,
-	UseGuards,
-} from '@nestjs/common';
+import { Controller, Get, Param, Query, Req, Res, UseGuards } from '@nestjs/common';
 import { AuthService } from '../service/auth.service';
 import { Request, Response } from 'express';
-import { HTTP_STATUS, tokenCookieOptions, JWT_TYPE } from '@constant';
+import { tokenCookieOptions, JWT_TYPE } from '@constant';
 import { JwtAuthGuard } from '../guard/jwt.guard';
 import { JwtPayload } from '@types';
 
@@ -20,7 +10,6 @@ export class AuthController {
 	constructor(private readonly authService: AuthService) {}
 
 	@Get('oauth/redirect/:type')
-	@HttpCode(HTTP_STATUS.HTTP_REDIRECT)
 	redirectOauthPage(@Param('type') type: string) {
 		const pageUrl = this.authService.getSocialUrl(type);
 		return { url: pageUrl };
@@ -32,7 +21,12 @@ export class AuthController {
 		@Param('type') type: string,
 		@Res() res: Response
 	) {
+		if (!authorizationCode) {
+			res.redirect(process.env.CLIENT_ORIGIN_URL);
+			return;
+		}
 		const user = await this.authService.socialStart({ type, authorizationCode });
+
 		const { accessToken, refreshToken } =
 			this.authService.createAccessTokenAndRefreshToken(user);
 
@@ -43,12 +37,10 @@ export class AuthController {
 
 	@UseGuards(JwtAuthGuard)
 	@Get('login')
-	@HttpCode(HTTP_STATUS.HTTP_OK)
 	loginValidate(@Req() req: Request, @Res({ passthrough: true }) res: Response) {
 		const { accessToken, refreshToken } = req.cookies;
 		res.cookie(JWT_TYPE.ACCESS_TOKEN, accessToken, tokenCookieOptions);
 		res.cookie(JWT_TYPE.REFRESH_TOKEN, refreshToken, tokenCookieOptions);
-		return { statusCode: 200 };
 	}
 
 	@UseGuards(JwtAuthGuard)
@@ -63,6 +55,5 @@ export class AuthController {
 	logout(@Res({ passthrough: true }) res: Response) {
 		res.clearCookie(JWT_TYPE.ACCESS_TOKEN);
 		res.clearCookie(JWT_TYPE.REFRESH_TOKEN);
-		return { statusCode: 200 };
 	}
 }

backend/rest/src/auth/service/auth.service.spec.ts

@@ -153,12 +153,11 @@ describe('AuthService', () => {
 	});
 
 	const makeMockUser = (userInfo: UserInfo): UserEntity => {
-		const { id, email, password, nickname, oauthType } = userInfo;
+		const { id, email, password, oauthType } = userInfo;
 		const userEntity = new JoinUserBuilder()
 			.setId(id)
 			.setEmail(email)
 			.setPassword(password)
-			.setNickname(nickname)
 			.setOauthType(oauthType)
 			.build();
 		return userEntity;

backend/rest/src/auth/service/auth.service.ts

@@ -1,10 +1,11 @@
 import {
 	accessTokenOptions,
+	HTTP_ERROR_MSG,
 	OAUTH_TYPE,
 	refreshTokenOptions,
 	USER_REPOSITORY_INTERFACE,
 } from '@constant';
-import { Inject, Injectable } from '@nestjs/common';
+import { BadRequestException, Inject, Injectable } from '@nestjs/common';
 import { UserInfo } from '@types';
 import { UserRepository } from 'src/user/repository/user.repository';
 import { OauthNaverService } from './oauth/naver-oauth.service';
@@ -52,14 +53,13 @@ export class AuthService {
 	async socialStart({ type, authorizationCode }: { type: string; authorizationCode: string }) {
 		this.setOauthInstanceByType(type);
 
-		if (!authorizationCode) throw new Error('social 인증이 되지 않았습니다.');
-
 		const accessToken = await this.oauthInstance.getAccessTokenByAuthorizationCode(
 			authorizationCode
 		);
 		const userSocialInfo = await this.oauthInstance.getSocialInfoByAccessToken(accessToken);
 
 		const user = await this.userRepository.saveUser(userSocialInfo as UserInfo);
+
 		return user;
 	}
 
@@ -97,6 +97,7 @@ export class AuthService {
 	 */
 	createAccessTokenAndRefreshToken(user: UserInfo) {
 		const { id, email } = user;
+
 		const payload = new JwtPayloadBuiler().setId(id).setEmail(email).build();
 
 		const accessToken = this.createJwt({ payload, ...accessTokenOptions });
@@ -117,7 +118,7 @@ export class AuthService {
 				this.oauthInstance = this.oauthKakaoService;
 				break;
 			default:
-				throw new Error();
+				throw new BadRequestException(HTTP_ERROR_MSG.UNKNOWN_OAUTH_TYPE_ERROR);
 		}
 	}
 }

backend/rest/src/auth/strategy/access-jwt.strategy.ts

@@ -4,11 +4,15 @@ import { ConfigService } from '@nestjs/config';
 import { PassportStrategy } from '@nestjs/passport';
 import { ExtractJwt, Strategy } from 'passport-jwt';
 import { Request } from 'express';
-import { JwtPayload } from 'src/types/auth.type';
+import { JwtPayload, UserInfo } from 'src/types/auth.type';
+import { AuthService } from '../service/auth.service';
 
 @Injectable()
 export class JwtAccessStrategy extends PassportStrategy(Strategy, 'jwt-access') {
-	constructor(private readonly configService: ConfigService) {
+	constructor(
+		private readonly configService: ConfigService,
+		private readonly authService: AuthService
+	) {
 		super({
 			ignoreExpiration: false,
 			jwtFromRequest: ExtractJwt.fromExtractors([
@@ -23,6 +27,15 @@ export class JwtAccessStrategy extends PassportStrategy(Strategy, 'jwt-access')
 	}
 
 	async validate(req: Request, payload: JwtPayload) {
+		const { id, email } = payload;
+		const { accessToken, refreshToken } = this.authService.createAccessTokenAndRefreshToken({
+			id,
+			email,
+		} as UserInfo);
+
+		req.cookies.accessToken = accessToken;
+		req.cookies.refreshToken = refreshToken;
+
 		return payload;
 	}
 }

backend/rest/src/auth/strategy/refresh-jwt.strategy.ts

@@ -1,12 +1,11 @@
-import { accessTokenOptions, JWT_ENV } from '@constant';
+import { JWT_ENV } from '@constant';
 import { Injectable } from '@nestjs/common';
 import { ConfigService } from '@nestjs/config';
 import { PassportStrategy } from '@nestjs/passport';
 import { ExtractJwt, Strategy } from 'passport-jwt';
 import { Request } from 'express';
 import { AuthService } from '../service/auth.service';
-import { JwtPayload } from 'src/types/auth.type';
-import { JwtPayloadBuiler } from 'src/auth/dto/create-jwt.builder';
+import { JwtPayload, UserInfo } from 'src/types/auth.type';
 
 @Injectable()
 export class JwtRefreshStrategy extends PassportStrategy(Strategy, 'jwt-refresh') {
@@ -17,7 +16,7 @@ export class JwtRefreshStrategy extends PassportStrategy(Strategy, 'jwt-refresh'
 		super({
 			ignoreExpiration: false,
 			jwtFromRequest: ExtractJwt.fromExtractors([
-				(req) => {
+				(req: Request) => {
 					const token = req?.cookies.refreshToken;
 					return token ?? null;
 				},
@@ -29,13 +28,13 @@ export class JwtRefreshStrategy extends PassportStrategy(Strategy, 'jwt-refresh'
 
 	async validate(req: Request, payload: JwtPayload): Promise<JwtPayload> {
 		const { id, email } = payload;
-		const createJwtPayload = new JwtPayloadBuiler().setId(id).setEmail(email).build();
-		const accessToken = this.authService.createJwt({
-			payload: createJwtPayload,
-			...accessTokenOptions,
-		});
+		const { accessToken, refreshToken } = this.authService.createAccessTokenAndRefreshToken({
+			id,
+			email,
+		} as UserInfo);
 
 		req.cookies.accessToken = accessToken;
+		req.cookies.refreshToken = refreshToken;
 
 		return payload;
 	}

backend/rest/src/config/env.config.ts

@@ -5,6 +5,7 @@ export const envConfig: ConfigModuleOptions = {
 	isGlobal: true, // 환경 변수를 전역으로 사용
 	envFilePath: process.env.NODE_ENV === 'dev' ? '.env' : '.env.test',
 	// 루트 경로에서 .env 사용 (cross-env로 환경에 따른 .env 적용도 가능)
+	// public에 올리면 env 파일의 변수 목록이 공개되어 안 좋지 않을까..
 	validationSchema: Joi.object({
 		DB_USER: Joi.string().required(),
 		DB_PASSWORD: Joi.string().required(),
@@ -13,5 +14,15 @@ export const envConfig: ConfigModuleOptions = {
 		JWT_ACCESS_TOKEN_EXPIRATION_TIME: Joi.string().required(),
 		JWT_REFRESH_TOKEN_SECRET: Joi.string().required(),
 		JWT_REFRESH_TOKEN_EXPIRATION_TIME: Joi.string().required(),
+
+		NAVER_CLIENT_ID: Joi.string().required(),
+		NAVER_CLIENT_SECRET: Joi.string().required(),
+
+		KAKAO_CLIENT_ID: Joi.string().required(),
+		KAKAO_CLIENT_SECRET: Joi.string().required(),
+
+		CLIENT_ORIGIN_URL: Joi.string().required(),
+
+		OBJECT_STORAGE_ENDPOINT: Joi.string().required(),
 	}),
 };

backend/rest/src/constant/http.constant.ts

@@ -1,4 +1,6 @@
-export enum HTTP_STATUS {
-	HTTP_OK = 200,
-	HTTP_REDIRECT = 301,
+export enum HTTP_ERROR_MSG {
+	UNKNOWN_OAUTH_TYPE_ERROR = '알 수 없는 Oauth Type입니다.',
+	OAUTH_AUTHENTICATION_CANCEL = 'social 인증이 되지 않았습니다.',
+	NOT_FOUND_TARGET_IN_DATABASE = 'DB에 삭제할 대상이 없습니다.',
+	NOT_FOUND_MATCHED_DOCS = '매치되는 docs가 없습니다.',
 }

backend/rest/src/filter/http-exception.filter.ts

@@ -0,0 +1,38 @@
+import {
+	ArgumentsHost,
+	Catch,
+	ExceptionFilter,
+	HttpException,
+	InternalServerErrorException,
+	Logger,
+} from '@nestjs/common';
+import { Request, Response } from 'express';
+
+@Catch()
+export class HttpExceptionFilter implements ExceptionFilter {
+	catch(exception: Error, host: ArgumentsHost) {
+		const logger = new Logger('EXCEPTION');
+
+		const ctx = host.switchToHttp();
+		const res = ctx.getResponse<Response>();
+		const req = ctx.getRequest<Request>();
+
+		if (!(exception instanceof HttpException)) {
+			exception = new InternalServerErrorException();
+		}
+
+		const { statusCode, message }: any = (exception as HttpException).getResponse();
+
+		logger.error(`[Request URL] ${req.url}`);
+		logger.error(`[Exception Time] ${new Date().toISOString()}`);
+		logger.error(`[Exception Message] ${message}`);
+		logger.error(`[Exception Stack] ${exception.stack}`);
+
+		const response = {
+			message: message,
+			stack: exception.stack,
+		};
+
+		res.status(statusCode).json(response);
+	}
+}

backend/rest/src/interceptor/http.interceptor.ts

@@ -0,0 +1,24 @@
+import { Injectable, NestInterceptor, ExecutionContext, CallHandler, Logger } from '@nestjs/common';
+import { Observable } from 'rxjs';
+import { tap, map } from 'rxjs/operators';
+
+@Injectable()
+export class RestInterceptor implements NestInterceptor {
+	intercept(context: ExecutionContext, next: CallHandler): Observable<any> {
+		const logger = new Logger('REST API');
+		const ctx = context.switchToHttp();
+		const req = ctx.getRequest<Request>();
+
+		const start = new Date().getTime();
+		return next
+			.handle()
+			.pipe(
+				tap(() => {
+					const end = new Date();
+					logger.log(`[Request URL] ${req.url}`);
+					logger.log(`[Process Time] ${end.getTime() - start}ms`);
+				})
+			)
+			.pipe(map((result) => ({ data: result })));
+	}
+}

backend/rest/src/interview/controller/interview.controller.ts

@@ -14,28 +14,23 @@ export class InterviewController {
 	@Post('docs')
 	async createInterviewDocs(@Req() req: Request, @Body() docsRequestDto: DocsRequestDto) {
 		const payload = req.user as JwtPayload;
-		console.log(payload);
 
 		await this.interviewService.createInterviewDocs({ userId: payload.id, docsRequestDto });
-		return { statusCode: 201 };
+		return {};
 	}
 
 	@Post('feedback')
 	async createFeedback(@Req() req: Request, @Body() feedbackRequestDto: FeedbackRequestDto) {
 		const payload = req.user as JwtPayload;
 		await this.interviewService.saveFeedback({ userId: payload.id, feedbackRequestDto });
-		return { statusCode: 201 };
+		return {};
 	}
 
 	@Get('docs/:docsUUID')
-	async getInterviewDocs(@Req() req: Request, @Param('docsUUID') docsUUID: string) {
-		const payload = req.user as JwtPayload;
-		const interviewDocs = await this.interviewService.getInterviewDocs({
-			userId: payload.id,
-			docsUUID,
-		});
+	async getInterviewDocs(@Param('docsUUID') docsUUID: string) {
+		const interviewDocs = await this.interviewService.getInterviewDocs(docsUUID);
 
-		return { statusCode: 201, data: interviewDocs };
+		return interviewDocs;
 	}
 
 	@Get('docs-list')
@@ -45,6 +40,7 @@ export class InterviewController {
 			userId: payload.id,
 			roomUUID,
 		});
-		return { statusCode: 200, data: interviewDocsList };
+
+		return interviewDocsList;
 	}
 }