From 952b6039f99c82773639ebb1e5b78edf5cccac32 Mon Sep 17 00:00:00 2001
From: Vishal Jain <vishal@kiprosh.com>
Date: Sun, 16 Oct 2022 12:54:01 +0530
Subject: [PATCH] Remove spree user registrations controller file

---
 .../spree/user_registrations_controller.rb    | 48 -------------------
 .../user_registrations_controller.rb          | 21 +++++++-
 2 files changed, 19 insertions(+), 50 deletions(-)
 delete mode 100644 app/controllers/spree/user_registrations_controller.rb

diff --git a/app/controllers/spree/user_registrations_controller.rb b/app/controllers/spree/user_registrations_controller.rb
deleted file mode 100644
index c8127b1035..0000000000
--- a/app/controllers/spree/user_registrations_controller.rb
+++ /dev/null
@@ -1,48 +0,0 @@
-# frozen_string_literal: true
-
-require "spree/core/controller_helpers/auth"
-require "spree/core/controller_helpers/common"
-require "spree/core/controller_helpers/order"
-
-module Spree
-  class UserRegistrationsController < Devise::RegistrationsController
-    helper 'spree/base'
-
-    include Spree::Core::ControllerHelpers::Auth
-    include Spree::Core::ControllerHelpers::Common
-    include Spree::Core::ControllerHelpers::Order
-
-    before_action :check_permissions, only: [:edit, :update]
-    skip_before_action :require_no_authentication
-
-    # GET /resource/edit
-    def edit
-      super
-    end
-
-    # PUT /resource
-    def update
-      super
-    end
-
-    # DELETE /resource
-    def destroy
-      super
-    end
-
-    # GET /resource/cancel
-    # Forces the session data which is usually expired after sign
-    # in to be expired now. This is useful if the user wants to
-    # cancel oauth signing in/up in the middle of the process,
-    # removing all OAuth session data.
-    def cancel
-      super
-    end
-
-    protected
-
-    def check_permissions
-      authorize!(:create, resource)
-    end
-  end
-end
diff --git a/app/controllers/user_registrations_controller.rb b/app/controllers/user_registrations_controller.rb
index 50638970f1..ece29b99f0 100644
--- a/app/controllers/user_registrations_controller.rb
+++ b/app/controllers/user_registrations_controller.rb
@@ -1,13 +1,24 @@
 # frozen_string_literal: true
 
 require 'open_food_network/error_logger'
+require "spree/core/controller_helpers/auth"
+require "spree/core/controller_helpers/common"
+require "spree/core/controller_helpers/order"
 
-class UserRegistrationsController < Spree::UserRegistrationsController
+class UserRegistrationsController < Devise::RegistrationsController
   I18N_SCOPE = 'devise.user_registrations.spree_user'
 
-  before_action :set_checkout_redirect, only: :create
+  helper 'spree/base'
 
+  include Spree::Core::ControllerHelpers::Auth
+  include Spree::Core::ControllerHelpers::Common
+  include Spree::Core::ControllerHelpers::Order
   include I18nHelper
+
+  before_action :check_permissions, only: [:edit, :update]
+  skip_before_action :require_no_authentication
+
+  before_action :set_checkout_redirect, only: :create
   before_action :set_locale
 
   # POST /resource/sign_up
@@ -31,6 +42,12 @@ class UserRegistrationsController < Spree::UserRegistrationsController
     render_error(message: I18n.t('unknown_error', scope: I18N_SCOPE))
   end
 
+  protected
+
+  def check_permissions
+    authorize!(:create, resource)
+  end
+
   private
 
   def spree_user_params