feat: 🎸 Populate subject for OIDC account name displays (#2757)

OIDC accounts are guaranteed to have a subject claim which we should
display. Currently we only look at email and full_name which
are all optional for OIDC claims. Also added deep links for accounts.

✅ Closes: https://hashicorp.atlassian.net/browse/ICU-16634
This commit is contained in:
Zhihe Li authored and GitHub committed 2025-04-03 13:33:08 -04:00
1 parent 9dd1617b57
commit 2db63ae2f8
3 files changed
+89 -8

No files matched your search

+2 -2
View File
@@ -47,8 +47,8 @@ export default class AccountModel extends GeneratedAccountModel {
* @type {string}
*/
get accountName() {
const { email, full_name, login_name } = this;
return email || full_name || login_name;
const { email, full_name, login_name, subject } = this;
return email || full_name || login_name || subject;
}
// =methods
@@ -46,10 +46,14 @@
<:body as |B|>
<B.Tr>
<B.Td>
<span class='hds-font-weight-semibold'>{{#if
(can 'read accounts' B.data)
}}
{{B.data.accountName}}
<span class='hds-font-weight-semibold'>
{{#if (can 'read accounts' B.data)}}
<LinkTo
@route='scopes.scope.auth-methods.auth-method.accounts.account'
@models={{array B.data.auth_method_id B.data.id}}
>
{{B.data.accountName}}
</LinkTo>
{{else}}
{{B.data.displayName}}
{{/if}}
@@ -10,7 +10,11 @@ import setupMirage from 'ember-cli-mirage/test-support/setup-mirage';
import a11yAudit from 'ember-a11y-testing/test-support/audit';
import { Response } from 'miragejs';
import { authenticateSession } from 'ember-simple-auth/test-support';
import { TYPE_AUTH_METHOD_LDAP } from 'api/models/auth-method';
import {
TYPE_AUTH_METHOD_PASSWORD,
TYPE_AUTH_METHOD_LDAP,
TYPE_AUTH_METHOD_OIDC,
} from 'api/models/auth-method';
import * as commonSelectors from 'admin/tests/helpers/selectors';
import * as selectors from './selectors';
@@ -43,10 +47,11 @@ module('Acceptance | users | accounts', function (hooks) {
type: 'org',
scope: { id: 'global', type: 'global' },
});
this.server.create(
instances.authMethod = this.server.create(
'auth-method',
{
scope: instances.scopes.org,
type: TYPE_AUTH_METHOD_PASSWORD,
},
'withAccountsAndUsersAndManagedGroups',
);
@@ -305,4 +310,76 @@ module('Acceptance | users | accounts', function (hooks) {
assert.dom(commonSelectors.ALERT_TOAST_BODY).isVisible();
});
test('can navigate to account link for password account', async function (assert) {
await visit(urls.user);
await click(commonSelectors.HREF(urls.accounts));
assert.dom(commonSelectors.TABLE_ROW).exists({ count: accountsCount });
assert
.dom(
commonSelectors.TABLE_RESOURCE_LINK(
`/scopes/${instances.scopes.org.id}/auth-methods/${instances.authMethod.id}/accounts/${instances.user.accountIds[0]}`,
),
)
.exists({ count: accountsCount });
});
test('can navigate to account link for oidc account', async function (assert) {
this.server.db.authMethods.remove();
this.server.db.users.remove();
this.server.db.accounts.remove();
const authMethod = this.server.create(
'auth-method',
{
scope: instances.scopes.org,
type: TYPE_AUTH_METHOD_OIDC,
},
'withAccountsAndUsersAndManagedGroups',
);
const user = this.server.schema.users.first();
const count = user.accountIds.length;
await visit(`${urls.users}/${user.id}`);
await click(commonSelectors.HREF(`${urls.users}/${user.id}/accounts`));
assert.dom(commonSelectors.TABLE_ROW).exists({ count });
assert
.dom(
commonSelectors.TABLE_RESOURCE_LINK(
`/scopes/${instances.scopes.org.id}/auth-methods/${authMethod.id}/accounts/${user.accountIds[0]}`,
),
)
.exists({ count });
});
test('can navigate to account link for ldap account', async function (assert) {
this.server.db.authMethods.remove();
this.server.db.users.remove();
this.server.db.accounts.remove();
const authMethod = this.server.create(
'auth-method',
{
scope: instances.scopes.org,
type: TYPE_AUTH_METHOD_LDAP,
},
'withAccountsAndUsersAndManagedGroups',
);
const user = this.server.schema.users.first();
const count = user.accountIds.length;
await visit(`${urls.users}/${user.id}`);
await click(commonSelectors.HREF(`${urls.users}/${user.id}/accounts`));
assert.dom(commonSelectors.TABLE_ROW).exists({ count });
assert
.dom(
commonSelectors.TABLE_RESOURCE_LINK(
`/scopes/${instances.scopes.org.id}/auth-methods/${authMethod.id}/accounts/${user.accountIds[0]}`,
),
)
.exists({ count });
});
});