Fix: REST API 아키텍처 적용

BSSM-BSM · Mar 20, 2022 · 678910d · 678910d
1 parent cd7375b
commit 678910d
Show file tree

Hide file tree

Showing 9 changed files with 185 additions and 257 deletions.
diff --git a/src/api/account/account.repository.js b/src/api/account/account.repository.js
@@ -150,20 +150,6 @@ const updatePWByCode = async (memberCode, memberPw) => {
     return salt;
 }
 
-const getToken = async (token) => {
-    const getTokenQuery="SELECT * FROM `tokens` WHERE `token`=? AND `valid`=1";
-    try{
-        const [rows] = await pool.query(getTokenQuery, [token]);
-        if(rows.length)
-            return rows[0];
-        else
-            return null;
-    }catch(err){
-        console.error(err);
-        throw new InternalServerException();
-    }
-}
-
 module.exports = {
     getMemberById,
     getMemberByCode,
@@ -174,5 +160,4 @@ module.exports = {
     getStudentInfoByCode,
     updateCodeAvailable,
     updatePWByCode,
-    getToken
 }
diff --git a/src/api/account/account.service.js b/src/api/account/account.service.js
@@ -1,5 +1,6 @@
 const { NotFoundException, BadRequestException, UnAuthorizedException, ConflictException, InternalServerException } = require('../../util/exceptions');
 const repository = require('./account.repository');
+const tokenRepository = require('./token.repository');
 const jwt = require('../../util/jwt');
 const crypto = require('crypto');
 const sharp = require('sharp');
@@ -258,7 +259,7 @@ const token = async (refreshToken) => {
         throw new UnAuthorizedException();
     }
     // db에서 리프레시 토큰 사용이 가능한지 확인
-    const tokenInfo = await repository.getToken(result.token);
+    const tokenInfo = await tokenRepository.getToken(result.token);
     // 리프레시 토큰이 db에서 사용불가 되었으면
     if(tokenInfo === null){
         throw new UnAuthorizedException();

diff --git a/src/api/account/token.repository.ts b/src/api/account/token.repository.ts
@@ -0,0 +1,36 @@
+import { InternalServerException } from '../../util/exceptions';
+const pool = require('../../util/db');
+
+const getToken = async (
+    token: string,
+) => {
+    const getTokenQuery="SELECT * FROM `tokens` WHERE `token`=? AND `valid`=1";
+    try{
+        const [rows] = await pool.query(getTokenQuery, [token]);
+        if(rows.length)
+            return rows[0];
+        else
+            return null;
+    }catch(err){
+        console.error(err);
+        throw new InternalServerException();
+    }
+}
+
+const insertToken = async (
+    token: string,
+    memberCode: number
+) => {
+    const insertTokenQuery="INSERT INTO `tokens` VALUES(?, 1, ?, now())";
+    try{
+        await pool.query(insertTokenQuery, [token, memberCode]);
+    }catch(err){
+        console.error(err);
+        throw new InternalServerException();
+    }
+}
+
+export {
+    getToken,
+    insertToken
+}
diff --git a/src/api/api.controller.js b/src/api/api.controller.js
@@ -1,37 +1,33 @@
-const express = require('express')
-const router = express.Router()
-const jwt = require('../util/jwt')
-const multer = require('multer')
+const express = require('express');
+const router = express.Router();
+const jwt = require('../util/jwt');
+const multer = require('multer');
 
 const loginCheck = (req, res, next) => {
   const jwtValue = jwt.check(req.cookies.token);
   if(!jwtValue.isLogin){
-    return res.send(JSON.stringify(jwtValue.msg));
+    next(new UnAuthorizedException());
   }
   next();
 }
 const imageUpload = multer({
   storage:multer.diskStorage({
     destination:(req, file, cb) => {
-      const jwtValue = jwt.check(req.cookies.token);
-      if(!jwtValue.isLogin) return;
-      cb(null, 'public/resource/board/upload_images/')
+      cb(null, 'public/resource/board/upload_images/');
     },
     filename:(req, file, cb) => {
-      cb(null, Date.now()+'.'+file.originalname.split('.')[file.originalname.split('.').length-1])
+      cb(null, Date.now()+'.'+file.originalname.split('.')[file.originalname.split('.').length-1]);
     }
   })
 })
 const profileUpload = multer({
   storage:multer.diskStorage({
     destination:(req, file, cb) => {
-      const jwtValue = jwt.check(req.cookies.token);
-      if(!jwtValue.isLogin) return;
-      cb(null, 'public/resource/member/profile_images/')
+      cb(null, 'public/resource/member/profile_images/');
     },
     filename:(req, file, cb) => {
       const jwtValue = jwt.check(req.cookies.token);
-      cb(null, 'temp-profile_'+jwtValue.memberCode+'.'+file.originalname.split('.')[file.originalname.split('.').length-1])
+      cb(null, 'temp-profile_'+jwtValue.memberCode+'.'+file.originalname.split('.')[file.originalname.split('.').length-1]);
     }
   })
 })
@@ -52,6 +48,7 @@ const commentController = require('./board/comment.controller')
 const likeController = require('./board/like.controller')
 const imageUploadController = require('./board/imageUpload.controller')
 const emoticonController = require('./board/emoticon.controller')
+const { UnAuthorizedException } = require('../util/exceptions')
 
 router.post('/account/login', accountController.login)
 router.delete('/account/logout', accountController.logout)

diff --git a/src/controller.js b/src/controller.js
@@ -1,32 +1,18 @@
 const express = require('express');
 const router = express.Router();
-const jwt = require('./util/jwt');
 
 const apiRouter = require('./api/api.controller');
 const viewRouter = require('./view/view.controller');
 
+// 업데이트 확인 url 하위호환
 const versionController = require('./api/version/version.controller');
-router.post('/database', versionController.getVersionLegacy);// 업데이트 확인 url 하위호환
-
+router.post('/database', versionController.getVersionLegacy);
 
 router.use('/api', apiRouter);
 router.use('/', viewRouter);
 
-
 router.use((req, res) => {
-    const jwtValue = jwt.check(req.cookies.token);
-    res.status(404).render('404', {
-        member:{
-            isLogin:jwtValue.isLogin,
-            code:jwtValue.memberCode,
-            id:jwtValue.memberId,
-            nickname:jwtValue.memberNickname,
-            level:jwtValue.memberLevel,
-            grade:jwtValue.grade,
-            classNo:jwtValue.classNo,
-            studentNo:jwtValue.studentNo,
-        }
-    })
+    res.status(404).render('404');
 })
 
 module.exports = router;
diff --git a/src/main.js b/src/main.js
@@ -34,10 +34,16 @@ app.use('/', controller);
 
 app.use(function (err, req, res, next) {
     if(err.httpCode){
-        res.status(err.httpCode).send(JSON.stringify({'statusCode':err.httpCode,'message':err.message}))
+        res.status(err.httpCode).send(JSON.stringify({
+            statusCode:err.httpCode,
+            message:err.message
+        }));
     }else{
         console.error(err);
-        res.status(500).send('Internal Server Error');
+        res.status(500).send(JSON.stringify({
+            statusCode:500,
+            message:'Internal Server Error'
+        }));
     }
 });