Skip to content

Commit 029690c

Browse files
committed
Added try/catches
1 parent 9c47e6f commit 029690c

File tree

2 files changed

+30
-22
lines changed

2 files changed

+30
-22
lines changed

app/controllers/auth/helpers/generateToken.js

Lines changed: 17 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -6,22 +6,26 @@ const { encrypt } = require('../../../middleware/auth')
66
* @param {Object} user - user object
77
*/
88
const generateToken = (user = '') => {
9-
// Gets expiration time
10-
const expiration =
11-
Math.floor(Date.now() / 1000) + 60 * process.env.JWT_EXPIRATION_IN_MINUTES
9+
try {
10+
// Gets expiration time
11+
const expiration =
12+
Math.floor(Date.now() / 1000) + 60 * process.env.JWT_EXPIRATION_IN_MINUTES
1213

13-
// returns signed and encrypted token
14-
return encrypt(
15-
jwt.sign(
16-
{
17-
data: {
18-
_id: user
14+
// returns signed and encrypted token
15+
return encrypt(
16+
jwt.sign(
17+
{
18+
data: {
19+
_id: user
20+
},
21+
exp: expiration
1922
},
20-
exp: expiration
21-
},
22-
process.env.JWT_SECRET
23+
process.env.JWT_SECRET
24+
)
2325
)
24-
)
26+
} catch (error) {
27+
throw error
28+
}
2529
}
2630

2731
module.exports = { generateToken }

app/controllers/auth/helpers/saveUserAccessAndReturnToken.js

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -21,16 +21,20 @@ const saveUserAccessAndReturnToken = (req = {}, user = {}) => {
2121
browser: getBrowserInfo(req),
2222
country: getCountry(req)
2323
})
24-
userAccess.save((err) => {
25-
if (err) {
26-
return reject(buildErrObject(422, err.message))
24+
userAccess.save(async (err) => {
25+
try {
26+
if (err) {
27+
return reject(buildErrObject(422, err.message))
28+
}
29+
const userInfo = await setUserInfo(user)
30+
// Returns data with access token
31+
resolve({
32+
token: generateToken(user._id),
33+
user: userInfo
34+
})
35+
} catch (error) {
36+
reject(error)
2737
}
28-
const userInfo = setUserInfo(user)
29-
// Returns data with access token
30-
resolve({
31-
token: generateToken(user._id),
32-
user: userInfo
33-
})
3438
})
3539
})
3640
}

0 commit comments

Comments
 (0)