forest_admin_datasource_rpc 1.2.1 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 52e06b3b804296a40f08937a6d15e7bca8d3ec876dc1f247528b3edbb3c7811f
-  data.tar.gz: 2d534aef2370c2baea80b8fcdc23b660e9aac84fe0f1581d79273a733db7778b
+  metadata.gz: dd4932d629754f42fd137a8d3d85360c85f2b0c76a0dfcb97427a634c9468a79
+  data.tar.gz: a19fc99287514fea329de2ed9fa5aa9612080f1f5de431dd6cde80527f7045b8
 SHA512:
-  metadata.gz: d289ff4ab2a68e68a93b3d14f5e6aecf4e0ae9e6d06a67aa6dbdc91a5ecec719851dd63bdb3535c04dff1436c00d23f2f57b798f310dad385c45cdf32b2887e9
-  data.tar.gz: e9e54849f415f354e42671697fd7c3df1be954f77c9e74de51176e008e2e5282ef6502a66267f627e09c6ba9c9bbb26fdf70c983b63fb7bce27c1a90e0b99c51
+  metadata.gz: bc2dd853f80b41569484b14b3b2a6dba697099630f9bf9eab72612948a459c766f1d6a10ffdddb03f166cae1059fdccec92a9b6ee07ac34836475cd4067f1444
+  data.tar.gz: 22ea9393683dc7392668ec1da4f3bbdc7c884cc7ba0c17d8ef1431ce57affd4e0e1cdc2017940ee52e58207cdaae0308bf4c52b1341a44fc1ed42b98a7620f2f

data/lib/forest_admin_datasource_rpc/Utils/rpc_client.rb

@@ -6,6 +6,28 @@ require 'time'
 module ForestAdminDatasourceRpc
   module Utils
     class RpcClient
+      # RpcClient handles HTTP communication with the RPC Agent.
+      #
+      # Error Handling:
+      # When the RPC agent returns an error, this client automatically maps HTTP status codes
+      # to appropriate Forest Admin exception types. This ensures business errors from the
+      # RPC agent are properly propagated to the datasource_rpc.
+      #
+      # To add support for a new error type:
+      # 1. Add the status code and exception class to ERROR_STATUS_MAP
+      # 2. (Optional) Add a default message to generate_default_message method
+      # 3. Tests will automatically cover the new mapping
+
+      # Map HTTP status codes to Forest Admin exception classes
+      ERROR_STATUS_MAP = {
+        400 => ForestAdminAgent::Http::Exceptions::ValidationError,
+        401 => ForestAdminAgent::Http::Exceptions::AuthenticationOpenIdClient,
+        403 => ForestAdminAgent::Http::Exceptions::ForbiddenError,
+        404 => ForestAdminAgent::Http::Exceptions::NotFoundError,
+        409 => ForestAdminAgent::Http::Exceptions::ConflictError,
+        422 => ForestAdminAgent::Http::Exceptions::UnprocessableError
+      }.freeze
+
       def initialize(api_url, auth_secret)
         @api_url = api_url
         @auth_secret = auth_secret
@@ -40,12 +62,70 @@ module ForestAdminDatasourceRpc
       end
 
       def handle_response(response)
-        unless response.success?
+        raise_appropriate_error(response) unless response.success?
+
+        response.body
+      end
+
+      def raise_appropriate_error(response)
+        error_body = parse_error_body(response)
+        status = response.status
+        url = response.env.url
+        message = error_body[:message] || generate_default_message(status, url)
+
+        exception_class = ERROR_STATUS_MAP[status]
+
+        if exception_class
+          raise exception_class, message
+        elsif status >= 500
+          raise ForestAdminDatasourceToolkit::Exceptions::ForestException,
+                "Server Error: #{message}"
+        else
           raise ForestAdminDatasourceToolkit::Exceptions::ForestException,
-                "RPC request failed: #{response.status} for uri #{response.env.url}"
+                "RPC request failed: #{status} - #{message}"
         end
+      end
 
-        response.body
+      def generate_default_message(status, url)
+        default_messages = {
+          400 => "Bad Request: #{url}",
+          401 => "Unauthorized: #{url}",
+          403 => "Forbidden: #{url}",
+          404 => "Not Found: #{url}",
+          409 => "Conflict: #{url}",
+          422 => "Unprocessable Entity: #{url}"
+        }
+
+        default_messages[status] || "Unknown error (#{url})"
+      end
+
+      def parse_error_body(response)
+        body = response.body
+
+        # If body is already a hash (Faraday parsed it as JSON)
+        return symbolize_error_keys(body) if body.is_a?(Hash)
+
+        # Try to parse as JSON if it's a string
+        if body.is_a?(String) && !body.empty?
+          begin
+            parsed = JSON.parse(body)
+            return symbolize_error_keys(parsed)
+          rescue JSON::ParserError
+            # If parsing fails, return the body as the message
+            return { message: body }
+          end
+        end
+
+        # Fallback for empty or unexpected body types
+        { message: 'Unknown error' }
+      end
+
+      def symbolize_error_keys(hash)
+        {
+          message: hash['error'] || hash['message'] || hash[:error] || hash[:message],
+          errors: hash['errors'] || hash[:errors],
+          name: hash['name'] || hash[:name]
+        }.compact
       end
     end
   end

data/lib/forest_admin_datasource_rpc/version.rb

@@ -1,3 +1,3 @@
 module ForestAdminDatasourceRpc
-  VERSION = "1.2.1"
+  VERSION = "1.3.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: forest_admin_datasource_rpc
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.3.0
 platform: ruby
 authors:
 - Matthieu