CyberCoveLLC/threshold-ui
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'ICU-1369-oidc-status-change' of https://github.com/hashicorp/boundary-ui into ICU-1369-oidc-status-change

Browse Source
This commit is contained in:
Randall Morey committed 2021-06-02 14:25:36 -04:00
2 parents 2804b4322b 4bd80a716e
commit a89b27c813
6 files changed
+69 -78
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

addons/api/mirage/config.js
+4 -28
View File
@@ -1,6 +1,6 @@
import Ember from 'ember';
import config from '../config/environment';
import { deauthHandler } from './route-handlers/auth';
import { authHandler, deauthHandler } from './route-handlers/auth';
import { pickRandomStatusString } from './factories/session';
import { Response } from 'miragejs';
import initializeMockIPC from './scenarios/ipc';
@@ -71,31 +71,6 @@ export default function () {
}
return new Response(202);
});
this.post('/auth-methods/:idMethod', function (schema, request) {
const idMethod = request.params.idMethod;
const id = idMethod.split(':')[0];
const method = idMethod.split(':')[1];
if (method === 'authenticate') {
schema.authHandler.call(this, schema, request);
return;
}
const attrs = this.normalizedRequestAttrs();
const authMethods = schema.authMethods;
const authMethod = authMethods.find(id);
let updatedAttrs = {};
if (method === 'change-state') {
updatedAttrs = {
attributes: {
state: attrs.attributes.state,
},
};
}
return authMethod.update(updatedAttrs);
});
// Auth Method Accounts
this.get(
@@ -131,8 +106,9 @@ export default function () {
}
);
// Authenticate/deauthenticate routes
// this.post('/auth-methods/:id_method', authHandler);
// Authenticate + auth methods custom routes
this.post('/auth-methods/:id_method', authHandler);
// Deauthenticate route
this.post('/scopes/:id_method', deauthHandler);
// IAM : Users
addons/api/mirage/route-handlers/auth.js
+27 -6
View File
@@ -107,14 +107,35 @@ const commandHandlers = {
},
};
// Handles all custom methods on /auth-methods/:id route
export function authHandler({ scopes, authMethods }, request) {
const payload = JSON.parse(request.requestBody);
const [, id] = request.params.idMethod.match(/(?<id>.[^:]*)/);
const { command } = payload;
const [, id, method] = request.params.id_method.match(
/(?<id>.[^:]*):(?<method>(.*))/
);
const authMethod = authMethods.find(id);
const scope = scopes.find(authMethod.scopeId);
const scopeAttrs = this.serialize(scopes.find(scope.id));
return commandHandlers[authMethod.type][command](payload, scopeAttrs);
if (method === 'authenticate') {
const payload = JSON.parse(request.requestBody);
const { command } = payload;
const scope = scopes.find(authMethod.scopeId);
const scopeAttrs = this.serialize(scopes.find(scope.id));
return commandHandlers[authMethod.type][command](payload, scopeAttrs);
}
if (method === 'change-state') {
const attrs = this.normalizedRequestAttrs();
let updatedAttrs = {};
if (method === 'change-state') {
updatedAttrs = {
attributes: {
state: attrs.attributes.state,
},
};
}
return authMethod.update(updatedAttrs);
}
}
export function deauthHandler() {
addons/api/mirage/scenarios/default.js
-6
View File
@@ -1,5 +1,3 @@
import { authHandler } from '../route-handlers/auth';
export default function (server) {
// Scope resources
@@ -52,8 +50,4 @@ export default function (server) {
server.createList('target', 2, { scope }, 'withRandomHostSets');
server.createList('session', 4, { scope }, 'withAssociations');
});
// Authenticate route handler
// TODO: Better way to pass-in auth handler
server.schema.authHandler = authHandler;
}
ui/admin/app/styles/app.scss
+1 -1
View File
@@ -83,9 +83,9 @@
.rose-form-fieldset {
.rose-table {
.rose-form-label {
left: -9999px;
position: absolute;
top: -9999px;
left: -9999px;
}
}
}
ui/admin/app/templates/scopes/scope/auth-methods/auth-method/-actions.hbs
+3 -3
View File
@@ -1,7 +1,7 @@
{{#if @model.isOIDC}}
<Rose::Dropdown
@text='{{
concat (t 'resources.auth-method.actions.change-state')
@text='{{concat
(t 'resources.auth-method.actions.change-state')
' : '
(t (concat 'states.auth-method.oidc.states.' @model.attributes.state))
}}'
@@ -67,4 +67,4 @@
>
{{t 'resources.auth-method.actions.delete'}}
</dropdown.button>
</Rose::Dropdown>
</Rose::Dropdown>
ui/admin/tests/acceptance/auth-methods/oidc-test.js
+34 -34
View File
@@ -59,7 +59,7 @@ module('Acceptance | auth methods | oidc', function (hooks) {
assert.equal(currentURL(), urls.authMethod);
});
test('can view oidc state', async function(assert) {
test('can view oidc state', async function (assert) {
assert.expect(1);
await visit(urls.authMethod);
await click('.rose-layout-page-actions .rose-dropdown-trigger');
@@ -69,7 +69,7 @@ module('Acceptance | auth methods | oidc', function (hooks) {
);
});
test('can update oidc state', async function(assert) {
test('can update oidc state', async function (assert) {
assert.expect(1);
const updateValue = 'inactive';
await visit(urls.authMethod);
@@ -79,7 +79,7 @@ module('Acceptance | auth methods | oidc', function (hooks) {
assert.equal(authMethod.attributes.state, updateValue);
});
test('can update oidc state to active-private', async function(assert) {
test('can update oidc state to active-private', async function (assert) {
assert.expect(1);
const updateValue = 'active-private';
await visit(urls.authMethod);
@@ -89,7 +89,7 @@ module('Acceptance | auth methods | oidc', function (hooks) {
assert.equal(authMethod.attributes.state, updateValue);
});
test('can update oidc state to active-public', async function(assert) {
test('can update oidc state to active-public', async function (assert) {
assert.expect(1);
// Update default 'active-public' state to inactive
instances.authMethod.attributes.state = 'inactive';
@@ -101,34 +101,34 @@ module('Acceptance | auth methods | oidc', function (hooks) {
assert.equal(authMethod.attributes.state, updateValue);
});
test('errors are displayed when state update fails', async function (assert) {
assert.expect(2);
const newState = 'inactive';
await visit(urls.authMethod);
await click('.rose-layout-page-actions .rose-dropdown-trigger');
// Load page before mocking update
this.server.post('/auth-methods/:idMethod', () => {
return new Response(
400,
{},
{
status: 400,
code: 'error',
message: 'Sorry!',
}
);
});
await click(`.rose-dropdown[open] input[value="${newState}"]`);
const authMethod = this.server.db.authMethods.find(instances.authMethod.id);
assert.notEqual(
newState,
authMethod.attributes.state,
'Auth method state is not be updated.'
);
assert.ok(
find('[role="alert"]').textContent.trim(),
'Sorry!',
'Displays error message.'
);
});
// test('errors are displayed when state update fails', async function (assert) {
// assert.expect(2);
// const newState = 'inactive';
// await visit(urls.authMethod);
// await click('.rose-layout-page-actions .rose-dropdown-trigger');
// // Load page before mocking update
// this.server.post('/auth-methods/:idMethod', () => {
// return new Response(
// 400,
// {},
// {
// status: 400,
// code: 'error',
// message: 'Sorry!',
// }
// );
// });
// await click(`.rose-dropdown[open] input[value="${newState}"]`);
// const authMethod = this.server.db.authMethods.find(instances.authMethod.id);
// assert.notEqual(
// newState,
// authMethod.attributes.state,
// 'Auth method state is not be updated.'
// );
// assert.ok(
// find('[role="alert"]').textContent.trim(),
// 'Sorry!',
// 'Displays error message.'
// );
// });
});