Merge commit 'd258ec8e3b' into kb_migration

2023-03-13 09:30:37 +09:00 · 2023-03-13 09:30:37 +09:00 · 33445ffeb2
commit 33445ffeb2
parent 558c3c116c d258ec8e3b
6 changed files with 8 additions and 14 deletions
--- a/app/controllers/auth/omniauth_callbacks_controller.rb
+++ b/app/controllers/auth/omniauth_callbacks_controller.rb
@ -33,7 +33,7 @@ class Auth::OmniauthCallbacksController < Devise::OmniauthCallbacksController

  def after_sign_in_path_for(resource)
    if resource.email_present?
-      root_path
+      stored_location_for(resource) || root_path
    else
      auth_setup_path(missing_email: '1')
    end