OmniAuthCallbacksController: Eliminiate @user #25010
Merged
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.
Mentally tracking the state of this
@user
instance variable while working on this controller has been a small pain point that wasn't much work to eliminate, so here I've removed it and moved us one step away from side effects in these controller functions.There are two key signature changes here:
void sign_in_user
=>void sign_in_user(User)
Instead of depending on instance state, this method now signs in whatever user was passed in.
void silent_takeover(User, AuthHash)
=>User silent_takeover(User, AuthHash)
This method used to sometimes set
@user
as a side-effect of the silent takeover, causing the takeover target user to be signed in, instead of the OAuth user passed in as the first argument. I've made a small change so that this function now returns one user or the other, and expects the caller to handle the result. Expected calling pattern is now: