Commit d9089b86 authored by seoyeon's avatar seoyeon
Browse files

.

parent 771a51f8
...@@ -44,34 +44,6 @@ const login = async (req, res) => { ...@@ -44,34 +44,6 @@ const login = async (req, res) => {
const signup = async (req, res) => { const signup = async (req, res) => {
try { try {
<<<<<<< HEAD
console.log('signup= ', req.body);
const { name, password, id } = req.body;
if (!isLength(name, {min: 3, max: 10})) {
return res.status(422).send('이름은 3-10자 사이입니다')
} else if (!isLength(password, {min: 6})) {
return res.status(422).send('비밀번호는 6자 이상입니다')
} else if (!isLength(id, {min:3, max10})) {
return res.status(422).send('아이디는 3-10자 사이입니다')
}
const user = await User.scope("password").findOne({ where: email });
if (user)
return res.status(422).send(`${email} 이미 존재하는 사용자입니다/+ `);
const hash = await bcrypt.hash(password, 10)
const newUser = await new User ({
name,
password: hash,
id
}).save()
console.log(newUser)
res.json(newUser)
} catch (error) {
console.log(error);
return res.status(500).send("회원가입 중 에러")
}
}
=======
console.log("sign up= ", req.body); console.log("sign up= ", req.body);
const { id, name, email, password, gender, phone } = req.body; const { id, name, email, password, gender, phone } = req.body;
const user = User.create({ id, name, email, password, gender, phone }); const user = User.create({ id, name, email, password, gender, phone });
...@@ -81,13 +53,8 @@ const signup = async (req, res) => { ...@@ -81,13 +53,8 @@ const signup = async (req, res) => {
} }
}; };
>>>>>>> origin/master
export default { export default {
test, test,
login, login,
<<<<<<< HEAD
signup
=======
signup, signup,
>>>>>>> origin/master
}; };
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment