Fix location in client setup (#29)

fixed #25

Author: ferhatelmas

lib/GetStream/StreamChat/Client.php

@@ -15,9 +15,6 @@
 
 class Client
 {
-
-    const API_ENDPOINT = 'chat-us-east-1.stream-io-api.com';
-
     /**
      * @var string
      */
@@ -65,7 +62,7 @@ class Client
      * @param string $location
      * @param float $timeout
      */
-    public function __construct($apiKey, $apiSecret, $apiVersion='v1.0', $location='', $timeout=3.0)
+    public function __construct($apiKey, $apiSecret, $apiVersion='v1.0', $location='us-east', $timeout=3.0)
     {
         $this->apiKey = $apiKey;
         $this->apiSecret = $apiSecret;
@@ -110,21 +107,14 @@ public function getBaseUrl()
             // try STREAM_BASE_URL for backwards compatibility
             $baseUrl = getenv('STREAM_BASE_URL');
         }
-        if (!$baseUrl) {
-            $apiEndpoint = static::API_ENDPOINT;
-            $localPort = getenv('STREAM_LOCAL_API_PORT');
-            if ($localPort) {
-                $baseUrl = "http://localhost:$localPort/api";
-            } else {
-                if ($this->location) {
-                    $subdomain = "{$this->location}-api";
-                } else {
-                    $subdomain = 'api';
-                }
-                $baseUrl = "{$this->protocol}://" . $apiEndpoint;
-            }
+        if ($baseUrl) {
+            return $baseUrl;
+        }
+        $localPort = getenv('STREAM_LOCAL_API_PORT');
+        if ($localPort) {
+            return "http://localhost:$localPort/api";
         }
-        return $baseUrl;
+        return "{$this->protocol}://chat-proxy-{$this->location}.stream-io-api.com";
     }
 
     /**

tests/integration/IntegrationTest.php

@@ -21,7 +21,7 @@ protected function setUp():void
             'v1.0',
             getenv('STREAM_REGION')
         );
-        $this->client->setLocation('qa');
+        $this->client->setLocation('us-east');
         $this->client->timeout = 10000;
     }
 
@@ -598,7 +598,7 @@ public function testGetMessage(){
     }
 
     public function testChannelSendAndDeleteFile(){
-        $url = "https://getstream.io/blog/static/stream_logo-d233917ae4f306fb8f43b56e65c7b18f.svg";
+        $url = "https://stream-blog-v2.imgix.net/blog/wp-content/uploads/1f4a0a19b7533494c5341170abbf655e/stream_logo.svg";
         $user = $this->getUser();
         $channel = $this->getChannel();
         $resp = $channel->sendFile($url, "logo.svg", $user);
@@ -607,7 +607,7 @@ public function testChannelSendAndDeleteFile(){
     }
 
     public function testChannelSendAndDeleteImage(){
-        $url = "https://getstream.io/blog/wp-content/themes/stream-theme-wordpress_2018-05-24_10-41/assets/images/stream_logo.png";
+        $url = "https://www.wikipedia.org/portal/wikipedia.org/assets/img/Wikipedia-logo-v2.png";
         $user = $this->getUser();
         $channel = $this->getChannel();
         $resp = $channel->sendImage($url, "logo.png", $user);

tests/unit/ClientTest.php

@@ -19,24 +19,24 @@ public function testClientSetProtocol()
         $client = new Client('key', 'secret');
         $client->setProtocol('asdfg');
         $url = $client->buildRequestUrl('x');
-        $this->assertSame('asdfg://chat-us-east-1.stream-io-api.com/x', $url);
+        $this->assertSame('asdfg://chat-proxy-us-east.stream-io-api.com/x', $url);
     }
 
     public function testClientHostnames()
     {
         $client = new Client('key', 'secret');
         $client->setLocation('qa');
         $url = $client->buildRequestUrl('x');
-        $this->assertSame('https://chat-us-east-1.stream-io-api.com/x', $url);
+        $this->assertSame('https://chat-proxy-qa.stream-io-api.com/x', $url);
 
         $client = new Client('key', 'secret', $api_version = '1234', $location = 'asdfg');
         $url = $client->buildRequestUrl('y');
-        $this->assertSame('https://chat-us-east-1.stream-io-api.com/y', $url);
+        $this->assertSame('https://chat-proxy-asdfg.stream-io-api.com/y', $url);
 
         $client = new Client('key', 'secret');
         $client->setLocation('us-east');
         $url = $client->buildRequestUrl('z');
-        $this->assertSame('https://chat-us-east-1.stream-io-api.com/z', $url);
+        $this->assertSame('https://chat-proxy-us-east.stream-io-api.com/z', $url);
     }
 
     public function testEnvironmentVariable()