X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/3debff60ef50158c5439003ad4357d1f3dcc120b..8e5deafd854b05086296513b318df1626dc41967:/app/controllers/users_controller.rb?ds=sidebyside diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index aa504e313..6aa98f7ee 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -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| @@ -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 @@ -271,7 +271,7 @@ class UsersController < ApplicationController 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] @@ -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") - redirect_to :action => "login" + redirect_to login_path 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") - redirect_to :action => :login, :referer => referer + redirect_to login_path(:referer => referer) 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 - redirect_to :action => "login" + redirect_to login_path end def confirm_email