refs '#6264' feat: memoization accessTokenConfig
This commit is contained in:
parent
b02e1f000e
commit
67faf076d2
|
@ -1,5 +1,8 @@
|
||||||
|
const tokenConfig = require('./token-config');
|
||||||
|
|
||||||
|
module.exports = async token => {
|
||||||
|
const accessTokenConfig = await tokenConfig();
|
||||||
|
|
||||||
module.exports = async(token, accessTokenConfig) => {
|
|
||||||
const now = new Date();
|
const now = new Date();
|
||||||
const differenceMilliseconds = now - token.created;
|
const differenceMilliseconds = now - token.created;
|
||||||
const differenceSeconds = Math.floor(differenceMilliseconds / 1000);
|
const differenceSeconds = Math.floor(differenceMilliseconds / 1000);
|
||||||
|
|
|
@ -1,5 +1,7 @@
|
||||||
const UserError = require('vn-loopback/util/user-error');
|
const UserError = require('vn-loopback/util/user-error');
|
||||||
const handlePromiseLogout = (Self, {id}, courtesyTime = 60) => {
|
const tokenConfig = require('./token-config');
|
||||||
|
const DEFAULT_COURTESY_TIME = 60;
|
||||||
|
const handlePromiseLogout = (Self, {id}, courtesyTime = DEFAULT_COURTESY_TIME) => {
|
||||||
new Promise(res => {
|
new Promise(res => {
|
||||||
setTimeout(() => {
|
setTimeout(() => {
|
||||||
res(Self.logout(id));
|
res(Self.logout(id));
|
||||||
|
@ -23,14 +25,13 @@ module.exports = Self => {
|
||||||
});
|
});
|
||||||
|
|
||||||
Self.renewToken = async function(ctx) {
|
Self.renewToken = async function(ctx) {
|
||||||
const models = Self.app.models;
|
const {accessToken: token} = ctx.req;
|
||||||
const token = ctx.req.accessToken;
|
|
||||||
|
|
||||||
// Check if current token is valid
|
// Check if current token is valid
|
||||||
const isValid = await Self.validateToken(token);
|
const isValid = await Self.validateToken(token);
|
||||||
if (!isValid) throw new UserError(`The renew period has not been exceeded`, 'periodNotExceeded');
|
if (!isValid) throw new UserError(`The renew period has not been exceeded`, 'periodNotExceeded');
|
||||||
const fields = ['courtesyTime'];
|
|
||||||
const {courtesyTime} = await models.AccessTokenConfig.findOne({fields});
|
const {courtesyTime} = await tokenConfig();
|
||||||
|
|
||||||
// Schedule to remove current token
|
// Schedule to remove current token
|
||||||
handlePromiseLogout(Self, token, courtesyTime);
|
handlePromiseLogout(Self, token, courtesyTime);
|
||||||
|
|
|
@ -0,0 +1,9 @@
|
||||||
|
const DEFAULT_FIELDS = ['renewPeriod', 'courtesyTime'];
|
||||||
|
const {models} = require('vn-loopback/server/server');
|
||||||
|
let currentAccessTokenConfig = null;
|
||||||
|
module.exports = async(fields = DEFAULT_FIELDS) => {
|
||||||
|
if (currentAccessTokenConfig) return currentAccessTokenConfig;
|
||||||
|
const accessTokenConfig = await models.AccessTokenConfig.findOne({fields});
|
||||||
|
if (!accessTokenConfig) currentAccessTokenConfig = accessTokenConfig;
|
||||||
|
return accessTokenConfig;
|
||||||
|
};
|
|
@ -14,9 +14,7 @@ module.exports = Self => {
|
||||||
});
|
});
|
||||||
|
|
||||||
Self.validateToken = async function(token) {
|
Self.validateToken = async function(token) {
|
||||||
const fields = ['renewPeriod', 'courtesyTime'];
|
const isValid = await isTokenValid(token);
|
||||||
const accessTokenConfig = await Self.app.models.AccessTokenConfig.findOne({fields});
|
|
||||||
const isValid = await isTokenValid(token, accessTokenConfig);
|
|
||||||
return isValid;
|
return isValid;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
Loading…
Reference in New Issue