update the expires offset from 2 to 5 minutes, use default value for …

…"expires_in"
zeevm · Feb 8, 2017 · 467bd53 · 467bd53
1 parent 862b13d
commit 467bd53
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 1 deletion.
diff --git a/lib/adal.js b/lib/adal.js
@@ -310,7 +310,7 @@ var AuthenticationContext = (function () {
         var expiry = this._getItem(this.CONSTANTS.STORAGE.EXPIRATION_KEY + resource);
 
         // If expiration is within offset, it will force renew
-        var offset = this.config.expireOffsetSeconds || 120;
+        var offset = this.config.expireOffsetSeconds || 300;
 
         if (expiry && (expiry > this._now() + offset)) {
             return token;
@@ -1267,6 +1267,8 @@ var AuthenticationContext = (function () {
      * @ignore
      */
     AuthenticationContext.prototype._expiresIn = function (expires) {
+        // if AAD did not send "expires_in" property, use default expiration of 3599 seconds, for some reason AAD sends 3599 as "expires_in" value
+        if (!expires) expires = 3599;
         return this._now() + parseInt(expires, 10);
     };
 

diff --git a/tests/unit/spec/AdalSpec.js b/tests/unit/spec/AdalSpec.js
@@ -1033,4 +1033,16 @@ describe('Adal', function () {
         Logging.level = 2;
 
     });
+
+    it('tests default value for expires_in', function () {
+        var requestInfo = {
+            valid: true,
+            parameters: { 'access_token': 'token123', 'state': '123' },
+            stateMatch: true,
+            stateResponse: '123|loginResource1',
+            requestType: adal.REQUEST_TYPE.RENEW_TOKEN
+        };
+        adal.saveTokenFromHash(requestInfo);
+        expect(storageFake.getItem(adal.CONSTANTS.STORAGE.EXPIRATION_KEY + 'loginResource1')).toBe(mathMock.round(1) + 3599);
+    });
 });