changed token object to store expiresAt instead of timeout property

hoodiehq · Dec 1, 2016 · 23ff166 · 23ff166
1 parent c9c9630
commit 23ff166
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 46 deletions.
diff --git a/lib/account.js b/lib/account.js
@@ -13,10 +13,6 @@ function account (setupPromise, state, findAccountOptions) {
           return Promise.reject(errors.TOKEN_TYPE_INVALID)
         }
 
-        if (!tokenOptions.hasOwnProperty('timeout')) {
-          tokenOptions.timeout = 7200
-        }
-
         return setupPromise
 
         .then(function () {

diff --git a/lib/utils/add-token-to-user-doc.js b/lib/utils/add-token-to-user-doc.js
@@ -15,7 +15,11 @@ function addTokenToUserDoc (db, account, token) {
     var id = token.id || uuid.v4()
     delete token.id
 
-    token.createdAt = new Date().toISOString()
+    var timeout = token.hasOwnProperty('timeout') ? token.timeout : 7200
+    delete token.timeout
+    var now = Date.now()
+    token.createdAt = new Date(now).toISOString()
+    token.expiresAt = new Date(now + (timeout * 1000)).toISOString()
 
     userDoc.tokens[id] = token
 

diff --git a/lib/utils/is-token-expired.js b/lib/utils/is-token-expired.js
@@ -1,8 +1,5 @@
 module.exports = isTokenExpired
 
 function isTokenExpired (token) {
-  var timeOutInMs = token.timeout * 1000
-  var createdAtInMs = Date.parse(token.createdAt)
-
-  return createdAtInMs + timeOutInMs < Date.now()
+  return Date.parse(token.expiresAt) <= Date.now()
 }
diff --git a/test/integration/token-rejection-test.js b/test/integration/token-rejection-test.js
@@ -28,7 +28,7 @@ test('token rejection', function (t) {
   })
 
   .then(function (token) {
-    t.is(token.timeout, 0, 'token created with timeout 0s')
+    t.is(token.createdAt, token.expiresAt, 'token created with createdAt and expiresAt same')
 
     return api.sessions.add({
       account: {

diff --git a/test/unit/account/tokens-test.js b/test/unit/account/tokens-test.js
@@ -40,41 +40,5 @@ test('add', function (group) {
     })
   })
 
-  group.test('with timeout set', function (t) {
-    t.plan(1)
-
-    var timeout = 5
-    var token = {
-      id: 'testtoken',
-      type: 'testtype',
-      timeout: timeout
-    }
-
-    account(Promise.reject('mock')).tokens.add(token)
-
-    .catch(function () {
-      t.is(token.timeout, timeout)
-    })
-  })
-
-  group.test('without timeout', function (t) {
-    t.plan(1)
-
-    var compareToken = {
-      id: 'testtoken',
-      type: 'testtype',
-      timeout: 7200
-    }
-    var tokenWithoutTimeout = {
-      id: 'testtoken',
-      type: 'testtype'
-    }
-    account(Promise.reject('mock')).tokens.add(tokenWithoutTimeout)
-
-    .catch(function () {
-      t.deepEqual(tokenWithoutTimeout, compareToken)
-    })
-  })
-
   group.end()
 })