X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/0bdc865d9fb8da48852372351b86bd42f9772266..e4c40cbd36567d050f1b779f1444c4ef26c50a5b:/app/controllers/users_controller.rb diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index ca3726210..38a61208c 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -12,8 +12,8 @@ class UsersController < ApplicationController authorize_resource before_action :require_self, :only => [:account] - before_action :check_database_writable, :only => [:new, :account, :confirm, :confirm_email, :lost_password, :reset_password, :go_public] - before_action :require_cookies, :only => [:new, :confirm] + before_action :check_database_writable, :only => [:new, :account, :go_public] + before_action :require_cookies, :only => [:new] before_action :lookup_user_by_name, :only => [:set_status, :destroy] before_action :allow_thirdparty_images, :only => [:show, :account] @@ -28,9 +28,9 @@ class UsersController < ApplicationController if current_user&.terms_agreed? # Already agreed to terms, so just show settings - redirect_to :action => :account, :display_name => current_user.display_name + redirect_to user_account_path(current_user) elsif current_user.nil? && session[:new_user].nil? - redirect_to :action => :login, :referer => request.fullpath + redirect_to login_path(:referer => request.fullpath) end end end @@ -42,12 +42,12 @@ class UsersController < ApplicationController if current_user current_user.terms_seen = true - flash[:notice] = t("users.new.terms declined", :url => t("users.new.terms declined url")).html_safe if current_user.save + flash[:notice] = { :partial => "users/terms_declined_flash" } if current_user.save if params[:referer] redirect_to safe_referer(params[:referer]) else - redirect_to :action => :account, :display_name => current_user.display_name + redirect_to user_account_path(current_user) end elsif params[:decline] redirect_to t("users.terms.declined") @@ -67,7 +67,7 @@ class UsersController < ApplicationController if params[:referer] redirect_to safe_referer(params[:referer]) else - redirect_to :action => :account, :display_name => current_user.display_name + redirect_to user_account_path(current_user) end else self.current_user = session.delete(:new_user) @@ -109,7 +109,7 @@ class UsersController < ApplicationController else session[:token] = current_user.tokens.create.token UserMailer.signup_confirm(current_user, current_user.tokens.create(:referer => referer)).deliver_later - redirect_to :action => "confirm", :display_name => current_user.display_name + redirect_to :controller => :confirmations, :action => :confirm, :display_name => current_user.display_name end else render :action => "new", :referer => params[:referer] @@ -147,61 +147,7 @@ class UsersController < ApplicationController current_user.data_public = true current_user.save flash[:notice] = t "users.go_public.flash success" - redirect_to :action => "account", :display_name => current_user.display_name - end - - def lost_password - @title = t "users.lost_password.title" - - if request.post? - user = User.visible.find_by(:email => params[:email]) - - if user.nil? - users = User.visible.where("LOWER(email) = LOWER(?)", params[:email]) - - user = users.first if users.count == 1 - end - - if user - token = user.tokens.create - UserMailer.lost_password(user, token).deliver_later - flash[:notice] = t "users.lost_password.notice email on way" - redirect_to login_path - else - flash.now[:error] = t "users.lost_password.notice email cannot find" - end - end - end - - def reset_password - @title = t "users.reset_password.title" - - if params[:token] - token = UserToken.find_by(:token => params[:token]) - - if token - self.current_user = token.user - - if params[:user] - current_user.pass_crypt = params[:user][:pass_crypt] - current_user.pass_crypt_confirmation = params[:user][:pass_crypt_confirmation] - current_user.status = "active" if current_user.status == "pending" - current_user.email_valid = true - - if current_user.save - token.destroy - session[:fingerprint] = current_user.fingerprint - flash[:notice] = t "users.reset_password.flash changed" - successful_login(current_user) - end - end - else - flash[:error] = t "users.reset_password.flash token bad" - redirect_to :action => "lost_password" - end - else - head :bad_request - end + redirect_to user_account_path(current_user) end def new @@ -271,95 +217,6 @@ class UsersController < ApplicationController end end - def confirm - if request.post? - token = UserToken.find_by(:token => params[:confirm_string]) - if token&.user&.active? - flash[:error] = t("users.confirm.already active") - redirect_to login_path - elsif !token || token.expired? - flash[:error] = t("users.confirm.unknown token") - redirect_to :action => "confirm" - else - user = token.user - user.status = "active" - user.email_valid = true - flash[:notice] = gravatar_status_message(user) if gravatar_enable(user) - user.save! - referer = safe_referer(token.referer) if token.referer - token.destroy - - if session[:token] - token = UserToken.find_by(:token => session[:token]) - session.delete(:token) - else - token = nil - end - - if token.nil? || token.user != user - flash[:notice] = t("users.confirm.success") - redirect_to login_path(:referer => referer) - else - token.destroy - - session[:user] = user.id - session[:fingerprint] = user.fingerprint - - redirect_to referer || welcome_path - end - end - else - user = User.find_by(:display_name => params[:display_name]) - - redirect_to root_path if user.nil? || user.active? - end - end - - def confirm_resend - user = User.find_by(:display_name => params[:display_name]) - token = UserToken.find_by(:token => session[:token]) - - if user.nil? || token.nil? || token.user != user - flash[:error] = t "users.confirm_resend.failure", :name => params[:display_name] - else - UserMailer.signup_confirm(user, user.tokens.create).deliver_later - flash[:notice] = t "users.confirm_resend.success_html", :email => user.email, :sender => Settings.support_email - end - - redirect_to login_path - end - - def confirm_email - if request.post? - token = UserToken.find_by(:token => params[:confirm_string]) - if token&.user&.new_email? - self.current_user = token.user - current_user.email = current_user.new_email - current_user.new_email = nil - current_user.email_valid = true - gravatar_enabled = gravatar_enable(current_user) - if current_user.save - flash[:notice] = if gravatar_enabled - "#{t('users.confirm_email.success')} #{gravatar_status_message(current_user)}" - else - t("users.confirm_email.success") - end - else - flash[:errors] = current_user.errors - end - current_user.tokens.delete_all - session[:user] = current_user.id - session[:fingerprint] = current_user.fingerprint - redirect_to :action => "account", :display_name => current_user.display_name - elsif token - flash[:error] = t "users.confirm_email.failure" - redirect_to :action => "account", :display_name => token.user.display_name - else - flash[:error] = t "users.confirm_email.unknown_token" - end - end - end - def show @user = User.find_by(:display_name => params[:display_name]) @@ -420,15 +277,15 @@ class UsersController < ApplicationController name = auth_info[:info][:name] email = auth_info[:info][:email] - case provider - when "openid" - email_verified = uid.match(%r{https://www.google.com/accounts/o8/id?(.*)}) || + email_verified = case provider + when "openid" + uid.match(%r{https://www.google.com/accounts/o8/id?(.*)}) || uid.match(%r{https://me.yahoo.com/(.*)}) - when "google", "facebook" - email_verified = true - else - email_verified = false - end + when "google", "facebook" + true + else + false + end if settings = session.delete(:new_user_settings) current_user.auth_provider = provider @@ -440,7 +297,7 @@ class UsersController < ApplicationController session[:user_errors] = current_user.errors.as_json - redirect_to :action => "account", :display_name => current_user.display_name + redirect_to user_account_path(current_user) elsif session[:new_user] session[:new_user].auth_provider = provider session[:new_user].auth_uid = uid @@ -464,9 +321,9 @@ class UsersController < ApplicationController when "active", "confirmed" successful_login(user, request.env["omniauth.params"]["referer"]) when "suspended" - failed_login t("users.login.account is suspended", :webmaster => "mailto:#{Settings.support_email}").html_safe + failed_login t("sessions.new.account is suspended", :webmaster => "mailto:#{Settings.support_email}").html_safe else - failed_login t("users.login.auth failure") + failed_login t("sessions.new.auth failure") end else redirect_to :action => "new", :nickname => name, :email => email, @@ -484,17 +341,6 @@ class UsersController < ApplicationController private - ## - # - def unconfirmed_login(user) - session[:token] = user.tokens.create.token - - redirect_to :action => "confirm", :display_name => user.display_name - - session.delete(:remember_me) - session.delete(:referer) - end - ## # update a user's details def update_user(user, params) @@ -506,34 +352,6 @@ class UsersController < ApplicationController user.pass_crypt_confirmation = params[:user][:pass_crypt_confirmation] end - if params[:user][:description] != user.description - user.description = params[:user][:description] - user.description_format = "markdown" - end - - user.languages = params[:user][:languages].split(",") - - case params[:avatar_action] - when "new" - user.avatar.attach(params[:user][:avatar]) - user.image_use_gravatar = false - when "delete" - user.avatar.purge_later - user.image_use_gravatar = false - when "gravatar" - user.avatar.purge_later - user.image_use_gravatar = true - end - - user.home_lat = params[:user][:home_lat] - user.home_lon = params[:user][:home_lon] - - user.preferred_editor = if params[:user][:preferred_editor] == "default" - nil - else - params[:user][:preferred_editor] - end - if params[:user][:auth_provider].nil? || params[:user][:auth_provider].blank? user.auth_provider = nil user.auth_uid = nil @@ -542,8 +360,6 @@ class UsersController < ApplicationController if user.save session[:fingerprint] = user.fingerprint - set_locale(:reset => true) - if user.new_email.blank? || user.new_email == user.email flash[:notice] = t "users.account.flash update success" else @@ -620,34 +436,4 @@ class UsersController < ApplicationController dns.getresources(domain, Resolv::DNS::Resource::IN::MX).collect(&:exchange).collect(&:to_s) end 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.avatar.attached? - - begin - 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)) - available = response.success? - rescue StandardError - available = false - end - - oldsetting = user.image_use_gravatar - user.image_use_gravatar = available - 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 - t "users.account.gravatar.enabled" - else - t "users.account.gravatar.disabled" - end - end end