From 4fe0ad026d5b816687f090f0308a672e2ad6c04b Mon Sep 17 00:00:00 2001
From: artoscinote <85488244+artoscinote@users.noreply.github.com>
Date: Tue, 20 Jun 2023 12:50:36 +0200
Subject: [PATCH] Change the way ConnectedDevice logging is added to
 TokensController [SCI-8287] (#5634)

---
 .../doorkeeper/connected_device_logging.rb    | 19 +++++++++++++++++++
 config/application.rb                         | 14 ++------------
 2 files changed, 21 insertions(+), 12 deletions(-)
 create mode 100644 app/controllers/concerns/doorkeeper/connected_device_logging.rb

diff --git a/app/controllers/concerns/doorkeeper/connected_device_logging.rb b/app/controllers/concerns/doorkeeper/connected_device_logging.rb
new file mode 100644
index 000000000..4cdd6234d
--- /dev/null
+++ b/app/controllers/concerns/doorkeeper/connected_device_logging.rb
@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+module Doorkeeper
+  module ConnectedDeviceLogging
+    extend ActiveSupport::Concern
+
+    included do
+      after_action :log_connected_device, only: :create
+    end
+
+    private
+
+    def log_connected_device
+      return if @authorize_response.is_a?(Doorkeeper::OAuth::ErrorResponse)
+
+      ConnectedDevice.from_request_headers(request.headers, @authorize_response&.token)
+    end
+  end
+end
diff --git a/config/application.rb b/config/application.rb
index b9b8401c9..d8288b370 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -72,18 +72,8 @@ module Scinote
       # Only Authorization endpoint
       Doorkeeper::AuthorizationsController.layout 'sign_in_halt'
 
-      # Add Connected Device logging
-      Doorkeeper::TokensController.class_eval do
-        after_action :log_connected_device, only: :create
-
-        private
-
-        def log_connected_device
-          return if @authorize_response.is_a?(Doorkeeper::OAuth::ErrorResponse)
-
-          ConnectedDevice.from_request_headers(request.headers, @authorize_response&.token)
-        end
-      end
+      # Add connected device logging when creating tokens
+      Doorkeeper::TokensController.include(Doorkeeper::ConnectedDeviceLogging)
     end
 
     config.action_view.field_error_proc = Proc.new { |html_tag, instance|