Merge remote-tracking branch 'upstream/pull/5586'

[rails.git] / app / controllers / users_controller.rb

diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 471215c92234f8535cd459dad4b44e52b5f929f4..a0be87bdc11fa6417601b6e278030fc673825515 100644 (file)
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -6,7 +6,6 @@ class UsersController < ApplicationController
   layout "site"
 
   skip_before_action :verify_authenticity_token, :only => [:auth_success]
   layout "site"
 
   skip_before_action :verify_authenticity_token, :only => [:auth_success]

-  before_action :disable_terms_redirect, :only => [:terms, :save]

   before_action :authorize_web
   before_action :set_locale
   before_action :check_database_readable
   before_action :authorize_web
   before_action :set_locale
   before_action :check_database_readable


@@ -15,7 +14,6 @@ class UsersController < ApplicationController
 
   before_action :check_database_writable, :only => [:new, :go_public]
   before_action :require_cookies, :only => [:new]
 
   before_action :check_database_writable, :only => [:new, :go_public]
   before_action :require_cookies, :only => [:new]

-  before_action :lookup_user_by_name, :only => [:set_status, :destroy]

 
   allow_thirdparty_images :only => :show
   allow_social_login :only => :new
 
   allow_thirdparty_images :only => :show
   allow_social_login :only => :new


@@ -77,66 +75,25 @@ class UsersController < ApplicationController
         render :action => "new"
       else
         # Save the user record
         render :action => "new"
       else
         # Save the user record

-        save_new_user params[:email_hmac], params[:referer]
-      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)
-
-    if request.xhr?
-      render :partial => "terms"
-    else
-      @title = t ".title"
+        if save_new_user params[:email_hmac]
+          SIGNUP_IP_LIMITER&.update(request.remote_ip)
+          SIGNUP_EMAIL_LIMITER&.update(canonical_email(current_user.email))

 
 

-      if current_user&.terms_agreed?
-        # Already agreed to terms, so just show settings
-        redirect_to edit_account_path
-      elsif current_user.nil?
-        redirect_to login_path(:referer => request.fullpath)
-      end
-    end
-  end
-
-  def save
-    @title = t "users.new.title"
-
-    if params[:decline] || !(params[:read_tou] && params[:read_ct])
-      if current_user
-        current_user.terms_seen = true
+          flash[:matomo_goal] = Settings.matomo["goals"]["signup"] if defined?(Settings.matomo)

 
 

-        flash[:notice] = { :partial => "users/terms_declined_flash" } if current_user.save
+          referer = welcome_path(welcome_options(params[:referer]))

 
 

-        referer = safe_referer(params[:referer]) if params[:referer]
-
-        redirect_to referer || edit_account_path
-      elsif params[:decline]
-        redirect_to t("users.terms.declined"), :allow_other_host => true
-      else
-        redirect_to :action => :terms
-      end
-    elsif current_user
-      unless current_user.terms_agreed?
-        current_user.consider_pd = params[:user][:consider_pd]
-        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
+          if current_user.status == "active"
+            successful_login(current_user, referer)
+          else
+            session[:pending_user] = current_user.id
+            UserMailer.signup_confirm(current_user, current_user.generate_token_for(:new_user), referer).deliver_later
+            redirect_to :controller => :confirmations, :action => :confirm, :display_name => current_user.display_name
+          end
+        else
+          render :action => "new", :referer => params[:referer]
+        end

       end
       end

-
-      referer = safe_referer(params[:referer]) if params[:referer]
-
-      redirect_to referer || edit_account_path

     end
   end
 
     end
   end
 


@@ -147,18 +104,6 @@ class UsersController < ApplicationController
     redirect_to edit_account_path
   end
 
     redirect_to edit_account_path
   end
 

-  ##
-  # sets a user's status
-  def set_status
-    @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
-

   ##
   # omniauth success callback
   def auth_success
   ##
   # omniauth success callback
   def auth_success


@@ -238,7 +183,7 @@ class UsersController < ApplicationController
 
   private
 
 
   private
 

-  def save_new_user(email_hmac, referer = nil)
+  def save_new_user(email_hmac)

     current_user.data_public = true
     current_user.description = "" if current_user.description.nil?
     current_user.creation_address = request.remote_ip
     current_user.data_public = true
     current_user.description = "" if current_user.description.nil?
     current_user.creation_address = request.remote_ip


@@ -254,24 +199,7 @@ class UsersController < ApplicationController
       current_user.activate
     end
 
       current_user.activate
     end
 

-    if current_user.save
-      SIGNUP_IP_LIMITER&.update(request.remote_ip)
-      SIGNUP_EMAIL_LIMITER&.update(canonical_email(current_user.email))
-
-      flash[:matomo_goal] = Settings.matomo["goals"]["signup"] if defined?(Settings.matomo)
-
-      referer = welcome_path(welcome_options(referer))
-
-      if current_user.status == "active"
-        successful_login(current_user, referer)
-      else
-        session[:pending_user] = current_user.id
-        UserMailer.signup_confirm(current_user, current_user.generate_token_for(:new_user), referer).deliver_later
-        redirect_to :controller => :confirmations, :action => :confirm, :display_name => current_user.display_name
-      end
-    else
-      render :action => "new", :referer => params[:referer]
-    end
+    current_user.save

   end
 
   def welcome_options(referer = nil)
   end
 
   def welcome_options(referer = nil)


@@ -289,14 +217,6 @@ class UsersController < ApplicationController
     end
   end
 
     end
   end
 

-  ##
-  # ensure that there is a "user" instance variable
-  def lookup_user_by_name
-    @user = User.find_by(:display_name => params[:display_name])
-  rescue ActiveRecord::RecordNotFound
-    redirect_to :action => "view", :display_name => params[:display_name] unless @user
-  end
-

   ##
   # return permitted user parameters
   def user_params
   ##
   # return permitted user parameters
   def user_params