Change the way ConnectedDevice logging is added to TokensController [SCI-8287] (#5634)

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

config/application.rb

@@ -72,18 +72,8 @@ module Scinote
       # Only Authorization endpoint
       Doorkeeper::AuthorizationsController.layout 'sign_in_halt'
 
-      # Add Connected Device logging
+      # Add connected device logging when creating tokens
-      Doorkeeper::TokensController.class_eval do
+      Doorkeeper::TokensController.include(Doorkeeper::ConnectedDeviceLogging)
-        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
     end
 
     config.action_view.field_error_proc = Proc.new { |html_tag, instance|