Commiting

app/controllers/auth/omniauth_callbacks_controller.rb

@@ -1,33 +0,0 @@
-# frozen_string_literal: true
-
-class Auth::OmniauthCallbacksController < Devise::OmniauthCallbacksController
-  skip_before_action :verify_authenticity_token
-
-  def self.provides_callback_for(provider)
-    provider_id = provider.to_s.chomp '_oauth2'
-
-    define_method provider do
-      @user = User.find_for_oauth(request.env['omniauth.auth'], current_user)
-
-      if @user.persisted?
-        sign_in_and_redirect @user, event: :authentication
-        set_flash_message(:notice, :success, kind: provider_id.capitalize) if is_navigational_format?
-      else
-        session["devise.#{provider}_data"] = request.env['omniauth.auth']
-        redirect_to new_user_registration_url
-      end
-    end
-  end
-
-  Devise.omniauth_configs.each_key do |provider|
-    provides_callback_for provider
-  end
-
-  def after_sign_in_path_for(resource)
-    if resource.email_verified?
-      root_path
-    else
-      finish_signup_path
-    end
-  end
-end

app/controllers/auth/registrations_controller.rb

@@ -3,9 +3,7 @@
 class Auth::RegistrationsController < Devise::RegistrationsController
   layout :determine_layout
 
-  before_action :set_invite, only: [:new, :create]
   before_action :set_challenge, only: [:new]
-  before_action :check_enabled_registrations, only: [:new, :create]
   before_action :configure_sign_up_params, only: [:create]
   before_action :set_sessions, only: [:edit, :update]
   before_action :set_instance_presenter, only: [:new, :create, :update]
@@ -41,7 +39,6 @@ class Auth::RegistrationsController < Devise::RegistrationsController
     super(hash)
 
     resource.locale             = I18n.locale
-    resource.invite_code        = params[:invite_code] if resource.invite_code.blank?
     resource.agreement          = true
     resource.current_sign_in_ip = request.remote_ip
 
@@ -50,7 +47,7 @@ class Auth::RegistrationsController < Devise::RegistrationsController
 
   def configure_sign_up_params
     devise_parameter_sanitizer.permit(:sign_up) do |u|
-      u.permit({ account_attributes: [:username], invite_request_attributes: [:text] }, :email, :password, :password_confirmation, :invite_code)
+      u.permit({ account_attributes: [:username] }, :email, :password, :password_confirmation)
     end
   end
 
@@ -58,16 +55,6 @@ class Auth::RegistrationsController < Devise::RegistrationsController
     new_user_session_path
   end
 
-  def after_sign_in_path_for(_resource)
-    set_invite
-
-    if @invite&.autofollow?
-      short_account_path(@invite.user.account)
-    else
-      super
-    end
-  end
-
   def after_inactive_sign_up_path_for(_resource)
     new_user_session_path
   end
@@ -76,22 +63,6 @@ class Auth::RegistrationsController < Devise::RegistrationsController
     edit_user_registration_path
   end
 
-  def check_enabled_registrations
-    redirect_to root_path if single_user_mode? || !allowed_registrations?
-  end
-
-  def allowed_registrations?
-    Setting.registrations_mode != 'none' || @invite&.valid_for_use?
-  end
-
-  def invite_code
-    if params[:user]
-      params[:user][:invite_code]
-    else
-      params[:invite_code]
-    end
-  end
-
   private
 
   def set_instance_presenter
@@ -102,11 +73,6 @@ class Auth::RegistrationsController < Devise::RegistrationsController
     @body_classes = %w(edit update).include?(action_name) ? 'admin' : ''
   end
 
-  def set_invite
-    invite = invite_code.present? ? Invite.find_by(code: invite_code) : nil
-    @invite = invite&.valid_for_use? ? invite : nil
-  end
-
   def set_challenge
     @challenge_add_1 = rand(0...9)
     @challenge_add_2 = rand(0...9)