diff options
author | Claire <claire.github-309c@sitedethib.com> | 2021-08-27 15:28:00 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-08-27 15:28:00 +0200 |
commit | e7e04b46d750f5e2addfd9650991727101d76910 (patch) | |
tree | fadaf4a6f310a90d416b4c5ae6265c5e9f1c787b /app/controllers/concerns/sign_in_token_authentication_concern.rb | |
parent | 70909c5b094523b0cf77123a2566310b2f148e24 (diff) | |
parent | 39193be1c464675ce9f51fc838a0e41264f23604 (diff) |
Merge pull request #1591 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/controllers/concerns/sign_in_token_authentication_concern.rb')
-rw-r--r-- | app/controllers/concerns/sign_in_token_authentication_concern.rb | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/app/controllers/concerns/sign_in_token_authentication_concern.rb b/app/controllers/concerns/sign_in_token_authentication_concern.rb index 016ab8f52..4eb3d7181 100644 --- a/app/controllers/concerns/sign_in_token_authentication_concern.rb +++ b/app/controllers/concerns/sign_in_token_authentication_concern.rb @@ -16,14 +16,18 @@ module SignInTokenAuthenticationConcern end def authenticate_with_sign_in_token - user = self.resource = find_user - - if user.present? && session[:attempt_user_id].present? && session[:attempt_user_updated_at] != user.updated_at.to_s - restart_session - elsif user_params.key?(:sign_in_token_attempt) && session[:attempt_user_id] - authenticate_with_sign_in_token_attempt(user) - elsif user.present? && user.external_or_valid_password?(user_params[:password]) - prompt_for_sign_in_token(user) + if user_params[:email].present? + user = self.resource = find_user_from_params + prompt_for_sign_in_token(user) if user&.external_or_valid_password?(user_params[:password]) + elsif session[:attempt_user_id] + user = self.resource = User.find_by(id: session[:attempt_user_id]) + return if user.nil? + + if session[:attempt_user_updated_at] != user.updated_at.to_s + restart_session + elsif user_params.key?(:sign_in_token_attempt) + authenticate_with_sign_in_token_attempt(user) + end end end |