refactor applications service

app/controllers/admin/applications_controller.rb

@@ -19,7 +19,7 @@ class Admin::ApplicationsController < Admin::ApplicationController
   end
 
   def create
-    @application = Applications::CreateService.new(current_user, application_params.merge(ip_address: request.remote_ip)).execute
+    @application = Applications::CreateService.new(current_user, application_params).execute(request)
 
     if @application.persisted?
       flash[:notice] = I18n.t(:notice, scope: [:doorkeeper, :flash, :applications, :create])

app/controllers/oauth/applications_controller.rb

@@ -16,7 +16,7 @@ class Oauth::ApplicationsController < Doorkeeper::ApplicationsController
   end
 
   def create
-    @application = Applications::CreateService.new(current_user, create_application_params).execute
+    @application = Applications::CreateService.new(current_user, create_application_params).execute(request)
 
     if @application.persisted?
       flash[:notice] = I18n.t(:notice, scope: [:doorkeeper, :flash, :applications, :create])
@@ -58,7 +58,6 @@ class Oauth::ApplicationsController < Doorkeeper::ApplicationsController
   def create_application_params
     application_params.tap do |params|
       params[:owner] = current_user
-      params[:ip_address] = request.remote_ip
     end
   end
 end

app/services/applications/create_service.rb

@@ -5,10 +5,9 @@ module Applications
     def initialize(current_user, params)
       @current_user = current_user
       @params = params
-      @ip_address = @params.delete(:ip_address)
     end
 
-    def execute
+    def execute(request = nil)
       Doorkeeper::Application.create(@params)
     end
   end

ee/app/services/ee/applications/create_service.rb

 module EE
   module Applications
     module CreateService
-      def execute
+      def execute(request)
         super.tap do |application|
-          audit_event_service.for_user(application.name).security_event
+          audit_event_service(request.ip_address).for_user(application.name).security_event
         end
       end
 
-      def audit_event_service
+      def audit_event_service(ip_address)
         ::AuditEventService.new(@current_user,
                                 @current_user,
                                 action: :custom,
                                 custom_message: 'OAuth access granted',
-                                ip_address: @ip_address)
+                                ip_address: ip_address)
       end
     end
   end