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

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

diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 3416797636e8f25030bdebc5835be299fe4221cb..0830e51d402bb02ca877b5ca7da6523ebf59de51 100644 (file)
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -98,13 +98,8 @@ class UsersController < ApplicationController
       if current_user.invalid?
         # Something is wrong with a new user, so rerender the form
         render :action => "new"
       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.slice("email", "display_name", "pass_crypt", "pass_crypt_confirmation")
-        redirect_to auth_url(current_user.auth_provider, current_user.auth_uid, params[:referer]), :status => :temporary_redirect

       else
         # Save the user record
       else
         # Save the user record

-        session[:new_user] = current_user.slice("email", "display_name", "pass_crypt", "pass_crypt_confirmation")

         save_new_user params[:email_hmac], params[:referer]
       end
     end
         save_new_user params[:email_hmac], params[:referer]
       end
     end


@@ -219,12 +214,6 @@ class UsersController < ApplicationController
       session[:user_errors] = current_user.errors.as_json
 
       redirect_to edit_account_path
       session[:user_errors] = current_user.errors.as_json
 
       redirect_to edit_account_path

-    elsif session[:new_user]
-      session[:new_user]["auth_provider"] = provider
-      session[:new_user]["auth_uid"] = uid
-
-      email_hmac = UsersController.message_hmac(email) if email_verified && email
-      save_new_user email_hmac, referer

     else
       user = User.find_by(:auth_provider => provider, :auth_uid => uid)
 
     else
       user = User.find_by(:auth_provider => provider, :auth_uid => uid)
 


@@ -273,42 +262,38 @@ class UsersController < ApplicationController
   private
 
   def save_new_user(email_hmac, referer = nil)
   private
 
   def save_new_user(email_hmac, referer = nil)

-    new_user = session.delete(:new_user)
-    self.current_user = User.new(new_user)
-    if check_signup_allowed(current_user.email)
-      current_user.data_public = true
-      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.utc
-      current_user.tou_agreed = Time.now.utc
-      current_user.terms_seen = true
-
-      if current_user.auth_uid.blank?
-        current_user.auth_provider = nil
-        current_user.auth_uid = nil
-      elsif email_hmac && ActiveSupport::SecurityUtils.secure_compare(email_hmac, UsersController.message_hmac(current_user.email))
-        current_user.activate
-      end
+    current_user.data_public = true
+    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.utc
+    current_user.tou_agreed = Time.now.utc
+    current_user.terms_seen = true
+
+    if current_user.auth_uid.blank?
+      current_user.auth_provider = nil
+      current_user.auth_uid = nil
+    elsif email_hmac && ActiveSupport::SecurityUtils.secure_compare(email_hmac, UsersController.message_hmac(current_user.email))
+      current_user.activate
+    end

 
 

-      if current_user.save
-        SIGNUP_IP_LIMITER&.update(request.remote_ip)
-        SIGNUP_EMAIL_LIMITER&.update(canonical_email(current_user.email))
+    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)
+      flash[:matomo_goal] = Settings.matomo["goals"]["signup"] if defined?(Settings.matomo)

 
 

-        referer = welcome_path(welcome_options(referer))
+      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
+      if current_user.status == "active"
+        successful_login(current_user, referer)

       else
       else

-        render :action => "new", :referer => params[:referer]
+        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
       end

+    else
+      render :action => "new", :referer => params[:referer]

     end
   end
 
     end
   end