Merge pull request #127 from UMCIGNAL/main

Main

Author: Gjuni

dist/index.ts

@@ -25,7 +25,7 @@ app.use(express.json());
 app.use(express.urlencoded({ extended: true }));
 app.use(morgan('dev'));
 
-app.use('/api-docs', swaggerUi.serve, swaggerUi.setup(swaggerSpec));
+app.use('/swagger-api-docs', swaggerUi.serve, swaggerUi.setup(swaggerSpec));
 
 router.get('/', (req, res) => {
     res.json('Wellcome UMCignal');

dist/user/user.controller/user.controller.ts

@@ -1,6 +1,6 @@
 import { Request, Response, NextFunction } from 'express';
 import { emailValidation, gmailValidation } from '../../security/validation/validation';
-import { changeUserInfoService, getMyInstService, mailVerifyService, sendMailCodeService, userLogOutService, userSignOutService, userSignupService } from '../user.service/user.service';
+import { changeUserInfoService, getMyInstService, mailVerifyService, mailVerifyStudentIdService, sendMailCodeService, userLogOutService, userSignOutService, userSignupService } from '../user.service/user.service';
 import { userChangeInfoDTO, UserDto } from '../user.dto/user.dto';
 import { decodeTokenUserId } from '../../security/JWT/auth.jwt';
 import { check_token, come_back_user } from '../../middlware/softDelete';
@@ -268,7 +268,9 @@ export const getMyInstController = async (
 ):Promise<any> => {
     try {
         const token = req.headers.authorization?.split(' ')[1];
-        
+
+        const user_id = decodeTokenUserId(token) as number;
+      
         if(!token || token === undefined) {
             return res.status(404).json({ message: '토큰이 없습니다.' });
         }
@@ -292,4 +294,43 @@ export const getMyInstController = async (
         console.error(error);
         return res.status(500).json({ message: '서버 오류가 발생했습니다.' });
     }
+};
+
+export const mailVerifyStudentIdController = async (
+    req : Request,
+    res : Response,
+    next : NextFunction
+):Promise<any> => {
+    try {
+        const mailVerification = req.body.mailVerification as string;
+
+        if (!mailVerification) {
+            return res.status(401).json({ message: '인증 코드가 제공되지 않았습니다.' });
+        }
+
+        const student_id = req.body.student_id as string;
+
+        if(!student_id) {
+            return res.status(401).json({ message: '학번이(가) 제공되지 않았습니다.' });
+        }
+
+        // 이메일 인증 코드 검증
+        if(mailVerification.length !== 6) {
+            return res.status(408).json({ message: '인증 코드는 6자리입니다.' });
+        }
+
+        const token = await mailVerifyStudentIdService(student_id, mailVerification);
+
+        if(!token) {
+            return res.status(403).json({ message: '인증 코드가 올바르지 않습니다. 다시 인증해주세요.' });
+        }
+
+        return res.status(200).json({ 
+            message: '메일 인증 완료', 
+            token: token 
+        });
+    } catch (error : any) {
+        console.error(error);
+        return res.status(500).json({ message: '서버 오류가 발생했습니다.' });
+    }
 };

dist/user/user.model/user.model.ts

@@ -203,4 +203,41 @@ export const getMyInstModel = async (
     const result = quert_result[0].instagram_id;
 
     return result;
+};
+
+
+export const mailVerifyStudentIdModel = async (
+    student_id : string,
+    mailVerification: string
+): Promise<string | null> => {
+    const pool = await getPool();
+
+    try {
+        const query = `SELECT * FROM user WHERE student_id = ? AND valid_key = ?`;
+    
+        const [result]: any = await pool.query(query, [student_id, mailVerification]);
+
+        if (result.length === 0) {
+            return null; // 유효한 인증 코드가 없는 경우
+        }
+    
+        const token = await generateToken(result[0]); // JWT 토큰 생성
+    
+        if (!token) {
+            console.error('Token generation failed');
+            return null;
+        }
+    
+        console.log('Token generated:', token);
+    
+        const updateQuery = `UPDATE user SET Token = ? WHERE user_id = ?`;
+    
+        // 토큰 값과 user_id가 정확하게 들어왔는지 확인
+        await pool.query(updateQuery, [token, result[0].user_id]);
+    
+        return token;
+    } catch (error) {
+        return null;
+    }
+
 };

dist/user/user.router.ts

@@ -1,5 +1,5 @@
 import express from 'express';
-import { changeUserInfoController, getMyInstController, mailVerifyController, sendMailCodeController, userLogOutController, userSignOutController, userSignupController, userWhoCameBackController } from './user.controller/user.controller';
+import { changeUserInfoController, getMyInstController, mailVerifyController, mailVerifyStudentIdController, sendMailCodeController, userLogOutController, userSignOutController, userSignupController, userWhoCameBackController } from './user.controller/user.controller';
 import { authenticateToken } from '../security/JWT/auth.jwt';
 
 const router = express.Router();
@@ -10,6 +10,7 @@ router.get('/', (req, res) => {
 
 router.post('/mailCode', sendMailCodeController); // 처음 로그인 시 사용 또는 다시 로그인 시도 시 사용
 router.post('/verify', mailVerifyController);   // 인증 코드 검증 및 토큰 발급
+router.post('/verifyStudentId', mailVerifyStudentIdController);   // 인증 코드 검증 및 토큰 발급
 router.patch('/signup', authenticateToken, userSignupController); // 이미 가입한 회원 초기 정보 입력 
 
 router.patch('/logOut', authenticateToken, userLogOutController); // 로그아웃 처리
@@ -521,4 +522,88 @@ router.get('/getMyIns', authenticateToken, getMyInstController);
  *                 message:
  *                   type: string
  */
+
+
+/**
+ * @swagger
+ * /user/verifyStudentId:
+ *   post:
+ *     summary: 학생 메일 인증 코드 검증 및 토큰 발급
+ *     description: 클라이언트에서 받은 인증 코드와 학번을 검증하여 성공 시 토큰을 발급합니다.
+ *     tags:
+ *       - user
+ *     requestBody:
+ *       required: true
+ *       content:
+ *         application/json:
+ *           schema:
+ *             type: object
+ *             required:
+ *               - mailVerification
+ *               - student_id
+ *             properties:
+ *               mailVerification:
+ *                 type: string
+ *                 example: "123456"
+ *                 description: 인증 메일로 받은 6자리 코드
+ *               student_id:
+ *                 type: string
+ *                 example: "202312345"
+ *                 description: 사용자의 학번
+ *     responses:
+ *       200:
+ *         description: 인증 성공 및 토큰 발급
+ *         content:
+ *           application/json:
+ *             schema:
+ *               type: object
+ *               properties:
+ *                 message:
+ *                   type: string
+ *                   example: "메일 인증 완료"
+ *                 token:
+ *                   type: string
+ *                   example: "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9..."
+ *       401:
+ *         description: 인증 코드 또는 학번 누락
+ *         content:
+ *           application/json:
+ *             schema:
+ *               type: object
+ *               properties:
+ *                 message:
+ *                   type: string
+ *                   example: "인증 코드가 제공되지 않았습니다."
+ *       403:
+ *         description: 잘못된 인증 코드
+ *         content:
+ *           application/json:
+ *             schema:
+ *               type: object
+ *               properties:
+ *                 message:
+ *                   type: string
+ *                   example: "인증 코드가 올바르지 않습니다. 다시 인증해주세요."
+ *       408:
+ *         description: 인증 코드가 6자리가 아님
+ *         content:
+ *           application/json:
+ *             schema:
+ *               type: object
+ *               properties:
+ *                 message:
+ *                   type: string
+ *                   example: "인증 코드는 6자리입니다."
+ *       500:
+ *         description: 서버 내부 오류
+ *         content:
+ *           application/json:
+ *             schema:
+ *               type: object
+ *               properties:
+ *                 message:
+ *                   type: string
+ *                   example: "서버 오류가 발생했습니다."
+ */
+
 export default router;

dist/user/user.service/user.service.ts

@@ -1,5 +1,5 @@
 import { generateCode, sendEmail } from "../../security/mail/mail.sender";
-import { changeUserInfoModel, getMyInstModel, mailVerifyModel, sendMailModel, userLogOutModel, userSignOutModel, userSignupModel } from "../user.model/user.model";
+import { changeUserInfoModel, getMyInstModel, mailVerifyModel, mailVerifyStudentIdModel, sendMailModel, userLogOutModel, userSignOutModel, userSignupModel } from "../user.model/user.model";
 import { userChangeInfoDTO, UserDto } from "../user.dto/user.dto";
 
 
@@ -60,4 +60,13 @@ export const getMyInstService = async (
 ):Promise<String> => {
     const result = await getMyInstModel (user_id);
     return result;
-}
+};
+
+export const mailVerifyStudentIdService = async (
+    student_id : string,
+    mailVerification : string
+): Promise<string | null> => {
+    // 인증 코드 검증
+    const token = await mailVerifyStudentIdModel(student_id, mailVerification);
+    return token;
+};