fix(rpc agent): allow connect as node rpc

packages/forest_admin_rpc_agent/lib/forest_admin_rpc_agent/routes/action_form.rb

@@ -12,7 +12,7 @@ def initialize
       end
 
       def handle_request(args)
-        return {} unless args[:params]['collection_name']
+        return [] unless args[:params]['collection_name']
 
         datasource = ForestAdminRpcAgent::Facades::Container.datasource
         collection = get_collection_safe(datasource, args[:params]['collection_name'])

packages/forest_admin_rpc_agent/lib/forest_admin_rpc_agent/routes/aggregate.rb

@@ -12,15 +12,15 @@ def initialize
       end
 
       def handle_request(args)
-        return {} unless args[:params]['collection_name']
+        return [] unless args[:params]['collection_name']
 
         datasource = ForestAdminRpcAgent::Facades::Container.datasource
         collection = get_collection_safe(datasource, args[:params]['collection_name'])
 
         aggregation = Aggregation.new(
           operation: args[:params]['aggregation']['operation'],
           field: args[:params]['aggregation']['field'],
-          groups: args[:params]['aggregation']['groups']
+          groups: args[:params]['aggregation']['groups'] || []
         )
         filter = FilterFactory.from_plain_object(args[:params]['filter'])
 

packages/forest_admin_rpc_agent/lib/forest_admin_rpc_agent/routes/base_route.rb

@@ -39,16 +39,16 @@ def register_rails(router)
 
           # Skip authentication for health check (root path)
           if @url == '/'
-            params = deep_symbolize_keys(request.query_parameters.merge(request.request_parameters))
-            result = handle_request({ params: params.with_indifferent_access, caller: nil, request: request })
+            params = extract_request_params(request)
+            result = handle_request({ params: params, caller: nil, request: request })
             build_rails_response(result)
           else
             auth_middleware = ForestAdminRpcAgent::Middleware::Authentication.new(->(_env) { [200, {}, ['OK']] })
             status, headers, response = auth_middleware.call(request.env)
 
             if status == 200
-              params = deep_symbolize_keys(request.query_parameters.merge(request.request_parameters))
-              result = handle_request({ params: params.with_indifferent_access, caller: headers[:caller], request: request })
+              params = extract_request_params(request)
+              result = handle_request({ params: params, caller: headers[:caller], request: request })
               build_rails_response(result)
             else
               [status, headers, response]
@@ -87,6 +87,16 @@ def get_collection_safe(datasource, collection_name)
 
       private
 
+      # Merge path params (e.g. :collection_name from the URL) with query and body params so
+      # consumers that don't duplicate `collection_name` in the body (the Node datasource-rpc)
+      # still resolve the route correctly.
+      def extract_request_params(request)
+        merged = request.path_parameters
+                        .merge(request.query_parameters)
+                        .merge(request.request_parameters)
+        deep_symbolize_keys(merged).with_indifferent_access
+      end
+
       def deep_symbolize_keys(obj)
         case obj
         when Hash

packages/forest_admin_rpc_agent/lib/forest_admin_rpc_agent/routes/create.rb

@@ -8,7 +8,7 @@ def initialize
       end
 
       def handle_request(args)
-        return {} unless args[:params]['collection_name']
+        return [] unless args[:params]['collection_name']
 
         datasource = ForestAdminRpcAgent::Facades::Container.datasource
         collection = get_collection_safe(datasource, args[:params]['collection_name'])

packages/forest_admin_rpc_agent/lib/forest_admin_rpc_agent/routes/list.rb

@@ -12,7 +12,7 @@ def initialize
       end
 
       def handle_request(args)
-        return {} unless args[:params]['collection_name']
+        return [] unless args[:params]['collection_name']
 
         datasource = ForestAdminRpcAgent::Facades::Container.datasource
         collection = get_collection_safe(datasource, args[:params]['collection_name'])

packages/forest_admin_rpc_agent/spec/lib/forest_admin_rpc_agent/routes/action_form_spec.rb

@@ -128,9 +128,9 @@ module Routes
         context 'when collection_name is missing' do
           let(:params) { {} }
 
-          it 'returns an empty hash' do
+          it 'returns an empty array' do
             response = route.handle_request(args)
-            expect(response).to eq({})
+            expect(response).to eq([])
           end
         end
       end

packages/forest_admin_rpc_agent/spec/lib/forest_admin_rpc_agent/routes/aggregate_spec.rb

@@ -113,9 +113,9 @@ module Routes
         end
 
         context 'when collection_name is missing' do
-          it 'returns an empty hash' do
+          it 'returns an empty array' do
             result = route.handle_request(params: {})
-            expect(result).to eq({})
+            expect(result).to eq([])
           end
         end
       end

packages/forest_admin_rpc_agent/spec/lib/forest_admin_rpc_agent/routes/create_spec.rb

@@ -93,9 +93,9 @@ module Routes
         end
 
         context 'when collection_name is missing' do
-          it 'returns an empty hash' do
+          it 'returns an empty array' do
             result = route.handle_request(params: {})
-            expect(result).to eq({})
+            expect(result).to eq([])
           end
         end
       end

packages/forest_admin_rpc_agent/spec/lib/forest_admin_rpc_agent/routes/list_spec.rb

@@ -77,9 +77,9 @@ module Routes
         end
 
         context 'when collection_name is missing' do
-          it 'returns an empty hash' do
+          it 'returns an empty array' do
             result = route.handle_request(params: {})
-            expect(result).to eq({})
+            expect(result).to eq([])
           end
         end
       end