fix: expires_in was always 0

netiam · Feb 19, 2016 · 3b3a459 · 3b3a459
1 parent f6382ca
commit 3b3a459
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 5 deletions.
diff --git a/src/grant-types/password.js b/src/grant-types/password.js
@@ -90,9 +90,10 @@ export default function({
           return Promise
             .all([accessToken, refreshToken])
             .then(tokens => {
+              const [accessToken, refreshToken] = tokens
               res.body = {
-                access_token: tokens[0][tokenField],
-                refresh_token: tokens[1][tokenField],
+                access_token: accessToken[tokenField],
+                refresh_token: refreshToken[tokenField],
                 token_type: ACCESS_TOKEN_TYPE_BEARER,
                 expires_in: moment(accessToken.expires_at).diff(moment(), 'seconds'),
                 user_id: user.id

diff --git a/src/grant-types/refresh-token.js b/src/grant-types/refresh-token.js
@@ -69,11 +69,12 @@ export default function({
           return Promise
             .all([accessToken, refreshToken])
             .then(tokens => {
+              const [accessToken, refreshToken] = tokens
               res.body = {
-                access_token: tokens[0][tokenField],
-                refresh_token: tokens[1][tokenField],
+                access_token: accessToken[tokenField],
+                refresh_token: refreshToken[tokenField],
                 token_type: ACCESS_TOKEN_TYPE_BEARER,
-                expires_in: moment(tokens[0].expires_at).diff(moment(), 'seconds'),
+                expires_in: moment(accessToken.expires_at).diff(moment(), 'seconds'),
                 user_id: owner.id
               }
             })

diff --git a/test/tokens/refresh-token.js b/test/tokens/refresh-token.js
@@ -45,6 +45,14 @@ describe('netiam-contrib', () => {
       .expect(200)
       .expect('Content-Type', /json/)
       .expect(res => {
+        res.body.should.have.properties([
+          'access_token',
+          'refresh_token',
+          'token_type',
+          'expires_in',
+          'user_id'
+        ])
+        res.body.expires_in.should.be.above(3000)
         refreshToken = res.body.refresh_token
       })
       .end(done)
@@ -69,6 +77,7 @@ describe('netiam-contrib', () => {
           'expires_in',
           'user_id'
         ])
+        res.body.expires_in.should.be.above(3000)
       })
       .end(done)
   })