From 6e978c2b70d885e476053fef7aa3db4ab839f85e Mon Sep 17 00:00:00 2001
From: Tobias Bieniek <tobias@bieniek.cloud>
Date: Mon, 8 May 2023 11:11:52 +0200
Subject: [PATCH] settings/tokens: Make sure to always reload API tokens from
 the server

---
 app/routes/settings/tokens/index.js        |  2 +-
 tests/routes/settings/tokens/index-test.js | 44 ++++++++++++++++++++++
 2 files changed, 45 insertions(+), 1 deletion(-)
 create mode 100644 tests/routes/settings/tokens/index-test.js

diff --git a/app/routes/settings/tokens/index.js b/app/routes/settings/tokens/index.js
index 5e2ac363156..89ac3804802 100644
--- a/app/routes/settings/tokens/index.js
+++ b/app/routes/settings/tokens/index.js
@@ -7,7 +7,7 @@ export default class TokenListRoute extends Route {
   @service store;
 
   async model() {
-    let apiTokens = await this.store.findAll('api-token');
+    let apiTokens = await this.store.findAll('api-token', { reload: true });
     return TrackedArray.from(apiTokens.slice());
   }
 
diff --git a/tests/routes/settings/tokens/index-test.js b/tests/routes/settings/tokens/index-test.js
new file mode 100644
index 00000000000..ed36eea653b
--- /dev/null
+++ b/tests/routes/settings/tokens/index-test.js
@@ -0,0 +1,44 @@
+import { click, currentURL, fillIn, findAll } from '@ember/test-helpers';
+import { module, test } from 'qunit';
+
+import { setupApplicationTest } from 'cargo/tests/helpers';
+
+import { visit } from '../../../helpers/visit-ignoring-abort';
+
+module('/settings/tokens', function (hooks) {
+  setupApplicationTest(hooks);
+
+  function prepare(context) {
+    let user = context.server.create('user', {
+      login: 'johnnydee',
+      name: 'John Doe',
+      email: 'john@doe.com',
+      avatar: 'https://avatars2.githubusercontent.com/u/1234567?v=4',
+    });
+
+    context.authenticateAs(user);
+
+    return { user };
+  }
+
+  test('reloads all tokens from the server', async function (assert) {
+    let { user } = prepare(this);
+
+    this.server.create('api-token', { user, name: 'token-1' });
+
+    await visit('/settings/tokens/new');
+    assert.strictEqual(currentURL(), '/settings/tokens/new');
+
+    await fillIn('[data-test-name]', 'token-2');
+    await click('[data-test-scope="publish-update"]');
+    await click('[data-test-generate]');
+
+    assert.strictEqual(currentURL(), '/settings/tokens');
+    assert.dom('[data-test-api-token]').exists({ count: 2 });
+    let tokens = findAll('[data-test-api-token]');
+    assert.dom('[data-test-name]', tokens[0]).hasText('token-2');
+    assert.dom('[data-test-token]', tokens[0]).exists();
+    assert.dom('[data-test-name]', tokens[1]).hasText('token-1');
+    assert.dom('[data-test-token]', tokens[1]).doesNotExist();
+  });
+});