From 4bd80a716e9e2c71bba8d182eb9c8d955a130b4c Mon Sep 17 00:00:00 2001 From: Susmitha Girumala Date: Wed, 2 Jun 2021 14:07:38 -0400 Subject: [PATCH] Revert "Merge branch 'ICU-1369-oidc-status-change' of github.com:hashicorp/boundary-ui into ICU-1369-oidc-status-change" This reverts commit 8098beb450b4b19634cf31cca82ba0355d80cf07, reversing changes made to a6672ecef4ccf18f94e7a67c8e4e5074046b54b7. --- addons/api/mirage/config.js | 27 +------------------ addons/api/mirage/scenarios/default.js | 6 ----- .../auth-methods/auth-method/-actions.hbs | 2 +- 3 files changed, 2 insertions(+), 33 deletions(-) diff --git a/addons/api/mirage/config.js b/addons/api/mirage/config.js index 40a582e2c..007950f69 100644 --- a/addons/api/mirage/config.js +++ b/addons/api/mirage/config.js @@ -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( diff --git a/addons/api/mirage/scenarios/default.js b/addons/api/mirage/scenarios/default.js index 1f2595bb8..62018788c 100644 --- a/addons/api/mirage/scenarios/default.js +++ b/addons/api/mirage/scenarios/default.js @@ -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; } diff --git a/ui/admin/app/templates/scopes/scope/auth-methods/auth-method/-actions.hbs b/ui/admin/app/templates/scopes/scope/auth-methods/auth-method/-actions.hbs index 397823a8e..5ff803bfb 100644 --- a/ui/admin/app/templates/scopes/scope/auth-methods/auth-method/-actions.hbs +++ b/ui/admin/app/templates/scopes/scope/auth-methods/auth-method/-actions.hbs @@ -67,4 +67,4 @@ > {{t 'resources.auth-method.actions.delete'}} - + \ No newline at end of file