fix: 🐛 OIDC authentications not properly showing username (#2930)
* fix: 🐛 properly show username for oidc auth method in user menu * test: 💍 fix admin ui tests * test: 💍 fix desktop ui tests * refactor: 💡 admin to not store username in authenticated object * refactor: 💡 use getter in app controller * test: 💍 POC for how we could update our tests to use auth account * refactor: 💡 remove unused service * test: 💍 fix all tests in ui/admin * test: 💍 revert one change * refactor: 💡 update ui/desktop w/ feedback + fix tests * refactor: 💡 add in error handling * refactor: 💡 cleanup unused service * test: 💍 fix e2e test selector ✅ Closes: https://hashicorp.atlassian.net/browse/ICU-17231
This commit is contained in:
1 parent
838bc37243
commit
72f7c8a92d
195 files changed
+720
-1112
No files matched your search
@@ -5,18 +5,14 @@
|
||||
|
||||
import { module, test } from 'qunit';
|
||||
import { setupTest } from 'ember-qunit';
|
||||
import { visit } from '@ember/test-helpers';
|
||||
import { visit, currentURL, settled } from '@ember/test-helpers';
|
||||
import setupMirage from 'ember-cli-mirage/test-support/setup-mirage';
|
||||
import { setupSqlite } from 'api/test-support/helpers/sqlite';
|
||||
import { authenticateSession } from 'ember-simple-auth/test-support';
|
||||
import { TYPE_AUTH_METHOD_PASSWORD } from 'api/models/auth-method';
|
||||
|
||||
module(
|
||||
'Unit | Controller | scopes/scope/authenticate/method/index',
|
||||
function (hooks) {
|
||||
setupTest(hooks);
|
||||
setupMirage(hooks);
|
||||
setupSqlite(hooks);
|
||||
|
||||
let controller;
|
||||
let store;
|
||||
@@ -25,8 +21,10 @@ module(
|
||||
const instances = {
|
||||
scopes: {
|
||||
global: null,
|
||||
org: null,
|
||||
},
|
||||
authMethod: null,
|
||||
account: null,
|
||||
};
|
||||
|
||||
const urls = {
|
||||
@@ -35,51 +33,56 @@ module(
|
||||
};
|
||||
|
||||
hooks.beforeEach(async function () {
|
||||
await authenticateSession({});
|
||||
controller = this.owner.lookup(
|
||||
'controller:scopes/scope/authenticate/method/index',
|
||||
);
|
||||
store = this.owner.lookup('service:store');
|
||||
session = this.owner.lookup('service:session');
|
||||
|
||||
instances.scopes.global = this.server.create('scope', {
|
||||
id: 'global',
|
||||
type: 'global',
|
||||
});
|
||||
instances.authMethod = this.server.create('auth-method', {
|
||||
scope: instances.scopes.global,
|
||||
type: TYPE_AUTH_METHOD_PASSWORD,
|
||||
instances.scopes.global = this.server.create(
|
||||
'scope',
|
||||
{ id: 'global' },
|
||||
'withGlobalAuth',
|
||||
);
|
||||
instances.authMethod = this.server.schema.authMethods.first();
|
||||
instances.account = this.server.schema.accounts.first();
|
||||
instances.scopes.org = this.server.create('scope', {
|
||||
type: 'org',
|
||||
scope: { id: 'global', type: 'global' },
|
||||
});
|
||||
|
||||
urls.globalScope = '/scopes/global/scopes';
|
||||
urls.authenticate = `scopes/global/authenticate/${instances.authMethod}`;
|
||||
});
|
||||
|
||||
test('authenticate action saves login information and redirects to correct page', async function (assert) {
|
||||
test('authenticate action saves auth information and redirects to correct page', async function (assert) {
|
||||
await visit(urls.authenticate);
|
||||
const identification = 'admin123';
|
||||
const identification = instances.account.attributes.login_name;
|
||||
const authMethod = await store.findRecord(
|
||||
'auth-method',
|
||||
instances.authMethod.id,
|
||||
);
|
||||
const { authenticator: authBefore, username: usernameBefore } =
|
||||
const { authenticator: authBefore, account_id: accountIdBefore } =
|
||||
session.data.authenticated;
|
||||
|
||||
assert.notOk(usernameBefore);
|
||||
assert.strictEqual(authBefore, 'authenticator:test');
|
||||
assert.notOk(accountIdBefore);
|
||||
assert.notOk(authBefore);
|
||||
assert.ok(identification);
|
||||
|
||||
await controller.authenticate(authMethod, {
|
||||
identification,
|
||||
password: 'password',
|
||||
});
|
||||
const { authenticator: authAfter, username: usernameAfter } =
|
||||
session.data.authenticated;
|
||||
await settled();
|
||||
|
||||
const { authenticator: authAfter, account_id: accountIdAfter } =
|
||||
session.data.authenticated;
|
||||
assert.strictEqual(
|
||||
authAfter,
|
||||
`authenticator:${instances.authMethod.type}`,
|
||||
);
|
||||
assert.strictEqual(usernameAfter, identification);
|
||||
assert.strictEqual(accountIdAfter, instances.account.id);
|
||||
assert.strictEqual(currentURL(), urls.globalScope);
|
||||
});
|
||||
},
|
||||
);
|
||||
Reference in new issue
Block a user