Merge branch 'release/1.2.5'

Author: ssfinney

README.md

@@ -130,7 +130,7 @@ Psy Shell v0.9.9 (PHP 7.3.11 — cli) by Justin Hileman
 => Spinen\ClickUp\Api\Client {#2363}
 ```
 
-The `$clickup` instance will work exaclty like all of the examples below, so if you are not using Laravel, then you can use the package once you bootstrap the client.
+The `$clickup` instance will work exactly like all of the examples below, so if you are not using Laravel, then you can use the package once you bootstrap the client.
 
 
 ## Authentication
@@ -139,7 +139,7 @@ ClickUp has 2 ways to authenticate when making API calls... 1) OAuth token or 2)
 
 ### OAuth
 
-There is a middleware named `clickup` that you can apply to any route that verifies that the user has a `clickup_token`, and if the user does not, then it redirects the user to ClickUp's OAuth page with the `client_id` where the user selectes the team(s) to link with your applciation.  Upon selecting the team(s), the user is rediected to `/clickup/sso/<user_id>?code=<OAuth Code>` where the system converts the `code` to a token & saves it to the user.  Upon saving the `clickup_token`, the user is redirected to the inital page that was proteted by the middleware.
+There is a middleware named `clickup` that you can apply to any route that verifies that the user has a `clickup_token`, and if the user does not, then it redirects the user to ClickUp's OAuth page with the `client_id` where the user selects the team(s) to link with your application.  Upon selecting the team(s), the user is redirected to `/clickup/sso/<user_id>?code=<OAuth Code>` where the system converts the `code` to a token & saves it to the user.  Upon saving the `clickup_token`, the user is redirected to the initial page that was protected by the middleware.
 
 > NOTE: You will need to have the `auth` middleware on the routes as the `User` is needed to see if there is a `clickup_token`.
 
@@ -159,7 +159,7 @@ Psy Shell v0.9.9 (PHP 7.3.11 — cli) by Justin Hileman
 
 ### Personal Token
 
-If you do not what to use the OAuth flow, then you can allow the user to provide you a personal token that you can save on the `User`.
+If you do not want to use the OAuth flow, then you can allow the user to provide you a personal token that you can save on the `User`.
 
 ```bash
 $ php artisan tinker

VERSION

@@ -1 +1 @@
-1.2.4
+1.2.5

src/Api/Client.php

@@ -219,7 +219,10 @@ public function request($path, $data = [], $method = 'GET'): ?array
      */
     public function setConfigs(array $configs): self
     {
-        $this->configs = $configs;
+        // Replace empty strings with nulls in config values
+        $this->configs = array_map(function($value) {
+            return $value === "" ? null : $value;
+        }, $configs);
 
         return $this;
     }
@@ -241,8 +244,9 @@ public function setToken($token): self
     /**
      * URL to ClickUp
      *
-     * If path is passed in, then append it to the end.  By default, it will use the url
-     * in the configs, but if an url is passed in as second parameter, then it is used.
+     * If path is passed in, then append it to the end. By default, it will use the url
+     * in the configs, but if a url is passed in as a second parameter then it is used.
+     * If no url is found it will use the hard-coded v2 ClickUp API URL.
      *
      * @param string|null $path
      * @param string|null $url
@@ -251,6 +255,8 @@ public function setToken($token): self
      */
     public function uri($path = null, $url = null): string
     {
-        return rtrim(($url ?: $this->configs['url']), '/') . (Str::startsWith($path, '?') ? null : '/') . ltrim($path, '/');
+        $url = $url ?? $this->configs['url'] ?? 'https://api.clickup.com/api/v2';
+
+        return rtrim($url, '/') . (Str::startsWith($path, '?') ? null : '/') . ltrim($path, '/');
     }
 }

tests/Api/ClientTest.php

@@ -81,7 +81,7 @@ public function it_can_be_constructed()
     /**
      * @test
      */
-    public function it_expects_the_first_argument_tobe_an_array()
+    public function it_expects_the_first_argument_to_be_an_array()
     {
         $this->expectException(TypeError::class);
 
@@ -91,7 +91,7 @@ public function it_expects_the_first_argument_tobe_an_array()
     /**
      * @test
      */
-    public function it_expects_the_second_argument_tobe_a_guzzle()
+    public function it_expects_the_second_argument_to_be_a_guzzle()
     {
         $this->expectException(TypeError::class);
 
@@ -150,6 +150,34 @@ public function it_allows_setting_the_configs()
         $this->assertInstanceOf(Client::class, $return);
     }
 
+    /**
+     * @test
+     */
+    public function it_sets_url_to_default_value_if_not_passed_in()
+    {
+        $this->client->setConfigs(
+            [
+                'url' => null,
+            ]
+        );
+
+        $this->assertEquals('https://api.clickup.com/api/v2/', $this->client->uri());
+    }
+
+    /**
+     * @test
+     */
+    public function it_sets_url_to_default_value_if_its_an_empty_string()
+    {
+        $this->client->setConfigs(
+            [
+                'url' => "",
+            ]
+        );
+
+        $this->assertEquals('https://api.clickup.com/api/v2/', $this->client->uri());
+    }
+
     /**
      * @test
      */
@@ -201,8 +229,8 @@ public function it_builds_correct_uri()
         $this->assertEquals('http://some/place/resource', $this->client->uri('/resource'), 'no double slash');
         $this->assertEquals('http://some/place/resource/', $this->client->uri('resource/'), 'leaves end slash');
         $this->assertEquals(
-            'http://some/place?paramater=value',
-            $this->client->uri('?paramater=value'),
+            'http://some/place?parameter=value',
+            $this->client->uri('?parameter=value'),
             'query string'
         );
         $this->assertEquals(