X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/a863be8831efbb815bfd9ecdba01b8334552f0a3..067b0de4391a32124aef23c56d73e2bb492df8ca:/app/controllers/users_controller.rb diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index f7a82c08c..6d98c17f6 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -17,6 +17,109 @@ class UsersController < ApplicationController before_action :lookup_user_by_name, :only => [:set_status, :destroy] before_action :allow_thirdparty_images, :only => [:show] + ## + # display a list of users matching specified criteria + def index + if request.post? + ids = params[:user].keys.collect(&:to_i) + + User.where(:id => ids).update_all(:status => "confirmed") if params[:confirm] + User.where(:id => ids).update_all(:status => "deleted") if params[:hide] + + redirect_to url_for(:status => params[:status], :ip => params[:ip], :page => params[:page]) + else + @params = params.permit(:status, :ip) + + conditions = {} + conditions[:status] = @params[:status] if @params[:status] + conditions[:creation_ip] = @params[:ip] if @params[:ip] + + @user_pages, @users = paginate(:users, + :conditions => conditions, + :order => :id, + :per_page => 50) + end + end + + def show + @user = User.find_by(:display_name => params[:display_name]) + + if @user && + (@user.visible? || current_user&.administrator?) + @title = @user.display_name + else + render_unknown_user params[:display_name] + end + end + + def new + @title = t ".title" + @referer = if params[:referer] + safe_referer(params[:referer]) + else + session[:referer] + end + + append_content_security_policy_directives( + :form_action => %w[accounts.google.com *.facebook.com login.live.com github.com meta.wikimedia.org] + ) + + if current_user + # The user is logged in already, so don't show them the signup + # page, instead send them to the home page + redirect_to @referer || { :controller => "site", :action => "index" } + elsif params.key?(:auth_provider) && params.key?(:auth_uid) + self.current_user = User.new(:email => params[:email], + :email_confirmation => params[:email], + :display_name => params[:nickname], + :auth_provider => params[:auth_provider], + :auth_uid => params[:auth_uid]) + + flash.now[:notice] = render_to_string :partial => "auth_association" + else + check_signup_allowed + + self.current_user = User.new + end + end + + def create + self.current_user = User.new(user_params) + + if check_signup_allowed(current_user.email) + session[:referer] = safe_referer(params[:referer]) if params[:referer] + + Rails.logger.info "create: #{session[:referer]}" + + if current_user.auth_provider.present? && current_user.pass_crypt.empty? + # We are creating an account with external authentication and + # no password was specified so create a random one + current_user.pass_crypt = SecureRandom.base64(16) + current_user.pass_crypt_confirmation = current_user.pass_crypt + end + + if current_user.invalid? + # Something is wrong with a new user, so rerender the form + render :action => "new" + elsif current_user.auth_provider.present? + # Verify external authenticator before moving on + session[:new_user] = current_user + redirect_to auth_url(current_user.auth_provider, current_user.auth_uid), :status => :temporary_redirect + else + # Save the user record + session[:new_user] = current_user + redirect_to :action => :terms + end + end + end + + ## + # destroy a user, marking them as deleted and removing personal data + def destroy + @user.soft_destroy! + redirect_to user_path(:display_name => params[:display_name]) + end + def terms @legale = params[:legale] || OSM.ip_to_country(request.remote_ip) || Settings.default_legale @text = OSM.legal_text_for_country(@legale) @@ -24,7 +127,7 @@ class UsersController < ApplicationController if request.xhr? render :partial => "terms" else - @title = t "users.terms.title" + @title = t ".title" if current_user&.terms_agreed? # Already agreed to terms, so just show settings @@ -55,8 +158,8 @@ class UsersController < ApplicationController elsif current_user unless current_user.terms_agreed? current_user.consider_pd = params[:user][:consider_pd] - current_user.tou_agreed = Time.now.getutc - current_user.terms_agreed = Time.now.getutc + current_user.tou_agreed = Time.now.utc + current_user.terms_agreed = Time.now.utc current_user.terms_seen = true flash[:notice] = t "users.new.terms accepted" if current_user.save @@ -73,8 +176,8 @@ class UsersController < ApplicationController current_user.description = "" if current_user.description.nil? current_user.creation_ip = request.remote_ip current_user.languages = http_accept_language.user_preferred_languages - current_user.terms_agreed = Time.now.getutc - current_user.tou_agreed = Time.now.getutc + current_user.terms_agreed = Time.now.utc + current_user.tou_agreed = Time.now.utc current_user.terms_seen = true if current_user.auth_uid.blank? @@ -83,7 +186,7 @@ class UsersController < ApplicationController end if current_user.save - flash[:piwik_goal] = PIWIK["goals"]["signup"] if defined?(PIWIK) + flash[:matomo_goal] = Settings.matomo["goals"]["signup"] if defined?(Settings.matomo) referer = welcome_path @@ -117,127 +220,22 @@ class UsersController < ApplicationController def go_public current_user.data_public = true current_user.save - flash[:notice] = t "users.go_public.flash success" + flash[:notice] = t ".flash success" redirect_to edit_account_path end - def new - @title = t "users.new.title" - @referer = if params[:referer] - safe_referer(params[:referer]) - else - session[:referer] - end - - append_content_security_policy_directives( - :form_action => %w[accounts.google.com *.facebook.com login.live.com github.com meta.wikimedia.org] - ) - - if current_user - # The user is logged in already, so don't show them the signup - # page, instead send them to the home page - if @referer - redirect_to @referer - else - redirect_to :controller => "site", :action => "index" - end - elsif params.key?(:auth_provider) && params.key?(:auth_uid) - self.current_user = User.new(:email => params[:email], - :email_confirmation => params[:email], - :display_name => params[:nickname], - :auth_provider => params[:auth_provider], - :auth_uid => params[:auth_uid]) - - flash.now[:notice] = render_to_string :partial => "auth_association" - else - check_signup_allowed - - self.current_user = User.new - end - end - - def create - self.current_user = User.new(user_params) - - if check_signup_allowed(current_user.email) - session[:referer] = safe_referer(params[:referer]) if params[:referer] - - Rails.logger.info "create: #{session[:referer]}" - - current_user.status = "pending" - - if current_user.auth_provider.present? && current_user.pass_crypt.empty? - # We are creating an account with external authentication and - # no password was specified so create a random one - current_user.pass_crypt = SecureRandom.base64(16) - current_user.pass_crypt_confirmation = current_user.pass_crypt - end - - if current_user.invalid? - # Something is wrong with a new user, so rerender the form - render :action => "new" - elsif current_user.auth_provider.present? - # Verify external authenticator before moving on - session[:new_user] = current_user - redirect_to auth_url(current_user.auth_provider, current_user.auth_uid), :status => :temporary_redirect - else - # Save the user record - session[:new_user] = current_user - redirect_to :action => :terms - end - end - end - - def show - @user = User.find_by(:display_name => params[:display_name]) - - if @user && - (@user.visible? || current_user&.administrator?) - @title = @user.display_name - else - render_unknown_user params[:display_name] - end - end - ## # sets a user's status def set_status - @user.status = params[:status] - @user.save + @user.activate! if params[:event] == "activate" + @user.confirm! if params[:event] == "confirm" + @user.unconfirm! if params[:event] == "unconfirm" + @user.hide! if params[:event] == "hide" + @user.unhide! if params[:event] == "unhide" + @user.unsuspend! if params[:event] == "unsuspend" redirect_to user_path(:display_name => params[:display_name]) end - ## - # destroy a user, marking them as deleted and removing personal data - def destroy - @user.destroy - redirect_to user_path(:display_name => params[:display_name]) - end - - ## - # display a list of users matching specified criteria - def index - if request.post? - ids = params[:user].keys.collect(&:to_i) - - User.where(:id => ids).update_all(:status => "confirmed") if params[:confirm] - User.where(:id => ids).update_all(:status => "deleted") if params[:hide] - - redirect_to url_for(:status => params[:status], :ip => params[:ip], :page => params[:page]) - else - @params = params.permit(:status, :ip) - - conditions = {} - conditions[:status] = @params[:status] if @params[:status] - conditions[:creation_ip] = @params[:ip] if @params[:ip] - - @user_pages, @users = paginate(:users, - :conditions => conditions, - :order => :id, - :per_page => 50) - end - end - ## # omniauth success callback def auth_success @@ -273,7 +271,7 @@ class UsersController < ApplicationController session[:new_user].auth_provider = provider session[:new_user].auth_uid = uid - session[:new_user].status = "active" if email_verified && email == session[:new_user].email + session[:new_user].activate if email_verified && email == session[:new_user].email redirect_to :action => "terms" else @@ -292,7 +290,7 @@ class UsersController < ApplicationController when "active", "confirmed" successful_login(user, request.env["omniauth.params"]["referer"]) when "suspended" - failed_login t("sessions.new.account is suspended", :webmaster => "mailto:#{Settings.support_email}").html_safe + failed_login({ :partial => "sessions/suspended_flash" }) else failed_login t("sessions.new.auth failure") end @@ -306,7 +304,7 @@ class UsersController < ApplicationController ## # omniauth failure callback def auth_failure - flash[:error] = t(params[:message], :scope => "users.auth_failure", :default => t("users.auth_failure.unknown_error")) + flash[:error] = t(params[:message], :scope => "users.auth_failure", :default => t(".unknown_error")) origin = safe_referer(params[:origin]) if params[:origin]