fix: remove refresh oauth logic on OIDC login #8950
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
deansheather
approved these changes
Aug 8, 2023
| @@ -142,6 +142,56 @@ func ExtractAPIKeyMW(cfg ExtractAPIKeyConfig) func(http.Handler) http.Handler { | |||
| } | |||
| } | |||
|
|
|||
| func APIKeyFromRequest(ctx context.Context, db database.Store, sessionTokenFunc func(r *http.Request) string, r *http.Request) (*database.APIKey, codersdk.Response, bool) { | |||
There was a problem hiding this comment.
Instead of this could you have just added a field to the opts struct above "NoRefreshToken" or something?
There was a problem hiding this comment.
I could yea, but I didn't want to keep using that middleware for just the key extraction. It could evolve more features overtime and the use case in this situation doesn't ever change/evovle.
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.
apiKeyMiddlewareOptionalwas being used to log out users if they convert to OIDC. However this logic was also doing anOIDCrefresh if the original token expired. This was a mistake. That logic should just pull theAPIKeyfor logging out, and do not do anything else.To fix this I just refactored
ExtractAPIKeyinto a helper func to call and not do the refresh logic.A unit test was added that fails on
mainand is now fixed. It matches the behavior of the reports.Closes #8537