confusion around seconds and minutes expiry solved and tests updated

howdyai · Jan 26, 2018 · 521ed91 · 521ed91
1 parent ad67ab2
commit 521ed91
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/__test__/lib/Teams.test.js b/__test__/lib/Teams.test.js
@@ -47,15 +47,17 @@ describe('authentication', () => {
             return {
                 getToken: jest.fn((cb) => {
                     configuration.token =  'token';
-                    configuration.token_expires_in = '20';
+                    configuration.token_expires_in = '1200';
                     cb(null);
                 })
             };
         }));
         let bot = require('../../lib/Teams')(config);
-        expect(bot.config.token_expires_in).toBe('20');
+        expect(bot.config.token_expires_in).toBe('1200');
         expect(bot.api.getToken).toHaveBeenCalledTimes(1);
-        jest.runTimersToTime(1000 * 60 * 11);
+        jest.runTimersToTime(1000 * 60 * 9);
+        expect(bot.api.getToken).toHaveBeenCalledTimes(1);
+        jest.runTimersToTime(1000 * 60 * 1.1);
         expect(bot.api.getToken).toHaveBeenCalledTimes(2);
     });
 });
diff --git a/lib/Teams.js b/lib/Teams.js
@@ -17,7 +17,7 @@ function TeamsBot(configuration) {
             throw new Error(err);
         }
         //use the expires_in value, convert to ms and remove 10 mins in ms
-        let tokenExpiresIn = 1000 * 60 * (configuration.token_expires_in || 60);
+        let tokenExpiresIn = (configuration.token_expires_in || 3600) * 1000;
         let expiryCheckDelta = 1000 * 60 * 10;
         setTimeout(controller.api.getToken, (tokenExpiresIn - expiryCheckDelta), tokenHandler);
     };