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

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

diff --git a/app/controllers/sessions_controller.rb b/app/controllers/sessions_controller.rb
index 2e223393993b1c5fc648ea9f1e0da95afe1b2fb7..abbaf5e921e45aedf89e60d7057023b9a0374143 100644 (file)
--- a/app/controllers/sessions_controller.rb
+++ b/app/controllers/sessions_controller.rb
@@ -11,28 +11,27 @@ class SessionsController < ApplicationController
 
   authorize_resource :class => false
 
 
   authorize_resource :class => false
 

+  allow_all_form_action :only => :new
+

   def new
   def new

-    override_content_security_policy_directives(:form_action => []) if Settings.csp_enforce || Settings.key?(:csp_report_url)
+    referer = safe_referer(params[:referer]) if params[:referer]

 
 

-    session[:referer] = safe_referer(params[:referer]) if params[:referer]
+    parse_oauth_referer referer

   end
 
   def create
   end
 
   def create

-    session[:remember_me] ||= params[:remember_me]
-    session[:referer] = safe_referer(params[:referer]) if params[:referer]
-    password_authentication(params[:username], params[:password])
+    session[:remember_me] = params[:remember_me] == "yes"
+
+    referer = safe_referer(params[:referer]) if params[:referer]
+
+    password_authentication(params[:username].strip, params[:password], referer)

   end
 
   def destroy
   end
 
   def destroy

-    @title = t "sessions.destroy.title"
+    @title = t ".title"

 
     if request.post?
 
     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
 


@@ -46,15 +45,15 @@ class SessionsController < ApplicationController
 
   ##
   # handle password authentication
 
   ##
   # handle password authentication

-  def password_authentication(username, password)
+  def password_authentication(username, password, referer = nil)

     if (user = User.authenticate(:username => username, :password => password))
     if (user = User.authenticate(:username => username, :password => password))

-      successful_login(user)
+      successful_login(user, referer)

     elsif (user = User.authenticate(:username => username, :password => password, :pending => true))
     elsif (user = User.authenticate(:username => username, :password => password, :pending => true))

-      unconfirmed_login(user)
+      unconfirmed_login(user, referer)

     elsif User.authenticate(:username => username, :password => password, :suspended => true)
     elsif User.authenticate(:username => username, :password => password, :suspended => true)

-      failed_login({ :partial => "sessions/suspended_flash" }, username)
+      failed_login({ :partial => "sessions/suspended_flash" }, username, referer)

     else
     else

-      failed_login t("sessions.new.auth failure"), username
+      failed_login(t("sessions.new.auth failure"), username, referer)

     end
   end
 end
     end
   end
 end