X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/8a42bc2eff8563d206615cb8810ad87e9e6e5be2..4fac47a214d4f0ab2228cdb3b0f646f11d41b4ef:/app/controllers/users_controller.rb diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index cb92af8fb..b274b1808 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -119,11 +119,16 @@ class UsersController < ApplicationController def account @tokens = current_user.oauth_tokens.authorized + append_content_security_policy_directives( + :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 params[:user][:auth_provider].blank? || (params[:user][:auth_provider] == current_user.auth_provider && params[:user][:auth_uid] == current_user.auth_uid) update_user(current_user, params) + 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]) @@ -457,6 +462,8 @@ class UsersController < ApplicationController update_user(current_user, settings) + flash.discard + session[:user_errors] = current_user.errors.as_json redirect_to :action => "account", :display_name => current_user.display_name @@ -648,15 +655,15 @@ class UsersController < ApplicationController if user.save session[:fingerprint] = user.fingerprint - set_locale(true) + set_locale(:reset => true) if user.new_email.blank? || user.new_email == user.email - flash.now[:notice] = t "users.account.flash update success" + flash[:notice] = t "users.account.flash update success" else user.email = user.new_email if user.valid? - flash.now[:notice] = t "users.account.flash update success confirm needed" + flash[:notice] = t "users.account.flash update success confirm needed" begin UserMailer.email_confirm(user, user.tokens.create).deliver_later