]> cat aescling's git repositories - mastodon.git/commitdiff
Fix undefined variable for Auth::OmniauthCallbacksController (#16654)
authorDaniel <git@baby-gnu.org>
Wed, 25 Aug 2021 15:40:56 +0000 (15:40 +0000)
committerGitHub <noreply@github.com>
Wed, 25 Aug 2021 15:40:56 +0000 (17:40 +0200)
The addition of authentication history broke the omniauth login with
the following error:

  method=GET path=/auth/auth/cas/callback format=html
  controller=Auth::OmniauthCallbacksController action=cas status=500
  error='NameError: undefined local variable or method `user' for
  #<Auth::OmniauthCallbacksController:0x00000000036290>
  Did you mean?  @user' duration=435.93 view=0.00 db=36.19

* app/controllers/auth/omniauth_callbacks_controller.rb: fix variable
  name to `@user`

app/controllers/auth/omniauth_callbacks_controller.rb

index 7925e23cb5c14ea9fb84e9ee9812259db1626cd9..991a50b034fc6677d0a53f2b4fcb472667438374 100644 (file)
@@ -11,7 +11,7 @@ class Auth::OmniauthCallbacksController < Devise::OmniauthCallbacksController
 
       if @user.persisted?
         LoginActivity.create(
-          user: user,
+          user: @user,
           success: true,
           authentication_method: :omniauth,
           provider: provider,