Bump osm-community-index from 5.3.1 to 5.4.0

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

diff --git a/app/controllers/sessions_controller.rb b/app/controllers/sessions_controller.rb
index 13047167075245b17ee6f09353a14c81d9ef5464..ba2858ce4392f8fda4745ad90f5f27af7c90f4dd 100644 (file)
--- a/app/controllers/sessions_controller.rb
+++ b/app/controllers/sessions_controller.rb
@@ -4,14 +4,15 @@ class SessionsController < ApplicationController
   layout "site"
 
   before_action :disable_terms_redirect, :only => [:destroy]
   layout "site"
 
   before_action :disable_terms_redirect, :only => [:destroy]

+  before_action :authorize_web
+  before_action :set_locale
+  before_action :check_database_readable

   before_action :require_cookies, :only => [:new]
 
   authorize_resource :class => false
 
   def new
   before_action :require_cookies, :only => [:new]
 
   authorize_resource :class => false
 
   def new

-    append_content_security_policy_directives(
-      :form_action => %w[*]
-    )
+    override_content_security_policy_directives(:form_action => []) if Settings.csp_enforce || Settings.key?(:csp_report_url)

 
     session[:referer] = safe_referer(params[:referer]) if params[:referer]
   end
 
     session[:referer] = safe_referer(params[:referer]) if params[:referer]
   end


@@ -23,7 +24,7 @@ class SessionsController < ApplicationController
   end
 
   def destroy
   end
 
   def destroy

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

 
     if request.post?
       if session[:token]
 
     if request.post?
       if session[:token]


@@ -31,13 +32,13 @@ class SessionsController < ApplicationController
         token&.destroy
         session.delete(:token)
       end
         token&.destroy
         session.delete(:token)
       end

+

       session.delete(:user)
       session_expires_automatically
       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
 
     end
   end
 


@@ -51,7 +52,7 @@ class SessionsController < ApplicationController
     elsif (user = User.authenticate(:username => username, :password => password, :pending => true))
       unconfirmed_login(user)
     elsif User.authenticate(:username => username, :password => password, :suspended => true)
     elsif (user = User.authenticate(:username => username, :password => password, :pending => true))
       unconfirmed_login(user)
     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)

     else
       failed_login t("sessions.new.auth failure"), username
     end
     else
       failed_login t("sessions.new.auth failure"), username
     end