X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/66b5e85845547e6f3c6dba59952217f5882b0271..8e5deafd854b05086296513b318df1626dc41967:/app/controllers/users_controller.rb?ds=sidebyside

diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index a1129339e..6aa98f7ee 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -123,7 +123,7 @@ class UsersController < ApplicationController
       :form_action => %w[accounts.google.com *.facebook.com login.live.com github.com meta.wikimedia.org]
     )
 
-    if params[:user] && params[:user][:display_name] && params[:user][:description]
+    if request.post?
       if params[:user][:auth_provider].blank? ||
          (params[:user][:auth_provider] == current_user.auth_provider &&
           params[:user][:auth_uid] == current_user.auth_uid)
@@ -131,7 +131,7 @@ class UsersController < ApplicationController
         redirect_to user_account_url(current_user) if current_user.errors.count.zero?
       else
         session[:new_user_settings] = params
-        redirect_to auth_url(params[:user][:auth_provider], params[:user][:auth_uid])
+        redirect_to auth_url(params[:user][:auth_provider], params[:user][:auth_uid]), :status => :temporary_redirect
       end
     elsif errors = session.delete(:user_errors)
       errors.each do |attribute, error|
@@ -151,7 +151,7 @@ class UsersController < ApplicationController
   def lost_password
     @title = t "users.lost_password.title"
 
-    if params[:email]
+    if request.post?
       user = User.visible.find_by(:email => params[:email])
 
       if user.nil?
@@ -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"
-        redirect_to :action => "login"
+        redirect_to login_path
       else
         flash.now[:error] = t "users.lost_password.notice email cannot find"
       end
@@ -270,9 +270,13 @@ class UsersController < ApplicationController
   end
 
   def login
+    append_content_security_policy_directives(
+      :form_action => %w[*]
+    )
+
     session[:referer] = safe_referer(params[:referer]) if params[:referer]
 
-    if params[:username].present? && params[:password].present?
+    if request.post?
       session[:remember_me] ||= params[:remember_me]
       password_authentication(params[:username], params[:password])
     end
@@ -302,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")
-        redirect_to :action => "login"
+        redirect_to login_path
       elsif !token || token.expired?
         flash[:error] = t("users.confirm.unknown token")
         redirect_to :action => "confirm"
@@ -324,7 +328,7 @@ class UsersController < ApplicationController
 
         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
 
@@ -352,7 +356,7 @@ class UsersController < ApplicationController
       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