cleanup: pull setExpiration settings into own method & add tests

Author: Noelle Daley

ui/app/services/auth.js

@@ -218,20 +218,19 @@ export default Service.extend({
   },
 
   calculateExpiration(resp, now) {
-    let tokenExpirationEpoch;
     const ttl = resp.ttl || resp.lease_duration;
+    const tokenExpirationEpoch = resp.expire_time ? new Date(resp.expire_time).getTime() : now + ttl * 1e3;
 
-    if (resp.expire_time) {
-      const expireTime = resp.expire_time;
-      tokenExpirationEpoch = new Date(expireTime).getTime();
+    return { ttl, tokenExpirationEpoch };
+  },
+
+  setExpirationSettings(resp, now) {
+    if (resp.renewable) {
+      this.set('expirationCalcTS', now);
+      this.set('allowExpiration', false);
     } else {
-      tokenExpirationEpoch = now + ttl * 1e3;
+      this.set('allowExpiration', true);
     }
-
-    return {
-      ttl,
-      tokenExpirationEpoch,
-    };
   },
 
   calculateRootNamespace(currentNamespace, namespace_path, backend) {
@@ -305,17 +304,12 @@ export default Service.extend({
     );
 
     const now = this.now();
-    Object.assign(data, this.calculateExpiration(resp, now));
 
-    if (resp.renewable) {
-      this.set('expirationCalcTS', now);
-      this.set('allowExpiration', false);
-    } else {
-      this.set('allowExpiration', true);
-    }
+    Object.assign(data, this.calculateExpiration(resp, now));
+    this.setExpirationSettings(resp, now);
 
-    // don't allow token expiration in testing
-    // this ensures we don't try to call renew-self within tests
+    // ensure we don't call renew-self within tests
+    // this is intentionally not included in setExpirationSettings so we can unit test that method
     if (Ember.testing) this.set('allowExpiration', false);
 
     if (!data.displayName) {

ui/tests/integration/services/auth-test.js

@@ -452,7 +452,6 @@ module('Integration | Service | auth', function (hooks) {
           undefined,
           'expiration is calculated for batch tokens'
         );
-        assert.true(this.service.allowExpiration, 'allowExpiration is true for batch tokens');
       });
 
       test('batch tokens generated by auth methods', async function (assert) {
@@ -468,7 +467,6 @@ module('Integration | Service | auth', function (hooks) {
           undefined,
           'expiration is calculated for batch tokens'
         );
-        assert.true(this.service.allowExpiration, 'allowExpiration is true for batch tokens');
       });
     });
 

ui/tests/unit/services/auth-test.js

@@ -50,4 +50,28 @@ module('Unit | Service | auth', function (hooks) {
       );
     });
   });
+
+  module('#setExpirationSettings', function () {
+    test('#setExpirationSettings for a renewable token', function (assert) {
+      const now = Date.now();
+      const ttl = 30;
+      const response = { ttl, renewable: true };
+
+      this.service.setExpirationSettings(response, now);
+
+      assert.false(this.service.allowExpiration, 'sets allowExpiration to false');
+      assert.strictEqual(this.service.expirationCalcTS, now, 'sets expirationCalcTS to now');
+    });
+
+    test('#setExpirationSettings for a non-renewable token', function (assert) {
+      const now = Date.now();
+      const ttl = 30;
+      const response = { ttl, renewable: false };
+
+      this.service.setExpirationSettings(response, now);
+
+      assert.true(this.service.allowExpiration, 'sets allowExpiration to true');
+      assert.strictEqual(this.service.expirationCalcTS, null, 'keeps expirationCalcTS as null');
+    });
+  });
 });