X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/b70da7b8ea15ab48bb2f34155567cea6dffc8fc9..d57dd1f4da4d4605f534607b69944e3c977e4db5:/app/controllers/sessions_controller.rb?ds=sidebyside

diff --git a/app/controllers/sessions_controller.rb b/app/controllers/sessions_controller.rb
index 7e6a740f3..a3e6f42f0 100644
--- a/app/controllers/sessions_controller.rb
+++ b/app/controllers/sessions_controller.rb
@@ -11,36 +11,33 @@ class SessionsController < ApplicationController
 
   authorize_resource :class => false
 
+  allow_all_form_action :only => :new
+
   def new
-    append_content_security_policy_directives(
-      :form_action => %w[*]
-    )
+    referer = safe_referer(params[:referer]) if params[:referer]
 
-    session[:referer] = safe_referer(params[:referer]) if params[:referer]
+    parse_oauth_referer referer
   end
 
   def create
     session[:remember_me] ||= params[:remember_me]
-    session[:referer] = safe_referer(params[:referer]) if params[:referer]
-    password_authentication(params[:username], params[:password])
+
+    referer = safe_referer(params[:referer]) if params[:referer]
+
+    password_authentication(params[:username].strip, params[:password], referer)
   end
 
   def destroy
-    @title = t "sessions.destroy.title"
+    @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
-      if params[:referer]
-        redirect_to safe_referer(params[:referer])
-      else
-        redirect_to :controller => "site", :action => "index"
-      end
+
+      referer = safe_referer(params[:referer]) if params[:referer]
+
+      redirect_to referer || { :controller => "site", :action => "index" }
     end
   end
 
@@ -48,15 +45,15 @@ class SessionsController < ApplicationController
 
   ##
   # handle password authentication
-  def password_authentication(username, password)
+  def password_authentication(username, password, referer = nil)
     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))
-      unconfirmed_login(user)
+      unconfirmed_login(user, referer)
     elsif User.authenticate(:username => username, :password => password, :suspended => true)
-      failed_login t("sessions.new.account is suspended", :webmaster => "mailto:#{Settings.support_email}").html_safe, username
+      failed_login({ :partial => "sessions/suspended_flash" }, username, referer)
     else
-      failed_login t("sessions.new.auth failure"), username
+      failed_login(t("sessions.new.auth failure"), username, referer)
     end
   end
 end