Skip to content

Change default API token expiration to 90 days #9414

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 1 commit into from
Sep 12, 2024
Merged

Change default API token expiration to 90 days #9414

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion app/controllers/settings/tokens/new.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ export default class NewTokenController extends Controller {
reset() {
this.name = '';
this.nameInvalid = false;
this.expirySelection = 'none';
this.expirySelection = '90';
this.expiryDateInput = null;
this.expiryDateInvalid = false;
this.scopes = [];
Expand Down
4 changes: 2 additions & 2 deletions app/templates/settings/tokens/new.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,11 +38,11 @@
data-test-expiry
{{on "change" this.updateExpirySelection}}
>
<option value="none" selected>No expiration</option>
<option value="none">No expiration</option>
<option value="7">7 days</option>
<option value="30">30 days</option>
<option value="60">60 days</option>
<option value="90">90 days</option>
<option value="90" selected>90 days</option>
<option value="365">365 days</option>
<option value="custom">Custom...</option>
</select>
Expand Down
22 changes: 16 additions & 6 deletions e2e/routes/settings/tokens/new.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ test.describe('/settings/tokens/new', { tag: '@routes' }, () => {
await expect(page).toHaveURL('/settings/tokens/new');

await page.fill('[data-test-name]', 'token-name');
await page.locator('[data-test-expiry]').selectOption('none');
await page.click('[data-test-scope="publish-update"]');
await page.click('[data-test-generate]');

Expand Down Expand Up @@ -64,6 +65,7 @@ test.describe('/settings/tokens/new', { tag: '@routes' }, () => {
await expect(page).toHaveURL('/settings/tokens/new');

await page.fill('[data-test-name]', 'token-name');
await page.locator('[data-test-expiry]').selectOption('none');
await page.click('[data-test-scope="publish-update"]');
await page.click('[data-test-scope="yank"]');

Expand Down Expand Up @@ -152,14 +154,21 @@ test.describe('/settings/tokens/new', { tag: '@routes' }, () => {
test('token expiry', async ({ page }) => {
await page.goto('/settings/tokens/new');
await expect(page).toHaveURL('/settings/tokens/new');
await expect(page.locator('[data-test-expiry-description]')).toHaveText('The token will never expire');
await expect(page.locator('[data-test-name]')).toHaveValue('');
await expect(page.locator('[data-test-expiry]')).toHaveValue('90');
let expiryDate = new Date('2018-02-18T00:00:00');
let expectedDate = expiryDate.toLocaleDateString(undefined, { dateStyle: 'long' });
let expectedDescription = `The token will expire on ${expectedDate}`;
await expect(page.locator('[data-test-expiry-description]')).toHaveText(expectedDescription);

await page.fill('[data-test-name]', 'token-name');
await page.locator('[data-test-expiry]').selectOption('30');
await page.locator('[data-test-expiry]').selectOption('none');
await expect(page.locator('[data-test-expiry-description]')).toHaveText('The token will never expire');

let expiryDate = new Date('2017-12-20T00:00:00');
let expectedDate = expiryDate.toLocaleDateString(undefined, { dateStyle: 'long' });
let expectedDescription = `The token will expire on ${expectedDate}`;
await page.locator('[data-test-expiry]').selectOption('30');
expiryDate = new Date('2017-12-20T00:00:00');
expectedDate = expiryDate.toLocaleDateString(undefined, { dateStyle: 'long' });
expectedDescription = `The token will expire on ${expectedDate}`;
await expect(page.locator('[data-test-expiry-description]')).toHaveText(expectedDescription);

await page.click('[data-test-scope="publish-update"]');
Expand Down Expand Up @@ -190,9 +199,10 @@ test.describe('/settings/tokens/new', { tag: '@routes' }, () => {
test('token expiry with custom date', async ({ page }) => {
await page.goto('/settings/tokens/new');
await expect(page).toHaveURL('/settings/tokens/new');
await expect(page.locator('[data-test-expiry-description]')).toHaveText('The token will never expire');

await page.fill('[data-test-name]', 'token-name');
await page.locator('[data-test-expiry]').selectOption('none');
await expect(page.locator('[data-test-expiry-description]')).toHaveText('The token will never expire');
await page.locator('[data-test-expiry]').selectOption('custom');
await expect(page.locator('[data-test-expiry-description]')).toHaveCount(0);

Expand Down
23 changes: 17 additions & 6 deletions tests/routes/settings/tokens/new-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ module('/settings/tokens/new', function (hooks) {
assert.strictEqual(currentURL(), '/settings/tokens/new');

await fillIn('[data-test-name]', 'token-name');
await select('[data-test-expiry]', 'none');
await click('[data-test-scope="publish-update"]');
await click('[data-test-generate]');

Expand All @@ -81,6 +82,7 @@ module('/settings/tokens/new', function (hooks) {
assert.strictEqual(currentURL(), '/settings/tokens/new');

await fillIn('[data-test-name]', 'token-name');
await select('[data-test-expiry]', 'none');
await click('[data-test-scope="publish-update"]');
await click('[data-test-scope="yank"]');

Expand Down Expand Up @@ -150,14 +152,22 @@ module('/settings/tokens/new', function (hooks) {

await visit('/settings/tokens/new');
assert.strictEqual(currentURL(), '/settings/tokens/new');
assert.dom('[data-test-expiry-description]').hasText('The token will never expire');
assert.dom('[data-test-name]').hasValue('');
assert.dom('[data-test-expiry]').hasValue('90');
let expiryDate = new Date('2018-02-18T00:00:00');
let expectedDate = expiryDate.toLocaleDateString(undefined, { dateStyle: 'long' });
let expectedDescription = `The token will expire on ${expectedDate}`;
assert.dom('[data-test-expiry-description]').hasText(expectedDescription);

await fillIn('[data-test-name]', 'token-name');
await select('[data-test-expiry]', '30');

let expiryDate = new Date('2017-12-20T00:00:00');
let expectedDate = expiryDate.toLocaleDateString(undefined, { dateStyle: 'long' });
let expectedDescription = `The token will expire on ${expectedDate}`;
await select('[data-test-expiry]', 'none');
assert.dom('[data-test-expiry-description]').hasText('The token will never expire');

await select('[data-test-expiry]', '30');
expiryDate = new Date('2017-12-20T00:00:00');
expectedDate = expiryDate.toLocaleDateString(undefined, { dateStyle: 'long' });
expectedDescription = `The token will expire on ${expectedDate}`;
assert.dom('[data-test-expiry-description]').hasText(expectedDescription);

await click('[data-test-scope="publish-update"]');
Expand All @@ -183,9 +193,10 @@ module('/settings/tokens/new', function (hooks) {

await visit('/settings/tokens/new');
assert.strictEqual(currentURL(), '/settings/tokens/new');
assert.dom('[data-test-expiry-description]').hasText('The token will never expire');

await fillIn('[data-test-name]', 'token-name');
await select('[data-test-expiry]', 'none');
assert.dom('[data-test-expiry-description]').hasText('The token will never expire');
await select('[data-test-expiry]', 'custom');
assert.dom('[data-test-expiry-description]').doesNotExist();

Expand Down