chore: refactor oidc group and role sync to methods #10918
Merged
Conversation
This file contains hidden or 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
The 'userOIDC' method body was getting unwieldy. I think there is a good way to redesign the flow, but I do not want to undertake that at this time. The easy win is just to move some LoC to other methods and cleanup the main method.
coadler
approved these changes
Nov 28, 2023
Comment on lines
+928
to
+942
| usingGroups, groups, err := api.oidcGroups(ctx, mergedClaims) | ||
| if err != nil { | ||
| httpapi.Write(ctx, rw, http.StatusBadRequest, codersdk.Response{ | ||
| Message: "Failed to sync groups from OIDC claims", | ||
| Detail: err.Error(), | ||
| }) | ||
| return | ||
| } | ||
|
|
||
| roles, ok := api.oidcRoles(ctx, rw, r, mergedClaims) | ||
| if !ok { | ||
| // oidcRoles writes the error to the response writer for us. | ||
| return | ||
| } | ||
|
|
There was a problem hiding this comment.
It seems odd that oidcRoles would write to the response but oidcGroups doesn't. Is there a reason oidcGroups can't?
There was a problem hiding this comment.
I actually prefer neither write to the response, but Groups had a response that was hard to put in an error.
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
The 'userOIDC' method body was getting unwieldy.
I think there is a good way to redesign the flow, but I do not want to undertake that at this time.
The easy win is just to move some LoC to other methods and cleanup the main method.