Merge pull request #902 from UN-OCHA/berliner/HPC-9390

HPC-9390: Fix issue with endpoint query arguments not being properly initialized, leading to invalid API requests in some situations

Author: berliner

html/modules/custom/ghi_plans/src/Helpers/PlanEntityHelper.php

@@ -90,7 +90,7 @@ public static function getPlanEntityObjects($plan_data) {
    */
   public static function getPlanEntity($entity_id, $version_argument = 'current') {
     /** @var \Drupal\hpc_api\Query\EndpointQuery $query */
-    $query = \Drupal::service('hpc_api.endpoint_query');
+    $query = clone \Drupal::service('hpc_api.endpoint_query');
     $query->setArguments([
       'endpoint' => 'planEntity/' . $entity_id,
       'api_version' => 'v2',

html/modules/custom/ghi_plans/src/Plugin/EndpointQuery/PlanProjectFundingQuery.php

@@ -14,8 +14,12 @@
  *   id = "plan_project_funding_query",
  *   label = @Translation("Plan funding summary query"),
  *   endpoint = {
- *     "public" = "fts/project/plan?planid={plan_id}&groupBy=project",
- *     "version" = "v1"
+ *     "public" = "fts/project/plan",
+ *     "version" = "v1",
+ *     "query" = {
+ *       "planid" = "{plan_id}",
+ *       "groupBy" = "project"
+ *     }
  *   }
  * )
  */

html/modules/custom/hpc_api/src/Query/EndpointQueryBase.php

@@ -72,17 +72,19 @@ public function __construct(array $configuration, $plugin_id, $plugin_definition
     $endpoint_query_args = $plugin_definition['endpoint']['query'] ?? [];
 
     $this->isAutenticatedEndpoint = $endpoint_authenticated && $this->user->isAuthenticated() && $this->getHidAccessToken();
+    $endpoint_url = $this->isAutenticatedEndpoint ? $endpoint_authenticated : $endpoint_public;
+    $auth_method = EndpointQuery::AUTH_METHOD_BASIC;
     if ($endpoint_api_key) {
-      $this->endpointQuery->setAuthMethod(EndpointQuery::AUTH_METHOD_API_KEY);
-      $this->endpointQuery->setEndpoint($endpoint_api_key);
-    }
-    else {
-      $this->endpointQuery->setAuthMethod(EndpointQuery::AUTH_METHOD_BASIC);
-      $this->endpointQuery->setEndpoint($this->isAutenticatedEndpoint ? $endpoint_authenticated : $endpoint_public);
+      $auth_method = EndpointQuery::AUTH_METHOD_API_KEY;
+      $endpoint_url = $endpoint_api_key;
     }
 
-    $this->endpointQuery->setEndpointVersion($endpoint_version);
-    $this->endpointQuery->setEndpointArguments($endpoint_query_args);
+    $this->endpointQuery->setArguments([
+      'api_version' => $endpoint_version,
+      'endpoint' => $endpoint_url,
+      'query_args' => $endpoint_query_args,
+      'auth_method' => $auth_method,
+    ]);
   }
 
   /**