changed to check for type of group claim #356
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
humphd
requested changes
Mar 16, 2023
app/routes/login/callback.tsx
Outdated
| @@ -54,13 +54,19 @@ export const action = async ({ request }: ActionArgs) => { | |||
| const returnTo = relayState ? relayState : '/'; | |||
| const username = samlResponse.attributes.sAMAccountName; | |||
|
|
|||
| let groups = samlResponse.attributes.group; | |||
|
|
|||
| if (typeof groups !== 'string') { | |||
There was a problem hiding this comment.
This is still risky. You're saying, "If it's not a string, it must be an Array," which could also be wrong. I would do:
const groups: string = Array.isArray(groups)) ? groups = groups.join(',') : groups;Or do it below without the variable:
await createUser(
username,
samlResponse.attributes.displayname,
samlResponse.attributes.email,
Array.isArray(groups) ? groups.join(',') : groups,
);There was a problem hiding this comment.
Oh, this is much nicer
humphd
approved these changes
Mar 16, 2023
Eakam1007
approved these changes
Mar 17, 2023
|
Let me know when this goes in and I'll update staging so people can test there. |
I merged it o7 |
|
It's up on staging if you want to test. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Closes #352
Groups claim is either an array or string so I check type of and either join or do not join to make sure that we use a string when creating user.