X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/945ff7911ca51dc250ffaba71f62821b5c0c0a95..be40536440b8677323bcf30bc2b869e36f907dd9:/app/controllers/user_controller.rb?ds=sidebyside diff --git a/app/controllers/user_controller.rb b/app/controllers/user_controller.rb index 766ab37d1..e49b01ebe 100644 --- a/app/controllers/user_controller.rb +++ b/app/controllers/user_controller.rb @@ -131,6 +131,10 @@ class UserController < ApplicationController session[:new_user_settings] = params redirect_to auth_url(params[:user][:auth_provider], params[:user][:auth_uid]) end + elsif errors = session.delete(:user_errors) + errors.each do |attribute, error| + @user.errors.add(attribute, error) + end end end @@ -138,7 +142,7 @@ class UserController < ApplicationController @user.data_public = true @user.save flash[:notice] = t "user.go_public.flash success" - redirect_to :controller => "user", :action => "account", :display_name => @user.display_name + redirect_to :action => "account", :display_name => @user.display_name end def lost_password @@ -293,6 +297,7 @@ class UserController < ApplicationController user = token.user user.status = "active" user.email_valid = true + flash[:notice] = gravatar_status_message(user) if gravatar_enable(user) user.save! referer = token.referer token.destroy @@ -330,7 +335,7 @@ class UserController < ApplicationController flash[:error] = t "user.confirm_resend.failure", :name => params[:display_name] else Notifier.signup_confirm(user, user.tokens.create).deliver_now - flash[:notice] = t("user.confirm_resend.success", :email => user.email).html_safe + flash[:notice] = t("user.confirm_resend.success", :email => user.email, :sender => SUPPORT_EMAIL).html_safe end redirect_to :action => "login" @@ -344,8 +349,13 @@ class UserController < ApplicationController @user.email = @user.new_email @user.new_email = nil @user.email_valid = true + gravatar_enabled = gravatar_enable(@user) if @user.save - flash[:notice] = t "user.confirm_email.success" + flash[:notice] = if gravatar_enabled + t("user.confirm_email.success") + " " + gravatar_status_message(@user) + else + t("user.confirm_email.success") + end else flash[:errors] = @user.errors end @@ -413,7 +423,7 @@ class UserController < ApplicationController if params[:referer] redirect_to params[:referer] else - redirect_to :controller => "user", :action => "view" + redirect_to :action => "view" end end else @@ -436,7 +446,7 @@ class UserController < ApplicationController if params[:referer] redirect_to params[:referer] else - redirect_to :controller => "user", :action => "view" + redirect_to :action => "view" end end else @@ -449,14 +459,14 @@ class UserController < ApplicationController def set_status @this_user.status = params[:status] @this_user.save - redirect_to :controller => "user", :action => "view", :display_name => params[:display_name] + redirect_to :action => "view", :display_name => params[:display_name] end ## # delete a user, marking them as deleted and removing personal data def delete @this_user.delete - redirect_to :controller => "user", :action => "view", :display_name => params[:display_name] + redirect_to :action => "view", :display_name => params[:display_name] end ## @@ -501,31 +511,14 @@ class UserController < ApplicationController email_verified = false end - user = User.find_by_auth_provider_and_auth_uid(provider, uid) - - if user.nil? && provider == "google" - openid_url = auth_info[:extra][:id_info]["openid_id"] - user = User.find_by_auth_provider_and_auth_uid("openid", openid_url) if openid_url - user.update(:auth_provider => provider, :auth_uid => uid) if user - end - - if user - case user.status - when "pending" then - unconfirmed_login(user) - when "active", "confirmed" then - successful_login(user, env["omniauth.params"]["referer"]) - when "suspended" then - failed_login t("user.login.account is suspended", :webmaster => "mailto:webmaster@openstreetmap.org") - else - failed_login t("user.login.auth failure") - end - elsif settings = session.delete(:new_user_settings) + if settings = session.delete(:new_user_settings) @user.auth_provider = provider @user.auth_uid = uid update_user(@user, settings) + session[:user_errors] = @user.errors.as_json + redirect_to :action => "account", :display_name => @user.display_name elsif session[:new_user] session[:new_user].auth_provider = provider @@ -537,8 +530,29 @@ class UserController < ApplicationController redirect_to :action => "terms" else - redirect_to :action => "new", :nickname => name, :email => email, - :auth_provider => provider, :auth_uid => uid + user = User.find_by_auth_provider_and_auth_uid(provider, uid) + + if user.nil? && provider == "google" + openid_url = auth_info[:extra][:id_info]["openid_id"] + user = User.find_by_auth_provider_and_auth_uid("openid", openid_url) if openid_url + user.update(:auth_provider => provider, :auth_uid => uid) if user + end + + if user + case user.status + when "pending" then + unconfirmed_login(user) + when "active", "confirmed" then + successful_login(user, env["omniauth.params"]["referer"]) + when "suspended" then + failed_login t("user.login.account is suspended", :webmaster => "mailto:#{SUPPORT_EMAIL}") + else + failed_login t("user.login.auth failure") + end + else + redirect_to :action => "new", :nickname => name, :email => email, + :auth_provider => provider, :auth_uid => uid + end end end @@ -559,7 +573,7 @@ class UserController < ApplicationController 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("user.login.account is suspended", :webmaster => "mailto:webmaster@openstreetmap.org"), username + failed_login t("user.login.account is suspended", :webmaster => "mailto:#{SUPPORT_EMAIL}"), username else failed_login t("user.login.auth failure"), username end @@ -614,7 +628,7 @@ class UserController < ApplicationController # - If they were referred to the login, send them back there. # - Otherwise, send them to the home page. if REQUIRE_TERMS_SEEN && !user.terms_seen - redirect_to :controller => :user, :action => :terms, :referer => target + redirect_to :action => :terms, :referer => target elsif user.blocked_on_view redirect_to user.blocked_on_view, :referer => target else @@ -726,12 +740,12 @@ class UserController < ApplicationController flash[:error] = t("user.filter.not_an_administrator") if params[:display_name] - redirect_to :controller => "user", :action => "view", :display_name => params[:display_name] + redirect_to :action => "view", :display_name => params[:display_name] else - redirect_to :controller => "user", :action => "login", :referer => request.fullpath + redirect_to :action => "login", :referer => request.fullpath end elsif !@user - redirect_to :controller => "user", :action => "login", :referer => request.fullpath + redirect_to :action => "login", :referer => request.fullpath end end @@ -754,7 +768,7 @@ class UserController < ApplicationController def lookup_user_by_name @this_user = User.find_by_display_name(params[:display_name]) rescue ActiveRecord::RecordNotFound - redirect_to :controller => "user", :action => "view", :display_name => params[:display_name] unless @this_user + redirect_to :action => "view", :display_name => params[:display_name] unless @this_user end ## @@ -791,4 +805,27 @@ class UserController < ApplicationController !blocked end + + ## + # check if this user has a gravatar and set the user pref is true + def gravatar_enable(user) + # code from example https://en.gravatar.com/site/implement/images/ruby/ + return false if user.image.present? + hash = Digest::MD5.hexdigest(user.email.downcase) + url = "https://www.gravatar.com/avatar/#{hash}?d=404" # without d=404 we will always get an image back + response = OSM.http_client.get(URI.parse(url)) + oldsetting = user.image_use_gravatar + user.image_use_gravatar = response.success? + oldsetting != user.image_use_gravatar + end + + ## + # display a message about th current status of the gravatar setting + def gravatar_status_message(user) + if user.image_use_gravatar + return t "user.account.gravatar.enabled" + else + return t "user.account.gravatar.disabled" + end + end end