Model

app.js

@@ -5,20 +5,6 @@ const cookieParser = require('cookie-parser');
 const morgan = require('morgan');
 const {stream} = require('./logger');
 const bodyParser = require('body-parser');
-const session = require('express-session');
-const MySQLStore = require('express-mysql-session')(session); 
-//const logger = require('./logger');
-//const morganFormat = process.env.NODE_ENV !== "production" ? "dev" : "combined"; // NOTE: morgan 출력 형태
-
-var options = {                                                 
-  host: '10.19.247.204',
-  port: 3306,
-  user: '42seoul',
-  password: 'kookmin',
-  database: 'innoacca',
-};
-
-var sessionStore = new MySQLStore(options);
 
 let envPath = '';
 process.env.NODE_ENV = ( process.env.NODE_ENV && ( process.env.NODE_ENV ).trim().toLowerCase() == 'production' ) ? 'production' : 'development';
@@ -48,16 +34,6 @@ app.use(express.urlencoded({ extended: false }));
 app.use(bodyParser.urlencoded({ extended: false }));
 app.use(bodyParser.json());
 app.use(cookieParser());
-app.use(session({
-  key: 'sid',
-  secret: 'secret',
-  resave: false,
-  saveUninitialized: true,
-  store: sessionStore,
-  cookie: {
-    maxAge: 24000 * 60 * 60 // 쿠키 유효기간 24시간
-  }
-}));
 app.use(express.static(path.join(__dirname, 'public')));
 //app.use(morgan(morganFormat, { stream: logger.httpLogStream })); // NOTE: http request 로그 남기기
 app.use(morgan('combined', {stream}));

config/jwt.js

@@ -0,0 +1,3 @@
+let jwtObj = {};
+jwtObj.secret = "apple"
+module.exports = jwtObj

controllers/auth/authController.js

@@ -1,3 +1,6 @@
+let jwt = require("jsonwebtoken");
+let secretObj = require("../../config/jwt");
+
 const signUpDAO = require('../../models/auth/authDAO');
 const userDAO = require('../../models/user/userDAO');
 const paramsCheck = require('../../lib/paramsCheck');
@@ -35,8 +38,6 @@ const signUpController = async (req, res, next) => {
     try {
       let signUpResult = await signUpDAO.signUpDAO(reqUserDataObject);
       let authResult = await signUpDAO.authDAO(reqAuthDataObject);
-      console.log(signUpResult);
-      console.log(authResult);
       return res.status(200).send({ signUpResult, authResult });
     } catch (err) {
       return res.status(500).send(err);
@@ -59,6 +60,16 @@ const signInController = async (req, res, next) => {
   let DBPassword = signInResult[0][0].password;
   let hashPassword = crypto.createHash("sha512").update(password + salt).digest("hex");
 
+  let token = jwt.sign({
+    id: id,
+    password: hashPassword,   // 토큰의 내용(payload)
+    usn: userResult[0][0].USN,
+  },
+  secretObj.secret ,    // 비밀 키
+  {
+    expiresIn: '60m'    // 유효 시간은 5분
+  })
+
   if(paramsCheck.numberCheck([]) === false) {
     return res.status(500).json({ statusCode: 500, message: `Cotroller: 정수가 아닌 파라미터` })
   }
@@ -70,15 +81,10 @@ const signInController = async (req, res, next) => {
     reqDataObject.password = hashPassword;
     try {
       if (reqDataObject.password === DBPassword) {
-        req.session.usn = userResult[0][0].USN;
-        //res.redirect("/index");
-        // return res.status(200).send({statusCode: 202, message: `로그인 성공`});
-        req.session.save(() => {
-          res.send({
-            title: "로그인 성공",
-            session : req.session
-          });
-        });
+        res.cookie("token", token);
+        res.json({
+          token: token
+        })
       }
       else {
         return res.status(500).json({ statusCode: 502, message: `Controller: 비밀번호 틀림` });
@@ -90,10 +96,6 @@ const signInController = async (req, res, next) => {
 }
 
 const signOutController = async (req, res, next) => {
-  console.log(req.session.id);
-  req.session.destroy();
-  res.clearCookie('sid');
-
   res.redirect("/auth/login")
 }
 

controllers/lib/jwtCheck.js

@@ -0,0 +1,15 @@
+let jwt = require("jsonwebtoken");
+let secretObj = require("../../config/jwt");
+
+const jwtCheckLogic = (req, res) => {
+	const token = req.headers['x-access-token'] || req.query.token;
+	//console.log(token);
+
+	let decoded = jwt.verify(token, secretObj.secret);
+
+	return decoded;
+}
+
+module.exports = {
+	jwtCheckLogic,
+}

controllers/lib/keyword.js

@@ -4,7 +4,6 @@ const keywordLogic = (categoryResult, keywordResult) => {
 	let libResult = new Array();
 
 	for (i = 0; i < keywordResult[0].length; i++) {
-		console.log("start: " + start + " category: " + keywordResult[0][i].category_ID);
 		if (start === keywordResult[0][i].category_ID) {
 			keywordList[start].keyword.push({
 				"keywordId": keywordResult[0][i].keyword_ID,
@@ -34,8 +33,6 @@ const keywordLogic = (categoryResult, keywordResult) => {
 		}
 	}
 
-	console.log(keywordList);
-
 	libResult.push({
 		allCategory: [],
 	})

controllers/user/userController.js

@@ -1,9 +1,11 @@
 const userDAO = require('../../models/user/userDAO');
 const paramsCheck = require('../../lib/paramsCheck');
 const lib = require('../lib/createReqDataObject');
+let jwtCheckLogic = require("../lib/jwtCheck");
 
 const getUserController = async (req, res, next) => {
-  let usn = parseInt(req.params.usn);
+  let decoded = jwtCheckLogic.jwtCheckLogic(req, res);
+  let usn = decoded.usn;
 
   if(paramsCheck.numberCheck([usn]) === false) {
     return res.status(500).json({ statusCode: 500, message: `Cotroller: 정수가 아닌 파라미터` })
@@ -13,6 +15,7 @@ const getUserController = async (req, res, next) => {
   }
   else {
     let reqDataObject = lib.createReqDataObject(req.params, req.body);
+    reqDataObject.usn = usn
     try {
       let users = await userDAO.getUserDAO(reqDataObject);
       return res.status(200).send(users[0][0]);

package.json

@@ -16,6 +16,7 @@
     "express-mysql-session": "^2.1.4",
     "express-session": "^1.17.1",
     "http-errors": "~1.6.3",
+    "jsonwebtoken": "^8.5.1",
     "morgan": "~1.9.1",
     "mysql2": "^2.1.0",
     "nodemon": "^2.0.4",

routes/user.js

@@ -6,7 +6,7 @@ const careerController = require('../controllers/user/careerController');
 const matchingController = require('../controllers/user/matchingController');
 
 // USER
-router.get('/inform/:usn', userController.getUserController);
+router.get('/inform', userController.getUserController);
 router.put('/inform/:usn', userController.updateUserController);
 
 // KEYWORD

views/index.ejs

@@ -13,3 +13,5 @@
     </form>
   </body>
 </html>
+
+