Fix for heartbeat endpoint - JP

Author: gjacob24

app/controllers/api/v2/base_api_controller.rb

@@ -36,18 +36,15 @@ def me
       # define instance variable json and associated getter and setter methods
       attr_accessor :json
 
-      def get_client_and_server_details # rubocop:todo Naming/AccessorMethodName
-        @server = ApplicationService.application_name
-        @client = OauthApplication.find(doorkeeper_token.application_id) if doorkeeper_token
-        @scopes = doorkeeper_token.scopes.to_a if doorkeeper_token
-        return unless doorkeeper_token&.resource_owner_id
-
-        @resource_owner = User.find(doorkeeper_token.resource_owner_id)
+      def get_client_and_server_details
+        @application = ApplicationService.application_name
+        @caller = request.remote_ip if @client.blank?
+        @caller = @client.is_a?(User) ? @client.name(false) : @client.name if @client.present?
       end
 
       def log_access
-        Rails.logger.info "Client (OAuth) application name: #{@client.name}"
-        Rails.logger.info "Client (OAuth) application uid: #{@client.uid}"
+        Rails.logger.info "Client (OAuth) application name: #{@client.name}" if @client.present?
+        Rails.logger.info "Client (OAuth) application uid: #{@client.uid}"  if @client.present?
         Rails.logger.info "Resource owner id: #{@resource_owner.id}" if @resource_owner
       end
 

app/views/api/v2/_standard_response.json.jbuilder

@@ -15,7 +15,7 @@ json.ignore_nil!
 json.server @server
 json.source "#{request.method} #{request.path}"
 json.time Time.now.to_formatted_s(:iso8601)
-json.client @client.name
+json.client @client.name if @client.present?
 json.code response.status
 json.message Rack::Utils::HTTP_STATUS_CODES[response.status]