From ac92575b364a953edef93e62f0ccb27f464cf4f6 Mon Sep 17 00:00:00 2001 From: Randall Morey Date: Fri, 22 Jan 2021 10:34:05 -0500 Subject: [PATCH] chore: setup initial oidc polling route (polling to come) --- addons/auth/addon/authenticators/oidc.js | 4 ++-- ui/admin/app/router.js | 4 +++- .../app/routes/scopes/scope/authenticate/method.js | 1 + .../routes/scopes/scope/authenticate/method/oidc.js | 4 ++++ .../scopes/scope/authenticate/method/oidc.hbs | 1 + .../scopes/scope/authenticate/method/oidc-test.js | 11 +++++++++++ 6 files changed, 22 insertions(+), 3 deletions(-) create mode 100644 ui/admin/app/routes/scopes/scope/authenticate/method/oidc.js create mode 100644 ui/admin/app/templates/scopes/scope/authenticate/method/oidc.hbs create mode 100644 ui/admin/tests/unit/routes/scopes/scope/authenticate/method/oidc-test.js diff --git a/addons/auth/addon/authenticators/oidc.js b/addons/auth/addon/authenticators/oidc.js index 2f95f0517..bd88bdb0b 100644 --- a/addons/auth/addon/authenticators/oidc.js +++ b/addons/auth/addon/authenticators/oidc.js @@ -48,8 +48,8 @@ export default class OIDCAuthenticator extends BaseAuthenticator { * `window.open`, but may be overriden. * @param {string} url */ - openExternalOIDCFlow(url) { - window.open(url); + async openExternalOIDCFlow(url) { + await window.open(url); } async authenticate( diff --git a/ui/admin/app/router.js b/ui/admin/app/router.js index 0a3012f9d..848cc8e8f 100644 --- a/ui/admin/app/router.js +++ b/ui/admin/app/router.js @@ -10,7 +10,9 @@ Router.map(function () { this.route('scopes', function () { this.route('scope', { path: ':scope_id' }, function () { this.route('authenticate', function () { - this.route('method', { path: ':auth_method_id' }, function() {}); + this.route('method', { path: ':auth_method_id' }, function() { + this.route('oidc'); + }); }); this.route('scopes', function () {}); diff --git a/ui/admin/app/routes/scopes/scope/authenticate/method.js b/ui/admin/app/routes/scopes/scope/authenticate/method.js index 499c9a0a0..e5297c6bc 100644 --- a/ui/admin/app/routes/scopes/scope/authenticate/method.js +++ b/ui/admin/app/routes/scopes/scope/authenticate/method.js @@ -55,6 +55,7 @@ export default class ScopesScopeAuthenticateMethodRoute extends Route { requestCookies, { scope, authMethod } ); + this.transitionTo('scopes.scope.authenticate.method.oidc'); break; } } diff --git a/ui/admin/app/routes/scopes/scope/authenticate/method/oidc.js b/ui/admin/app/routes/scopes/scope/authenticate/method/oidc.js new file mode 100644 index 000000000..55d368443 --- /dev/null +++ b/ui/admin/app/routes/scopes/scope/authenticate/method/oidc.js @@ -0,0 +1,4 @@ +import Route from '@ember/routing/route'; + +export default class ScopesScopeAuthenticateMethodOidcRoute extends Route { +} diff --git a/ui/admin/app/templates/scopes/scope/authenticate/method/oidc.hbs b/ui/admin/app/templates/scopes/scope/authenticate/method/oidc.hbs new file mode 100644 index 000000000..c3aa832be --- /dev/null +++ b/ui/admin/app/templates/scopes/scope/authenticate/method/oidc.hbs @@ -0,0 +1 @@ +OIDC yay! diff --git a/ui/admin/tests/unit/routes/scopes/scope/authenticate/method/oidc-test.js b/ui/admin/tests/unit/routes/scopes/scope/authenticate/method/oidc-test.js new file mode 100644 index 000000000..a51f158cd --- /dev/null +++ b/ui/admin/tests/unit/routes/scopes/scope/authenticate/method/oidc-test.js @@ -0,0 +1,11 @@ +import { module, test } from 'qunit'; +import { setupTest } from 'ember-qunit'; + +module('Unit | Route | scopes/scope/authenticate/method/oidc', function(hooks) { + setupTest(hooks); + + test('it exists', function(assert) { + let route = this.owner.lookup('route:scopes/scope/authenticate/method/oidc'); + assert.ok(route); + }); +});