Skip to content

Add support for regenerating the token #9122

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jul 22, 2024
Merged

Add support for regenerating the token #9122

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6183b2e
Add support for regenerating the token
0xPoe Jul 19, 2024
2336aee
Add a UI test case for regenerate button
0xPoe Jul 19, 2024
3135cc7
Add an e2e test case for regenerate button
0xPoe Jul 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions app/components/settings/api-tokens.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,14 @@

<div local-class="actions">
{{#unless token.isExpired}}
<LinkTo
@route="settings.tokens.new"
@query={{hash from=token.id}}
local-class="regenerate-button"
data-test-regenerate-token-button
>
Regenerate
</LinkTo>
<button
type="button"
local-class="revoke-button"
Expand Down
14 changes: 14 additions & 0 deletions app/components/settings/api-tokens.module.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,12 @@
border-radius: var(--space-3xs);
}

.regenerate-button {
composes: yellow-button small from '../../styles/shared/buttons.module.css';
flex-grow: 1;
border-radius: var(--space-3xs);
}

.new-token {
margin-top: var(--space-s);
}
Expand Down Expand Up @@ -190,11 +196,19 @@
}

.actions {
display: flex;
flex-direction: column;
grid-area: actions;
align-self: start;
margin: 0 0 0 var(--space-xs);
}

.actions > * {
flex-grow: 1;
width: 100%;
margin-top: var(--space-xs);
}

.new-token {
grid-area: details;
margin-bottom: 0;
Expand Down
9 changes: 9 additions & 0 deletions e2e/acceptance/api-token.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,15 @@ test.describe('Acceptance | api-tokens', { tag: '@acceptance' }, () => {
await expect(page.locator('[data-test-error]')).toHaveCount(0);
});

test('API tokens can be regenerated', async ({ page }) => {
await page.goto('/settings/tokens');
await expect(page).toHaveURL('/settings/tokens');
await expect(page.locator('[data-test-api-token]')).toHaveCount(3);

await page.click('[data-test-api-token="1"] [data-test-regenerate-token-button]');
await expect(page).toHaveURL('/settings/tokens/new?from=1');
});

test('failed API tokens revocation shows an error', async ({ page, mirage }) => {
await mirage.addHook(server => {
server.delete('/api/v1/me/tokens/:id', {}, 500);
Expand Down
11 changes: 11 additions & 0 deletions tests/acceptance/api-token-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,17 @@ module('Acceptance | api-tokens', function (hooks) {
assert.dom('[data-test-error]').doesNotExist();
});

test('API tokens can be regenerated', async function (assert) {
prepare(this);

await visit('/settings/tokens');
assert.strictEqual(currentURL(), '/settings/tokens');
assert.dom('[data-test-api-token]').exists({ count: 3 });

await click('[data-test-api-token="1"] [data-test-regenerate-token-button]');
assert.strictEqual(currentURL(), '/settings/tokens/new?from=1');
});

test('failed API tokens revocation shows an error', async function (assert) {
prepare(this);

Expand Down
Loading