Merge pull request #6647 from Turbo87/token-expiry-in-list

Show API Token expiry in token list

Author: Turbo87

app/components/settings/api-tokens.hbs

@@ -115,6 +115,12 @@
           <div title={{token.created_at}} local-class="created-at" data-test-created-at>
             Created {{date-format-distance-to-now token.created_at addSuffix=true}}
           </div>
+
+          {{#if token.expired_at}}
+            <div title={{token.expired_at}} local-class="expired-at" data-test-expired-at>
+              Expires {{date-format-distance-to-now token.expired_at addSuffix=true}}
+            </div>
+          {{/if}}
         </div>
 
         {{#if token.token}}

app/models/api-token.js

@@ -9,4 +9,6 @@ export default class ApiToken extends Model {
   @attr crate_scopes;
   /** @type string[] | null */
   @attr endpoint_scopes;
+  /** @type string | null */
+  @attr('date') expired_at;
 }

tests/acceptance/api-token-test.js

@@ -31,6 +31,7 @@ module('Acceptance | api-tokens', function (hooks) {
       name: 'BAR',
       createdAt: '2017-11-19T17:59:22',
       lastUsedAt: null,
+      expiredAt: '2017-12-19T17:59:22',
     });
 
     context.authenticateAs(user);
@@ -47,6 +48,7 @@ module('Acceptance | api-tokens', function (hooks) {
     assert.dom('[data-test-name]', row1).hasText('BAR');
     assert.dom('[data-test-created-at]', row1).hasText('Created about 18 hours ago');
     assert.dom('[data-test-last-used-at]', row1).hasText('Never used');
+    assert.dom('[data-test-expired-at]', row1).hasText('Expires in 29 days');
     assert.dom('[data-test-save-token-button]', row1).doesNotExist();
     assert.dom('[data-test-revoke-token-button]', row1).exists();
     assert.dom('[data-test-saving-spinner]', row1).doesNotExist();
@@ -56,6 +58,7 @@ module('Acceptance | api-tokens', function (hooks) {
     assert.dom('[data-test-name]', row2).hasText('foo');
     assert.dom('[data-test-created-at]', row2).hasText('Created 4 months ago');
     assert.dom('[data-test-last-used-at]', row2).hasText('Last used 18 days ago');
+    assert.dom('[data-test-expired-at]', row2).doesNotExist();
     assert.dom('[data-test-save-token-button]', row2).doesNotExist();
     assert.dom('[data-test-revoke-token-button]', row2).exists();
     assert.dom('[data-test-saving-spinner]', row2).doesNotExist();