liz/wikijs-fork
liz/wikijs-fork
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: use config value for tokenRenewal expiration (#2042)

Browse Source 
* fix: tokenRenewal seems to be hard coded #1540
This commit is contained in:
Regev Brody 2020-06-18 20:08:57 +03:00 committed by GitHub
parent 330c90229e
commit 0e6340f51e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
server/core/auth.js
View File

@ -2,6 +2,7 @@ const passport = require('passport')
const passportJWT = require('passport-jwt') const passportJWT = require('passport-jwt')
const _ = require('lodash') const _ = require('lodash')
const jwt = require('jsonwebtoken') const jwt = require('jsonwebtoken')
const ms = require('ms')
const moment = require('moment') const moment = require('moment')
const Promise = require('bluebird') const Promise = require('bluebird')
const crypto = Promise.promisifyAll(require('crypto')) const crypto = Promise.promisifyAll(require('crypto'))
@ -112,7 +113,8 @@ module.exports = {
if (err) { return next() } if (err) { return next() }
// Expired but still valid within N days, just renew // Expired but still valid within N days, just renew
if (info instanceof Error && info.name === 'TokenExpiredError' && moment().subtract(14, 'days').isBefore(info.expiredAt)) { if (info instanceof Error && info.name === 'TokenExpiredError' &&
moment().subtract(ms(WIKI.config.auth.tokenRenewal), 'ms').isBefore(info.expiredAt)) {
const jwtPayload = jwt.decode(securityHelper.extractJWT(req)) const jwtPayload = jwt.decode(securityHelper.extractJWT(req))
try { try {
const newToken = await WIKI.models.users.refreshToken(jwtPayload.id) const newToken = await WIKI.models.users.refreshToken(jwtPayload.id)