forest_admin_datasource_rpc 1.2.0 → 1.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fec7958398b22314b068fdebe6fe93130a50d5d039766cf1c7a757b8c1491236
-  data.tar.gz: 3c351dea49b456ba4f73042c4f6c4c971bed51a9831323f5bf8785589d38b03e
+  metadata.gz: 44bec686335e416ffbe42844a28f69965e0c547f18e0310acd5e9675d9774e01
+  data.tar.gz: 568b5ba9225551088ba5b84c08e9662e9a3e6cc609bc0f3598bfe54cb3e8b4be
 SHA512:
-  metadata.gz: 4af07a7694001036f6e88373378d31b2e0ca66706f11f526d054484058d0b68c7c6d9e1b4635461ff805b4a52866495a777c94632fd757e770e9eb27f2b652bb
-  data.tar.gz: f2909cc00aeb3503030ff48a386aa61221dd57cc2482bc93c9918b70e283e9cc948763de774b42d400170fcc1e1e5508a6f13ac0d12a19d06532426bfa36afb1
+  metadata.gz: 8aa0521071631fb89f7ce39b7ee335777190abac1109a257d1fe1da07abd6996589a3cba2ee338fbe5afb36adb3ae8d73669716280e4a97f8c8da4c1c45d84ba
+  data.tar.gz: 6c97dcb89283d849efee051a0a3a142a68a12dc13d16a4814575269e44e71b6d364c2bdc79e61012186ad188cc6bf11b2f3b3c2ffada872188acf274605b520c

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.0"
+  VERSION = "1.2.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: forest_admin_datasource_rpc
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.2
 platform: ruby
 authors:
 - Matthieu
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-10-02 00:00:00.000000000 Z
+date: 2025-10-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday