encrypt/gancio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

squash new oauth2 flow

Browse Source
This commit is contained in:
lesion
2022-11-04 12:22:21 +01:00
parent 19ca1b0283
commit 44e9533828
24 changed files with 935 additions and 427 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
server/api/controller/user.js
View File

@@ -44,13 +44,13 @@ const userController = {
},
async current (req, res) {
if (!res.locals.user) { return res.status(400).send('Not logged') }
const user = await User.scope('withoutPassword').findByPk(res.locals.user.id)
if (!req.user) { return res.status(400).send('Not logged') }
const user = await User.scope('withoutPassword').findByPk(req.user.id)
res.json(user)
},
async getAll (req, res) {
const users = await User.scope(res.locals.user.is_admin ? 'withRecover' : 'withoutPassword').findAll({
const users = await User.scope(req.user.is_admin ? 'withRecover' : 'withoutPassword').findAll({
order: [['is_admin', 'DESC'], ['createdAt', 'DESC']]
})
res.json(users)
@@ -62,7 +62,7 @@ const userController = {
if (!user) { return res.status(404).json({ success: false, message: 'User not found!' }) }
if (req.body.id !== res.locals.user.id && !res.locals.user.is_admin) {
if (req.body.id !== req.user.id && !req.user.is_admin) {
return res.status(400).json({ succes: false, message: 'Not allowed' })
}
@@ -123,10 +123,10 @@ const userController = {
async remove (req, res) {
try {
let user
if (res.locals.user.is_admin && req.params.id) {
if (req.user.is_admin && req.params.id) {
user = await User.findByPk(req.params.id)
} else {
user = await User.findByPk(res.locals.user.id)
user = await User.findByPk(req.user.id)
}
await user.destroy()
log.warn(`User ${user.email} removed!`)