fix base URI concatenation so path isn't lost (#96)

* fix base URI concatenation so path isn't lost

* also fix base URIs for events

Author: eli-darkly

src/LaunchDarkly/Impl/Integrations/CurlEventPublisher.php

@@ -41,10 +41,12 @@ public function __construct(string $sdkKey, array $options = [])
     {
         $this->_sdkKey = $sdkKey;
 
-        $eventsUri = LDClient::DEFAULT_EVENTS_URI;
-        if (isset($options['events_uri'])) {
-            $eventsUri = $options['events_uri'];
+        $baseUri = $options['events_uri'] ?? null;
+        if (!$baseUri) {
+            $baseUri = LDClient::DEFAULT_EVENTS_URI;
         }
+        $eventsUri = \LaunchDarkly\Impl\Util::adjustBaseUri($baseUri);
+
         $url = parse_url(rtrim($eventsUri, '/'));
         $this->_host = $url['host'] ?? '';
         $this->_ssl = ($url['scheme'] ?? '') === 'https';

src/LaunchDarkly/Impl/Integrations/GuzzleEventPublisher.php

@@ -28,11 +28,13 @@ public function __construct(string $sdkKey, array $options = [])
     {
         $this->_sdkKey = $sdkKey;
         $this->_logger = $options['logger'];
-        if (isset($options['events_uri'])) {
-            $this->_eventsUri = $options['events_uri'];
-        } else {
-            $this->_eventsUri = LDClient::DEFAULT_EVENTS_URI;
+
+        $baseUri = $options['events_uri'] ?? null;
+        if (!$baseUri) {
+            $baseUri = LDClient::DEFAULT_EVENTS_URI;
         }
+        $this->_eventsUri = \LaunchDarkly\Impl\Util::adjustBaseUri($baseUri);
+
         $this->_requestOptions = [
             'headers' => [
                 'Content-Type'  => 'application/json',
@@ -53,7 +55,7 @@ public function publish(string $payload): bool
         try {
             $options = $this->_requestOptions;
             $options['body'] = $payload;
-            $response = $client->request('POST', '/bulk', $options);
+            $response = $client->request('POST', 'bulk', $options);
         } catch (\Exception $e) {
             $this->_logger->warning("GuzzleEventPublisher::publish caught $e");
             return false;

src/LaunchDarkly/Impl/Integrations/GuzzleFeatureRequester.php

@@ -21,8 +21,8 @@
  */
 class GuzzleFeatureRequester implements FeatureRequester
 {
-    const SDK_FLAGS = "/sdk/flags";
-    const SDK_SEGMENTS = "/sdk/segments";
+    const SDK_FLAGS = "sdk/flags";
+    const SDK_SEGMENTS = "sdk/segments";
     /** @var Client  */
     private $_client;
     /** @var LoggerInterface */
@@ -32,6 +32,8 @@ class GuzzleFeatureRequester implements FeatureRequester
 
     public function __construct(string $baseUri, string $sdkKey, array $options)
     {
+        $baseUri = \LaunchDarkly\Impl\Util::adjustBaseUri($baseUri);
+
         $this->_logger = $options['logger'];
         $stack = HandlerStack::create();
         if (class_exists('\Kevinrob\GuzzleCache\CacheMiddleware')) {

src/LaunchDarkly/Impl/Util.php

@@ -13,6 +13,14 @@
  */
 class Util
 {
+    public static function adjustBaseUri(string $uri): string
+    {
+        if (substr($uri, strlen($uri) - 1, 1) == '/') {
+            return $uri;
+        }
+        return $uri . '/';  // ensures that subpaths are concatenated correctly
+    }
+
     public static function dateTimeToUnixMillis(DateTime $dateTime): int
     {
         $timeStampSeconds = (int)$dateTime->getTimestamp();