Merge remote-tracking branch 'upstream/pull/4732'

[rails.git] / app / controllers / sessions_controller.rb

diff --git a/app/controllers/sessions_controller.rb b/app/controllers/sessions_controller.rb
index 3c2084a5b82ee4cd39223d4a623abe4b4d82c715..e57ffc06aac0617b65100bc5fe1dab3b9ecbda2e 100644 (file)
--- a/app/controllers/sessions_controller.rb
+++ b/app/controllers/sessions_controller.rb
@@ -27,12 +27,7 @@ class SessionsController < ApplicationController
     @title = t ".title"
 
     if request.post?
     @title = t ".title"
 
     if request.post?

-      if session[:token]
-        token = UserToken.find_by(:token => session[:token])
-        token&.destroy
-        session.delete(:token)
-      end
-
+      session.delete(:pending_user)

       session.delete(:user)
       session_expires_automatically
 
       session.delete(:user)
       session_expires_automatically