Merge pull request #168 from cameron4music/misc/get-host-by-client

refactored REST gateway base_url action method

Author: tomwalder

src/GDS/Gateway/RESTv1.php

@@ -24,9 +24,14 @@ class RESTv1 extends \GDS\Gateway
     const MODE_UNSPECIFIED = 'UNSPECIFIED';
 
     /**
-     * REST API Base Endpoint
+     * Client config keys.
      */
-    private $base_url = 'https://datastore.googleapis.com';
+    const CONFIG_CLIENT_BASE_URL = 'base_url';
+
+    /**
+     * Default Base URL to use.
+     */
+    const DEFAULT_BASE_URL = 'https://datastore.googleapis.com';
 
     /**
      * @var ClientInterface
@@ -92,14 +97,16 @@ protected function initHttpClient()
         $obj_stack = HandlerStack::create();
         $obj_stack->push(ApplicationDefaultCredentials::getMiddleware(['https://www.googleapis.com/auth/datastore']));
 
+        $str_base_url = self::DEFAULT_BASE_URL;
+
         if (getenv("DATASTORE_EMULATOR_HOST") !== FALSE) {
-            $this->base_url = getenv("DATASTORE_EMULATOR_HOST");
+            $str_base_url = getenv("DATASTORE_EMULATOR_HOST");
         }
 
         // Create the HTTP client
         return new Client([
             'handler' => $obj_stack,
-            'base_url' => $this->base_url,
+            'base_url' => $str_base_url,
             'auth' => 'google_auth'  // authorize all requests
         ]);
     }
@@ -474,6 +481,22 @@ public function beginTransaction($bol_cross_group = FALSE)
         return null;
     }
 
+    /**
+     * Get the base url from the client object.
+     *
+     * Note: If for some reason the client's base URL is not set then we will return the default endpoint.
+     *
+     * @return string
+     */
+    protected function getBaseUrl() {
+        $str_base_url = $this->obj_http_client->getConfig(self::CONFIG_CLIENT_BASE_URL);
+        if (!empty($str_base_url)) {
+            return $str_base_url;
+        }
+
+        return self::DEFAULT_BASE_URL;
+    }
+
     /**
      * Build a URL for a Datastore action
      *
@@ -482,7 +505,7 @@ public function beginTransaction($bol_cross_group = FALSE)
      */
     private function actionUrl($str_action)
     {
-        return $this->base_url . '/v1/projects/' . $this->str_dataset_id . ':' . $str_action;
+        return $this->getBaseUrl() . '/v1/projects/' . $this->str_dataset_id . ':' . $str_action;
     }
 
 }

src/GDS/Mapper/RESTv1.php

@@ -99,6 +99,11 @@ protected function extractDatetimeValue($obj_property)
     protected function extractStringListValue($obj_property)
     {
         $arr_values = [];
+
+        if (!isset($obj_property->arrayValue->values)) {
+            return $arr_values;
+        }
+
         foreach((array)$obj_property->arrayValue->values as $obj_value) {
             if(isset($obj_value->stringValue)) {
                 $arr_values[] = $obj_value->stringValue;