From 1630b811e26fc77dedcefbe184e139ae310159f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jes=C3=BAs=20Carrera?= Date: Thu, 5 Nov 2015 10:12:22 +0100 Subject: [PATCH 1/4] allow non expiring authentication tokens by setting ttl to -1. I guess this was the initial intent since the -1 value is allowed already --- common/models/access-token.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/models/access-token.js b/common/models/access-token.js index 27cf5206d..3b5d5ee7a 100644 --- a/common/models/access-token.js +++ b/common/models/access-token.js @@ -146,7 +146,7 @@ module.exports = function(AccessToken) { var created = this.created.getTime(); var elapsedSeconds = (now - created) / 1000; var secondsToLive = this.ttl; - var isValid = elapsedSeconds < secondsToLive; + var isValid = secondsToLive === -1 || elapsedSeconds < secondsToLive; if (isValid) { cb(null, isValid); From 49746cef7227875406b0fb6aaa5c67801be3c7b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jes=C3=BAs=20Carrera?= Date: Tue, 17 Nov 2015 18:49:59 +0100 Subject: [PATCH 2/4] introduce a new allowEternalTtl setting to enable this feature --- common/models/access-token.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/common/models/access-token.js b/common/models/access-token.js index 3b5d5ee7a..362d3ab15 100644 --- a/common/models/access-token.js +++ b/common/models/access-token.js @@ -146,7 +146,8 @@ module.exports = function(AccessToken) { var created = this.created.getTime(); var elapsedSeconds = (now - created) / 1000; var secondsToLive = this.ttl; - var isValid = secondsToLive === -1 || elapsedSeconds < secondsToLive; + console.log(this.constructor.settings); + var isValid = (secondsToLive === -1 && this.constructor.settings.allowEternalTtl) || elapsedSeconds < secondsToLive; if (isValid) { cb(null, isValid); From 1c7b556191a28bc5de4aa58f0022ea8141b3e953 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jes=C3=BAs=20Carrera?= Date: Wed, 18 Nov 2015 16:27:46 +0100 Subject: [PATCH 3/4] remove console log --- common/models/access-token.js | 1 - 1 file changed, 1 deletion(-) diff --git a/common/models/access-token.js b/common/models/access-token.js index 362d3ab15..0ccd6301f 100644 --- a/common/models/access-token.js +++ b/common/models/access-token.js @@ -146,7 +146,6 @@ module.exports = function(AccessToken) { var created = this.created.getTime(); var elapsedSeconds = (now - created) / 1000; var secondsToLive = this.ttl; - console.log(this.constructor.settings); var isValid = (secondsToLive === -1 && this.constructor.settings.allowEternalTtl) || elapsedSeconds < secondsToLive; if (isValid) { From 5bdf08316b025b9b96730f4bde766a52a08b3fd5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jes=C3=BAs=20Carrera?= Date: Fri, 13 May 2016 11:51:43 +0200 Subject: [PATCH 4/4] correct camelcase for acronym, and keep consistency with maxTTL setting --- common/models/access-token.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/models/access-token.js b/common/models/access-token.js index 0ccd6301f..389442dfe 100644 --- a/common/models/access-token.js +++ b/common/models/access-token.js @@ -146,7 +146,7 @@ module.exports = function(AccessToken) { var created = this.created.getTime(); var elapsedSeconds = (now - created) / 1000; var secondsToLive = this.ttl; - var isValid = (secondsToLive === -1 && this.constructor.settings.allowEternalTtl) || elapsedSeconds < secondsToLive; + var isValid = (secondsToLive === -1 && this.constructor.settings.allowEternalTTL) || elapsedSeconds < secondsToLive; if (isValid) { cb(null, isValid);