Revert "Merge branch '18000-remember-me-for-oauth-login' into 'master'"revert-6df61942

This reverts merge request !11963

1 files changed, 0 insertions, 8 deletions

diff --git a/app/controllers/omniauth_callbacks_controller.rb b/app/controllers/omniauth_callbacks_controller.rb
index 323d5d26eb6..b82681b197e 100644
--- a/app/controllers/omniauth_callbacks_controller.rb
+++ b/app/controllers/omniauth_callbacks_controller.rb
@@ -1,6 +1,5 @@
 class OmniauthCallbacksController < Devise::OmniauthCallbacksController
   include AuthenticatesWithTwoFactor
-  include Devise::Controllers::Rememberable
 
   protect_from_forgery except: [:kerberos, :saml, :cas3]
 
@@ -116,10 +115,8 @@ class OmniauthCallbacksController < Devise::OmniauthCallbacksController
     if @user.persisted? && @user.valid?
       log_audit_event(@user, with: oauth['provider'])
       if @user.two_factor_enabled?
-        params[:remember_me] = '1' if remember_me?
         prompt_for_two_factor(@user)
       else
-        remember_me(@user) if remember_me?
         sign_in_and_redirect(@user)
       end
     else
@@ -150,9 +147,4 @@ class OmniauthCallbacksController < Devise::OmniauthCallbacksController
     AuditEventService.new(user, user, options)
       .for_authentication.security_event
   end
-
-  def remember_me?
-    request_params = request.env['omniauth.params']
-    (request_params['remember_me'] == '1') if request_params.present?
-  end
 end