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

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

diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 121d050b58bec7392f31bfd6771ae83ffbd9620d..6aa98f7ee508b1a083132b567b5305d07aedeaa3 100644 (file)
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -164,7 +164,7 @@ class UsersController < ApplicationController
         token = user.tokens.create
         UserMailer.lost_password(user, token).deliver_later
         flash[:notice] = t "users.lost_password.notice email on way"
         token = user.tokens.create
         UserMailer.lost_password(user, token).deliver_later
         flash[:notice] = t "users.lost_password.notice email on way"

-        redirect_to :action => "login"
+        redirect_to login_path

       else
         flash.now[:error] = t "users.lost_password.notice email cannot find"
       end
       else
         flash.now[:error] = t "users.lost_password.notice email cannot find"
       end


@@ -271,7 +271,7 @@ class UsersController < ApplicationController
 
   def login
     append_content_security_policy_directives(
 
   def login
     append_content_security_policy_directives(

-      :form_action => %w[accounts.google.com *.facebook.com login.live.com github.com meta.wikimedia.org]
+      :form_action => %w[*]

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


@@ -306,7 +306,7 @@ class UsersController < ApplicationController
       token = UserToken.find_by(:token => params[:confirm_string])
       if token&.user&.active?
         flash[:error] = t("users.confirm.already active")
       token = UserToken.find_by(:token => params[:confirm_string])
       if token&.user&.active?
         flash[:error] = t("users.confirm.already active")

-        redirect_to :action => "login"
+        redirect_to login_path

       elsif !token || token.expired?
         flash[:error] = t("users.confirm.unknown token")
         redirect_to :action => "confirm"
       elsif !token || token.expired?
         flash[:error] = t("users.confirm.unknown token")
         redirect_to :action => "confirm"


@@ -328,7 +328,7 @@ class UsersController < ApplicationController
 
         if token.nil? || token.user != user
           flash[:notice] = t("users.confirm.success")
 
         if token.nil? || token.user != user
           flash[:notice] = t("users.confirm.success")

-          redirect_to :action => :login, :referer => referer
+          redirect_to login_path(:referer => referer)

         else
           token.destroy
 
         else
           token.destroy
 


@@ -356,7 +356,7 @@ class UsersController < ApplicationController
       flash[:notice] = t "users.confirm_resend.success_html", :email => user.email, :sender => Settings.support_email
     end
 
       flash[:notice] = t "users.confirm_resend.success_html", :email => user.email, :sender => Settings.support_email
     end
 

-    redirect_to :action => "login"
+    redirect_to login_path

   end
 
   def confirm_email
   end
 
   def confirm_email