Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 2 additions & 0 deletions mirage/factories/api-token.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
import { Factory } from 'miragejs';

export default Factory.extend({
crateScopes: null,
createdAt: '2017-11-19T17:59:22',
endpointScopes: null,
lastUsedAt: null,
name: i => `API Token ${i + 1}`,
token: () => generateToken(),
Expand Down
10 changes: 8 additions & 2 deletions mirage/route-handlers/me.js
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,14 @@ export function register(server) {
return new Response(403, {}, { errors: [{ detail: 'must be logged in to perform that action' }] });
}

let { name } = this.normalizedRequestAttrs('api-token');
let token = server.create('api-token', { user, name, createdAt: new Date().toISOString() });
let { name, crateScopes = null, endpointScopes = null } = this.normalizedRequestAttrs('api-token');
let token = server.create('api-token', {
user,
name,
crateScopes,
endpointScopes,
createdAt: new Date().toISOString(),
});

let json = this.serialize(token);
json.api_token.revoked = false;
Expand Down
35 changes: 35 additions & 0 deletions tests/mirage/me/tokens/create-test.js
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,42 @@ module('Mirage | PUT /api/v1/me/tokens', function (hooks) {
assert.deepEqual(await response.json(), {
api_token: {
id: 1,
crate_scopes: null,
created_at: '2017-11-20T11:23:45.000Z',
endpoint_scopes: null,
last_used_at: null,
name: 'foooo',
revoked: false,
token: token.token,
},
});
});

test('creates a new API token with scopes', async function (assert) {
this.clock.setSystemTime(new Date('2017-11-20T11:23:45Z'));

let user = this.server.create('user');
this.server.create('mirage-session', { user });

let body = JSON.stringify({
api_token: {
name: 'foooo',
crate_scopes: ['serde', 'serde-*'],
endpoint_scopes: ['publish-update'],
},
});
let response = await fetch('/api/v1/me/tokens', { method: 'PUT', body });
assert.strictEqual(response.status, 200);

let token = this.server.schema.apiTokens.all().models[0];
assert.ok(token);

assert.deepEqual(await response.json(), {
api_token: {
id: 1,
crate_scopes: ['serde', 'serde-*'],
created_at: '2017-11-20T11:23:45.000Z',
endpoint_scopes: ['publish-update'],
last_used_at: null,
name: 'foooo',
revoked: false,
Expand Down
13 changes: 12 additions & 1 deletion tests/mirage/me/tokens/list-test.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,12 @@ module('Mirage | GET /api/v1/me/tokens', function (hooks) {
let user = this.server.create('user');
this.server.create('mirage-session', { user });

this.server.create('api-token', { user, createdAt: '2017-11-19T12:59:22Z' });
this.server.create('api-token', {
user,
createdAt: '2017-11-19T12:59:22Z',
crateScopes: ['serde', 'serde-*'],
endpointScopes: ['publish-update'],
});
this.server.create('api-token', { user, createdAt: '2017-11-19T13:59:22Z' });
this.server.create('api-token', { user, createdAt: '2017-11-19T14:59:22Z' });

Expand All @@ -23,19 +28,25 @@ module('Mirage | GET /api/v1/me/tokens', function (hooks) {
api_tokens: [
{
id: 3,
crate_scopes: null,
created_at: '2017-11-19T14:59:22.000Z',
endpoint_scopes: null,
last_used_at: null,
name: 'API Token 3',
},
{
id: 2,
crate_scopes: null,
created_at: '2017-11-19T13:59:22.000Z',
endpoint_scopes: null,
last_used_at: null,
name: 'API Token 2',
},
{
id: 1,
crate_scopes: ['serde', 'serde-*'],
created_at: '2017-11-19T12:59:22.000Z',
endpoint_scopes: ['publish-update'],
last_used_at: null,
name: 'API Token 1',
},
Expand Down