From 92cf6bb887ffb1bb8264ec87d189bbf3e361745a Mon Sep 17 00:00:00 2001 From: Julien Fontanet Date: Mon, 30 Nov 2020 11:22:17 +0100 Subject: [PATCH] chore(xo-server/authentication): parseDuration in constructor --- packages/xo-server/src/xo-mixins/authentication.js | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/packages/xo-server/src/xo-mixins/authentication.js b/packages/xo-server/src/xo-mixins/authentication.js index 1ff883c49..1b164822c 100644 --- a/packages/xo-server/src/xo-mixins/authentication.js +++ b/packages/xo-server/src/xo-mixins/authentication.js @@ -14,8 +14,10 @@ const log = createLogger('xo:authentification') const noSuchAuthenticationToken = id => noSuchObject(id, 'authenticationToken') export default class { - constructor(xo, config) { - this._config = config.authentication + constructor(xo, { authentication: config }) { + this._defaultTokenValidity = parseDuration(config.defaultTokenValidity) + this._maxTokenValidity = parseDuration(config.maxTokenValidity) + this._providers = new Set() this._xo = xo @@ -158,11 +160,11 @@ export default class { // ----------------------------------------------------------------- - async createAuthenticationToken({ expiresIn = this._config.defaultTokenValidity, userId }) { + async createAuthenticationToken({ expiresIn = this._defaultTokenValidity, userId }) { const token = new Token({ id: await generateToken(), user_id: userId, - expiration: Date.now() + Math.min(parseDuration(expiresIn), parseDuration(this._config.maxTokenValidity)), + expiration: Date.now() + Math.min(expiresIn, this._maxTokenValidity), }) await this._tokens.add(token)