Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit 8e0c2f1

Browse files
Missing try/catches
1 parent f40d71b commit 8e0c2f1

37 files changed

+152
-82
lines changed

‎app/controllers/auth/helpers/checkPermissions.js

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,16 @@ const { itemNotFound, buildErrObject } = require('../../../middleware/utils')
88
*/
99
const checkPermissions = ({ id = '', roles = [] }, next) => {
1010
return new Promise((resolve, reject) => {
11-
User.findById(id, (err, result) => {
12-
itemNotFound(err, result, 'NOT_FOUND')
13-
if (roles.indexOf(result.role) > -1) {
14-
return resolve(next())
11+
User.findById(id, async (err, result) => {
12+
try {
13+
await itemNotFound(err, result, 'USER_NOT_FOUND')
14+
if (roles.indexOf(result.role) > -1) {
15+
return resolve(next())
16+
}
17+
reject(buildErrObject(401, 'UNAUTHORIZED'))
18+
} catch (error) {
19+
reject(error)
1520
}
16-
return reject(buildErrObject(401, 'UNAUTHORIZED'))
1721
})
1822
})
1923
}

‎app/controllers/auth/helpers/findForgotPassword.js

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
const ForgotPassword = require('../../../models/forgotPassword')
22
const { itemNotFound } = require('../../../middleware/utils')
3+
const { reject } = require('bcrypt/promises')
34

45
/**
56
* Checks if a forgot password verification exists
@@ -12,9 +13,13 @@ const findForgotPassword = (id = '') => {
1213
verification: id,
1314
used: false
1415
},
15-
(err, item) => {
16-
itemNotFound(err, item, 'NOT_FOUND_OR_ALREADY_USED')
17-
resolve(item)
16+
async (err, item) => {
17+
try {
18+
await itemNotFound(err, item, 'NOT_FOUND_OR_ALREADY_USED')
19+
resolve(item)
20+
} catch (error) {
21+
reject(error)
22+
}
1823
}
1924
)
2025
})

‎app/controllers/auth/helpers/findUser.js

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
const User = require('../../../models/user')
22
const { itemNotFound } = require('../../../middleware/utils')
3+
const { reject } = require('bcrypt/promises')
34

45
/**
56
* Finds user by email
@@ -12,9 +13,13 @@ const findUser = (email = '') => {
1213
email
1314
},
1415
'password loginAttempts blockExpires name email role verified verification',
15-
(err, item) => {
16-
itemNotFound(err, item, 'USER_DOES_NOT_EXIST')
17-
resolve(item)
16+
async (err, item) => {
17+
try {
18+
await itemNotFound(err, item, 'USER_DOES_NOT_EXIST')
19+
resolve(item)
20+
} catch (error) {
21+
reject(error)
22+
}
1823
}
1924
)
2025
})

‎app/controllers/auth/helpers/findUserById.js

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,20 @@
11
const User = require('../../../models/user')
22
const { itemNotFound } = require('../../../middleware/utils')
3+
const { reject } = require('bcrypt/promises')
34

45
/**
56
* Finds user by ID
67
* @param {string} id - user ́s id
78
*/
89
const findUserById = (userId = '') => {
910
return new Promise((resolve) => {
10-
User.findById(userId, (err, item) => {
11-
itemNotFound(err, item, 'USER_DOES_NOT_EXIST')
12-
resolve(item)
11+
User.findById(userId, async (err, item) => {
12+
try {
13+
await itemNotFound(err, item, 'USER_DOES_NOT_EXIST')
14+
resolve(item)
15+
} catch (error) {
16+
reject(error)
17+
}
1318
})
1419
})
1520
}

‎app/controllers/auth/helpers/findUserToResetPassword.js

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
const User = require('../../../models/user')
22
const { itemNotFound } = require('../../../middleware/utils')
3+
const { reject } = require('bcrypt/promises')
34

45
/**
56
* Finds user by email to reset password
@@ -11,9 +12,13 @@ const findUserToResetPassword = (email = '') => {
1112
{
1213
email
1314
},
14-
(err, user) => {
15-
itemNotFound(err, user, 'NOT_FOUND')
16-
resolve(user)
15+
async (err, user) => {
16+
try {
17+
await itemNotFound(err, user, 'NOT_FOUND')
18+
resolve(user)
19+
} catch (error) {
20+
reject(error)
21+
}
1722
}
1823
)
1924
})

‎app/controllers/auth/helpers/markResetPasswordAsUsed.js

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
const { reject } = require('bcrypt/promises')
12
const {
23
getIP,
34
getBrowserInfo,
@@ -17,9 +18,13 @@ const markResetPasswordAsUsed = (req = {}, forgot = {}) => {
1718
forgot.ipChanged = getIP(req)
1819
forgot.browserChanged = getBrowserInfo(req)
1920
forgot.countryChanged = getCountry(req)
20-
forgot.save((err, item) => {
21-
itemNotFound(err, item, 'NOT_FOUND')
22-
resolve(buildSuccObject('PASSWORD_CHANGED'))
21+
forgot.save(async (err, item) => {
22+
try {
23+
await itemNotFound(err, item, 'NOT_FOUND')
24+
resolve(buildSuccObject('PASSWORD_CHANGED'))
25+
} catch (error) {
26+
reject(error)
27+
}
2328
})
2429
})
2530
}

‎app/controllers/auth/helpers/updatePassword.js

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
const { reject } = require('bcrypt/promises')
12
const { itemNotFound } = require('../../../middleware/utils')
23

34
/**
@@ -8,9 +9,13 @@ const { itemNotFound } = require('../../../middleware/utils')
89
const updatePassword = (password = '', user = {}) => {
910
return new Promise((resolve) => {
1011
user.password = password
11-
user.save((err, item) => {
12-
itemNotFound(err, item, 'NOT_FOUND')
13-
resolve(item)
12+
user.save(async (err, item) => {
13+
try {
14+
await itemNotFound(err, item, 'NOT_FOUND')
15+
resolve(item)
16+
} catch (error) {
17+
reject(error)
18+
}
1419
})
1520
})
1621
}

‎app/controllers/auth/helpers/verificationExists.js

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
const User = require('../../../models/user')
22
const { itemNotFound } = require('../../../middleware/utils')
3+
const { reject } = require('bcrypt/promises')
34

45
/**
56
* Checks if verification id exists for user
@@ -12,9 +13,13 @@ const verificationExists = (id = '') => {
1213
verification: id,
1314
verified: false
1415
},
15-
(err, user) => {
16-
itemNotFound(err, user, 'NOT_FOUND_OR_ALREADY_VERIFIED')
17-
resolve(user)
16+
async (err, user) => {
17+
try {
18+
await itemNotFound(err, user, 'NOT_FOUND_OR_ALREADY_VERIFIED')
19+
resolve(user)
20+
} catch (error) {
21+
reject(error)
22+
}
1823
}
1924
)
2025
})

‎app/controllers/profile/helpers/changePasswordInDB.js

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -12,19 +12,23 @@ const {
1212
*/
1313
const changePasswordInDB = (id = '', req = {}) => {
1414
return new Promise((resolve, reject) => {
15-
User.findById(id, '+password', (err, user) => {
16-
itemNotFound(err, user, 'NOT_FOUND')
15+
User.findById(id, '+password', async (err, user) => {
16+
try {
17+
await itemNotFound(err, user, 'NOT_FOUND')
1718

18-
// Assigns new password to user
19-
user.password = req.newPassword
19+
// Assigns new password to user
20+
user.password = req.newPassword
2021

21-
// Saves in DB
22-
user.save((error) => {
23-
if (err) {
24-
return reject(buildErrObject(422, error.message))
25-
}
26-
resolve(buildSuccObject('PASSWORD_CHANGED'))
27-
})
22+
// Saves in DB
23+
user.save((error) => {
24+
if (err) {
25+
return reject(buildErrObject(422, error.message))
26+
}
27+
resolve(buildSuccObject('PASSWORD_CHANGED'))
28+
})
29+
} catch (error) {
30+
reject(error)
31+
}
2832
})
2933
})
3034
}

‎app/controllers/profile/helpers/findUser.js

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,20 @@
11
const User = require('../../../models/user')
22
const { itemNotFound } = require('../../../middleware/utils')
3+
const { reject } = require('bcrypt/promises')
34

45
/**
56
* Finds user by id
67
* @param {string} id - user id
78
*/
89
const findUser = (id = '') => {
910
return new Promise((resolve) => {
10-
User.findById(id, 'password email', (err, user) => {
11-
itemNotFound(err, user, 'USER_DOES_NOT_EXIST')
12-
resolve(user)
11+
User.findById(id, 'password email', async (err, user) => {
12+
try {
13+
await itemNotFound(err, user, 'USER_DOES_NOT_EXIST')
14+
resolve(user)
15+
} catch (error) {
16+
reject(error)
17+
}
1318
})
1419
})
1520
}

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /