Skip to content

Only display Claims fields when is generic OIDC #15804

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
aalves08 merged 1 commit into from
Oct 30, 2025
Merged

Only display Claims fields when is generic OIDC #15804

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 26 additions & 0 deletions shell/edit/auth/__tests__/oidc.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -221,5 +221,31 @@ describe('oidc.vue', () => {
expect(issuer).toBe('');
expect(endpoint).toBe('');
});

it('custom claims fields should not appear in UI if Amazon cognito', async() => {
wrapper.vm.model.id = 'cognito';

const nameClaim = wrapper.find('[data-testid="input-name-claim"]');
const groupsClaim = wrapper.find('[data-testid="input-groups-claim"]');
const emailClaim = wrapper.find('[data-testid="input-email-claim"]');

expect(nameClaim.exists()).toBe(false);
expect(groupsClaim.exists()).toBe(false);
expect(emailClaim.exists()).toBe(false);
});

it('custom claims fields should appear in UI if genericoidc', async() => {
wrapper.vm.model.id = 'genericoidc';
wrapper.vm.addCustomClaims = true;
await nextTick();

const nameClaim = wrapper.find('[data-testid="input-name-claim"]');
const groupsClaim = wrapper.find('[data-testid="input-groups-claim"]');
const emailClaim = wrapper.find('[data-testid="input-email-claim"]');

expect(nameClaim.exists()).toBe(true);
expect(groupsClaim.exists()).toBe(true);
expect(emailClaim.exists()).toBe(true);
});
});
});
6 changes: 5 additions & 1 deletion shell/edit/auth/oidc.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -442,19 +442,22 @@ export default {
</div>
</template>

<template v-if="addCustomClaims">
<!-- Custom Claims -->
<template v-if="addCustomClaims && isGenericOidc">
<h4>{{ t('authConfig.oidc.customClaims.label') }}</h4>
<div class="row mb-20">
<div class="col span-6">
<LabeledInput
v-model:value="model.nameClaim"
data-testid="input-name-claim"
:label="t(`authConfig.oidc.customClaims.nameClaim.label`)"
:mode="mode"
/>
</div>
<div class="col span-6">
<LabeledInput
v-model:value="model.groupsClaim"
data-testid="input-groups-claim"
:label="t(`authConfig.oidc.customClaims.groupsClaim.label`)"
:mode="mode"
/>
Expand All @@ -464,6 +467,7 @@ export default {
<div class="col span-6">
<LabeledInput
v-model:value="model.emailClaim"
data-testid="input-email-claim"
:label="t(`authConfig.oidc.customClaims.emailClaim.label`)"
:mode="mode"
/>
Expand Down