Skip to content

fix: trim the inputs of group mappers #1541

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
JivusAyrus merged 3 commits into from
Jan 29, 2025
Merged

fix: trim the inputs of group mappers #1541

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c5b4f1e
fix: trim the inputs of group mappers
JivusAyrus Jan 28, 2025
c80a973
Merge branch 'main' into suvij/eng-6317-trim-the-inputs-of-the-group-…
JivusAyrus Jan 29, 2025
2ea7ed3
fix: perform the trim() in the backend also
JivusAyrus Jan 29, 2025
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
2 changes: 1 addition & 1 deletion controlplane/src/core/services/OidcProvider.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ export default class OidcProvider {
if (endpoint === 'login.microsoftonline.com') {
key = 'groups';
}
const claims = `[{ "key": "${key}", "value": "${mapper.ssoGroup}" }]`;
const claims = `[{ "key": "${key}", "value": "${mapper.ssoGroup.trim()}" }]`;
let keycloakGroupName;

switch (mapper.role) {
Expand Down
4 changes: 2 additions & 2 deletions studio/src/pages/[organizationSlug]/settings.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -387,7 +387,7 @@ const UpdateIDPMappers = ({

const mutateMappers = () => {
const groupMappers = mappers.map((m) => {
return { role: m.dbRole, ssoGroup: m.ssoGroup };
return { role: m.dbRole, ssoGroup: m.ssoGroup.trim() };
});

groupMappers.push({
Expand Down Expand Up @@ -522,7 +522,7 @@ const OpenIDConnectProvider = ({

const onSubmit: SubmitHandler<ConnectOIDCProviderInput> = (data) => {
const groupMappers = mappers.map((m) => {
return { role: m.dbRole, ssoGroup: m.ssoGroup };
return { role: m.dbRole, ssoGroup: m.ssoGroup.trim() };
});

groupMappers.push({
Expand Down