Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
students
bora-it
Commits
65c7735b
Commit
65c7735b
authored
Aug 04, 2021
by
seoyeon
Browse files
0804
parent
3a6135b9
Changes
3
Show whitespace changes
Inline
Side-by-side
client/package-lock.json
View file @
65c7735b
...
...
@@ -14078,9 +14078,9 @@
"integrity": "sha512-4WK/bYZmj8xLr+HUCODHGF1ZFzsYffasLUgEiMBY4fgtltdO6B4WJtlSbPaDTLpYTcGVwM2qLnFTICEcNxs3kA=="
},
"tar": {
"version": "6.1.
0
",
"resolved": "https://registry.npmjs.org/tar/-/tar-6.1.
0
.tgz",
"integrity": "sha512-
DUCttfhsnLCjwoDoFcI+B2iJgYa93vBnDUATYEeRx6sntCTdN01VnqsIuTlALXla/LWooNg0yEGeB+Y8WdFxG
A==",
"version": "6.1.
5
",
"resolved": "https://registry.npmjs.org/tar/-/tar-6.1.
5
.tgz",
"integrity": "sha512-
FiK6MQyyaqd5vHuUjbg/NpO8BuEGeSXcmlH7Pt/JkugWS8s0w8nKybWjHDJiwzCAIKZ66uof4ghm4tBADjcqR
A==",
"requires": {
"chownr": "^2.0.0",
"fs-minipass": "^2.0.0",
...
...
server/controllers/user.controller.js
View file @
65c7735b
import
{
User
}
from
"
../models/index.js
"
;
import
jwt
from
"
jsonwebtoken
"
;
import
config
from
"
../config/app.config.js
"
;
import
isLength
from
"
validator/lib/isLength.js
"
;
import
multer
from
"
multer
"
;
import
{
User
}
from
'
../models/index.js
'
import
jwt
from
'
jsonwebtoken
'
import
config
from
'
../config/app.config.js
'
import
isLength
from
'
validator/lib/isLength.js
'
import
multer
from
'
multer
'
const
uploadimg
=
multer
({
dest
:
"
uploads/
"
})
;
const
uploadimg
=
multer
({
dest
:
'
uploads/
'
})
const
imgUpload
=
uploadimg
.
fields
([{
name
:
"
img
"
,
maxCount
:
1
}])
;
const
imgUpload
=
uploadimg
.
fields
([{
name
:
'
img
'
,
maxCount
:
1
}])
const
update
=
async
(
req
,
res
)
=>
{
try
{
console
.
log
(
"
id:
"
,
req
.
body
.
id
)
;
const
id
=
req
.
body
.
id
;
const
avatar
=
req
.
files
[
"
img
"
][
0
]
;
const
img
=
avatar
.
filename
;
console
.
log
(
img
)
;
await
User
.
update
({
img
:
img
},
{
where
:
{
id
:
id
}
})
;
res
.
json
(
img
)
;
console
.
log
(
'
id:
'
,
req
.
body
.
id
)
const
id
=
req
.
body
.
id
const
avatar
=
req
.
files
[
'
img
'
][
0
]
const
img
=
avatar
.
filename
console
.
log
(
img
)
await
User
.
update
({
img
:
img
},
{
where
:
{
id
:
id
}
})
res
.
json
(
img
)
}
catch
(
error
)
{
console
.
log
(
error
)
;
res
.
status
(
500
).
send
(
"
이미지 업데이트 실패
"
);
console
.
log
(
error
)
res
.
status
(
500
).
send
(
'
이미지 업데이트 실패
'
)
}
}
;
}
const
getUser
=
async
(
req
,
res
)
=>
{
const
user
=
await
User
.
findOne
({
where
:
{
id
:
req
.
params
.
id
}
})
;
const
user
=
await
User
.
findOne
({
where
:
{
id
:
req
.
params
.
id
}
})
res
.
json
(
user
)
}
;
}
const
updateinfo
=
async
(
req
,
res
)
=>
{
console
.
log
(
req
.
body
)
;
const
{
id
,
name
,
email
,
phone
,
img
}
=
req
.
body
;
console
.
log
(
"
id:
"
,
id
)
;
console
.
log
(
req
.
body
)
const
{
id
,
name
,
email
,
phone
,
img
}
=
req
.
body
console
.
log
(
'
id:
'
,
id
)
const
A
=
{
name
:
name
,
email
:
email
,
phone
:
phone
,
img
:
img
,
}
;
await
User
.
update
(
A
,
{
where
:
{
id
:
id
}
})
;
const
user
=
await
User
.
findOne
({
where
:
{
id
:
id
}
})
;
}
await
User
.
update
(
A
,
{
where
:
{
id
:
id
}
})
const
user
=
await
User
.
findOne
({
where
:
{
id
:
id
}
})
console
.
log
(
'
user:
'
,
user
)
}
;
}
const
login
=
async
(
req
,
res
)
=>
{
try
{
const
{
email
,
password
}
=
req
.
body
const
user
=
await
User
.
findOne
({
where
:
{
email
:
email
}
})
if
(
!
user
)
{
return
res
.
status
(
422
).
send
(
`
${
email
}
사용자가 존재하지 않습니다.`
)
;
return
res
.
status
(
422
).
send
(
`
${
email
}
사용자가 존재하지 않습니다.`
)
}
else
{
const
passworMatch
=
await
user
.
comparePassword
(
password
)
;
const
passworMatch
=
await
user
.
comparePassword
(
password
)
if
(
passworMatch
)
{
const
token
=
jwt
.
sign
({
userID
:
user
.
id
},
config
.
jwtSecret
,
{
expiresIn
:
config
.
jwtExpires
,
})
;
})
res
.
cookie
(
config
.
cookieName
,
token
,
{
path
:
"
/
"
,
path
:
'
/
'
,
httpOnly
:
true
,
secure
:
true
,
})
;
res
.
json
(
user
)
;
})
res
.
json
(
user
)
}
else
{
res
.
status
(
401
).
send
(
"
비밀번호가 일치하지 않습니다.
"
);
res
.
status
(
401
).
send
(
'
비밀번호가 일치하지 않습니다.
'
)
}
}
}
catch
(
error
)
{
return
res
.
status
(
500
).
send
(
'
로그인 중 에러
'
)
}
}
;
}
const
signup
=
async
(
req
,
res
)
=>
{
console
.
log
(
'
sign up=
'
,
req
.
body
)
const
{
name
,
email
,
password
,
phone
}
=
req
.
body
const
id
=
Math
.
floor
(
Math
.
random
()
*
(
9999
-
1000
)
+
1000
)
...
...
@@ -77,20 +76,20 @@ const signup = async (req, res) => {
const
Id
=
await
User
.
findOne
({
where
:
{
id
:
id
}
})
// console.log('Id 중복확인:', Id)
while
(
Id
)
{
const
id
=
Math
.
floor
(
Math
.
random
()
*
(
9999
-
1000
)
+
1000
)
;
const
Id
=
await
User
.
findOne
({
where
:
{
id
:
id
}
})
;
const
id
=
Math
.
floor
(
Math
.
random
()
*
(
9999
-
1000
)
+
1000
)
const
Id
=
await
User
.
findOne
({
where
:
{
id
:
id
}
})
}
try
{
const
user
=
await
User
.
findOne
({
where
:
{
email
:
email
}
})
;
const
user
=
await
User
.
findOne
({
where
:
{
email
:
email
}
})
if
(
user
)
{
return
res
.
status
(
422
).
send
(
`
${
email
}
이미 존재하는 사용자입니다.`
)
;
return
res
.
status
(
422
).
send
(
`
${
email
}
이미 존재하는 사용자입니다.`
)
}
else
{
if
(
!
isLength
(
name
,
{
min
:
2
,
max
:
10
}))
{
return
res
.
status
(
422
).
send
(
"
이름은 2-10자 사이입니다
"
);
}
else
if
(
!
isLength
(
password
,
{
min
:
6
}))
{
return
res
.
status
(
422
).
send
(
"
비밀번호는 6자이상 입니다
"
);
return
res
.
status
(
422
).
send
(
'
이름은 2-10자 사이입니다
'
)
}
else
if
(
!
isLength
(
email
,
{
min
:
3
,
max
:
10
}))
{
return
res
.
status
(
422
).
send
(
"
아이디는 3-10자 사이입니다
"
);
return
res
.
status
(
422
).
send
(
'
아이디는 3-10자 사이입니다
'
)
}
else
if
(
!
isLength
(
password
,
{
min
:
6
}))
{
return
res
.
status
(
422
).
send
(
'
비밀번호는 6자이상 입니다
'
)
}
const
newUser
=
{
id
:
id
,
...
...
@@ -99,20 +98,20 @@ const signup = async (req, res) => {
password
:
password
,
phone
:
phone
,
}
console
.
log
(
'
newUser:
'
,
newUser
)
console
.
log
(
'
newUser:
'
,
newUser
)
await
User
.
create
(
newUser
)
res
.
json
(
true
)
}
}
catch
(
error
)
{
console
.
log
(
error
)
;
return
res
.
status
(
500
).
send
(
"
회원가입 중 에러
"
);
console
.
log
(
error
)
return
res
.
status
(
500
).
send
(
'
회원가입 중 에러
'
)
}
}
;
}
const
logout
=
(
req
,
res
)
=>
{
res
.
clearCookie
(
"
token
"
);
res
.
send
(
"
Logout Successful
"
);
}
;
res
.
clearCookie
(
'
token
'
)
res
.
send
(
'
Logout Successful
'
)
}
export
default
{
getUser
,
...
...
@@ -122,4 +121,4 @@ export default {
imgUpload
,
update
,
updateinfo
,
}
;
}
server/models/room.model.js
View file @
65c7735b
...
...
@@ -16,7 +16,7 @@ const RoomModel = (sequelize) => {
type
:
DataTypes
.
INTEGER
,
},
member
:
{
type
:
DataTypes
.
ARRAY
(
DataTypes
.
INTEGER
),
type
:
DataTypes
.
ARRAY
(
DataTypes
.
STRING
),
//type: DataTypes.STRING,
},
profileimg
:
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment