FIX: 로그인, 회원가입에러 수정

.github/workflows/deploy.yml

@@ -28,10 +28,4 @@ jobs:
           username: ${{ secrets.USER }}
           password: ${{ secrets.PASSWORD }}
           script: |
-            cd Together
-            git reset --hard
-            git fetch
-            git pull
-            npm i
-            pm2 delete 0
-            pm2 start --no-daemon app.js
+            ./deploy.sh

controller/auth.controller.js

@@ -4,18 +4,16 @@ import {} from 'express-async-errors';
 import * as userRepository from '../data/auth.js';
 import { config } from '../config.js';
 
-//id pw email name gender location hobby
-
 export async function signUp(req, res) {
-	const { intraId, pw, email, url } = req.body;
+	const { intraId, password, email, url } = req.body;
 	const user = await userRepository.findByintraId(intraId);
 	if(user){ //이미 존재하는 사용자라면
 		return res.status(400).json({message: `${intraId} already exists`});
 	}
-	const hashed = await bcrypt.hash(pw, config.bcrypt.saltRounds);
+	const hashed = await bcrypt.hash(password, config.bcrypt.saltRounds);
 	const userId = await userRepository.createUser({
 		intraId,
-		pw: hashed,
+		password: hashed,
 		email,
 		url,
 	});
@@ -24,12 +22,12 @@ export async function signUp(req, res) {
 }
 
 export async function login(req, res) {
-	const { intraId, pw } = req.body;
+	const { intraId, password } = req.body;
 	const user = await userRepository.findByintraId(intraId);
 	if(!user){//사용자가 존재하는지 검사
 		return res.status(401).json({message: 'Invalid user or password'});
 	}
-	const isValidPassword = await bcrypt.compare(pw, user.pw);
+	const isValidPassword = await bcrypt.compare(password, user.password);
 	if(!isValidPassword){//비밀먼호 검증
 		return res.status(401).json({message: 'Invalid user or password'});
 	}

data/auth.js

@@ -13,10 +13,10 @@ export async function findByintraId(intraId) {
 }
 
 export async function createUser(user) {
-	const {intraId, pw, email, url} = user;
+	const {intraId, password, email, url} = user;
 	return db
-	.execute('INSERT INTO users (intraId, pw, email, url) VALUES (?,?,?,?)',
-	[intraId, pw, email, url]
+	.execute('INSERT INTO users (intraId, password, email, url) VALUES (?,?,?,?)',
+	[intraId, password, email, url]
 	)
 	.then((result) => result[0].insertId);
 }

routes/auth.js

@@ -22,7 +22,7 @@ const validateCredential = [
 		.notEmpty()
 		.isLength({min:2})
 		.withMessage('intraId should be at least 2 characters'),
-	body('pw')
+	body('password')
 		.trim()
 		.isLength({min:8})
 		.withMessage('password should be at least 5 characters'),