corebasic 1.0.135 → 1.0.137
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/libs/session.js +10 -2
- package/package.json +1 -1
package/libs/session.js
CHANGED
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import jwt from 'jsonwebtoken'
|
|
2
2
|
import * as Privilege from './privileges.js'
|
|
3
|
+
import * as Utils from './utils.js'
|
|
3
4
|
let app
|
|
4
5
|
|
|
5
6
|
|
|
@@ -45,9 +46,12 @@ export const start = (expressApp, allowedUrls) => {
|
|
|
45
46
|
let { userId, clientId, refreshToken } = req.body
|
|
46
47
|
const decoded = jwt.verify(refreshToken, REFRESH_TOKEN_SECRET)
|
|
47
48
|
if (decoded.userId === userId && decoded.clientId === clientId) {
|
|
49
|
+
let now = Utils.now()
|
|
50
|
+
let accessTokenExpiry = new Date(now); accessTokenExpiry.setDate(accessTokenExpiry.getDate() + 1); accessTokenExpiry = accessTokenExpiry.getTime()
|
|
51
|
+
let refreshTokenExpiry = new Date(now); refreshTokenExpiry.setDate(refreshTokenExpiry.getDate() + 30); refreshTokenExpiry = refreshTokenExpiry.getTime()
|
|
48
52
|
const accessToken = jwt.sign({ userId, clientId }, ACCESS_TOKEN_SECRET, { expiresIn: '1d' });
|
|
49
53
|
const refreshToken = jwt.sign({ userId, clientId }, REFRESH_TOKEN_SECRET, { expiresIn: '30d' });
|
|
50
|
-
return res.json({ tokens: { accessToken, refreshToken } });
|
|
54
|
+
return res.json({ tokens: { accessToken, refreshToken, accessTokenExpiry, refreshTokenExpiry} });
|
|
51
55
|
}
|
|
52
56
|
// Access Denied
|
|
53
57
|
throw null;
|
|
@@ -63,9 +67,13 @@ export const start = (expressApp, allowedUrls) => {
|
|
|
63
67
|
export const generateAccessToken = (userId, clientId) => {
|
|
64
68
|
let data = { userId, clientId }
|
|
65
69
|
|
|
70
|
+
let now = Utils.now()
|
|
71
|
+
let accessTokenExpiry = new Date(now); accessTokenExpiry.setDate(accessTokenExpiry.getDate() + 1); accessTokenExpiry = accessTokenExpiry.getTime()
|
|
72
|
+
let refreshTokenExpiry = new Date(now); refreshTokenExpiry.setDate(refreshTokenExpiry.getDate() + 30); refreshTokenExpiry = refreshTokenExpiry.getTime()
|
|
73
|
+
|
|
66
74
|
const accessToken = jwt.sign(data, ACCESS_TOKEN_SECRET, { expiresIn: '1d' });
|
|
67
75
|
const refreshToken = jwt.sign(data, REFRESH_TOKEN_SECRET, { expiresIn: '30d' });
|
|
68
|
-
return { accessToken, refreshToken };
|
|
76
|
+
return { accessToken, refreshToken, accessTokenExpiry, refreshTokenExpiry };
|
|
69
77
|
}
|
|
70
78
|
|
|
71
79
|
|