diff --git a/src/config/passport.js b/src/config/passport.js index 71bae27..c072fa3 100644 --- a/src/config/passport.js +++ b/src/config/passport.js @@ -24,7 +24,7 @@ async function localVerify(email, password, done) { let user; try { const sqlSelect = - 'SELECT user_id, email, password, is_active FROM users WHERE email = ?'; + 'SELECT user_id, email, password, nickname, is_active FROM users WHERE email = ?'; await db .query(sqlSelect, email) diff --git a/src/controllers/authController.js b/src/controllers/authController.js index ab7a274..61a8329 100644 --- a/src/controllers/authController.js +++ b/src/controllers/authController.js @@ -97,7 +97,7 @@ module.exports = { }); } const token = jwt.sign(user[0].user_id, process.env.JWT_SECRET_KEY); - const tempNickname = getRandomNickname(); + const tempNickname = user[0].nickname ? null : getRandomNickname(); return res.status(StatusCode.OK).json({ success: true, message: SuccessMessage.loginSuccess, @@ -141,7 +141,7 @@ module.exports = { if (isVerify) { await User.signIn(req).then((result) => { const token = jwt.sign(result[0].user_id, process.env.JWT_SECRET_KEY); - const tempNickname = getRandomNickname(); + const tempNickname = result[0].nickname ? null : getRandomNickname(); return res.status(StatusCode.OK).json({ success: true, message: SuccessMessage.loginSuccess, diff --git a/src/models/user.js b/src/models/user.js index 0a70950..83e0268 100644 --- a/src/models/user.js +++ b/src/models/user.js @@ -28,7 +28,7 @@ module.exports = { const email = req.body.email; const sqlSelect = - 'SELECT user_id, email, push_state FROM users WHERE email = ? AND is_active = true'; + 'SELECT user_id, email, nickname, push_state FROM users WHERE email = ? AND is_active = true'; const [rows] = await db.query(sqlSelect, [email]);