From 58f95bd34c07bbb707dec6450212beeb1b1bb6f9 Mon Sep 17 00:00:00 2001
From: Matt-Yorkley <9029026+Matt-Yorkley@users.noreply.github.com>
Date: Sat, 24 Jul 2021 18:37:06 +0100
Subject: [PATCH] Remove ActionController::Metal class_eval hack

---
 app/controllers/api/v0/base_controller.rb | 4 ++++
 app/controllers/metal_decorator.rb        | 8 --------
 2 files changed, 4 insertions(+), 8 deletions(-)
 delete mode 100644 app/controllers/metal_decorator.rb

diff --git a/app/controllers/api/v0/base_controller.rb b/app/controllers/api/v0/base_controller.rb
index 304fd990a4..1f89cb6c68 100644
--- a/app/controllers/api/v0/base_controller.rb
+++ b/app/controllers/api/v0/base_controller.rb
@@ -41,6 +41,10 @@ module Api
 
       private
 
+      def spree_current_user
+        @spree_current_user ||= request.env['warden'].user
+      end
+
       # Use logged in user (spree_current_user) for API authentication (current_api_user)
       def authenticate_user
         return if @current_api_user = spree_current_user
diff --git a/app/controllers/metal_decorator.rb b/app/controllers/metal_decorator.rb
deleted file mode 100644
index 9e9364fa81..0000000000
--- a/app/controllers/metal_decorator.rb
+++ /dev/null
@@ -1,8 +0,0 @@
-# frozen_string_literal: true
-
-# For the API
-ActionController::Metal.class_eval do
-  def spree_current_user
-    @spree_current_user ||= request.env['warden'].user
-  end
-end