Refactored CallApiAction

Renamed CallApiAction to CallApi. Modified constructor which take baseUrl, OAuthUrl, Client id & key and cache key. Removed checking configuration and throw WrongConfigException. Updated calls for GetToken

Author: Mateusz Gostański

src/CallApiAction.php src/CallApi.phpsrc/CallApiAction.php renamed to src/CallApi.php

@@ -4,46 +4,40 @@
 
 use Grixu\ApiClient\Exceptions\AccessDeniedException;
 use Grixu\ApiClient\Exceptions\ApiCallException;
-use Grixu\ApiClient\Exceptions\WrongConfigException;
 use Illuminate\Support\Facades\Http;
 
-class CallApiAction
+class CallApi
 {
-    private GetTokenAction $getToken;
+    protected GetToken $getToken;
+    protected string $baseUrl;
 
-    public function __construct()
+    public function __construct(string $baseUrl, string $oAuthUrl, string $clientId, string $clientKey, string $cacheKey)
     {
-        $this->getToken = new GetTokenAction();
+        $this->baseUrl = $baseUrl;
+        $this->getToken = new GetToken($oAuthUrl, $clientId, $clientKey, $cacheKey);
     }
 
-    public function execute(string $url)
+    public function call(string $url): array
     {
-        if (empty(config('api-client.base_url'))
-            || empty(config('api-client.client_key'))
-            || empty(config('api-client.client_id'))) {
-            throw new WrongConfigException();
-        }
-
-        $token = $this->getToken->execute();
+        $token = $this->getToken->get();
 
         $client = Http::withToken($token)
             ->withHeaders(
                 [
                     'Accept' => 'application/json'
                 ]
             )
-            ->get(config('api-client.base_url').$url);
+            ->get($this->baseUrl.$url);
 
         if ($client->successful()) {
             return $client->json();
         }
 
         if ($client->failed()) {
             if ($client->status() === 401) {
-                $resetTokenAction = new ResetTokenAction();
-                $resetTokenAction->execute();
+                $this->getToken->reset();
                 // Token refreshed, then try again
-                return $this->execute($url);
+                return $this->call($url);
             }
 
             if ($client->status() == 403) {

tests/CallApiActionTest.php tests/CallApiTest.phptests/CallApiActionTest.php renamed to tests/CallApiTest.php

@@ -2,38 +2,38 @@
 
 namespace Grixu\ApiClient\Tests;
 
-use Grixu\ApiClient\CallApiAction;
+use Grixu\ApiClient\CallApi;
 use Grixu\ApiClient\Exceptions\AccessDeniedException;
 use Grixu\ApiClient\Exceptions\ApiCallException;
 use Grixu\ApiClient\Exceptions\TokenIssueException;
-use Grixu\ApiClient\Exceptions\WrongConfigException;
 use Grixu\ApiClient\ApiClientServiceProvider;
 use Illuminate\Support\Facades\Http;
 use Orchestra\Testbench\TestCase;
 
-class CallApiActionTest extends TestCase
+class CallApiTest extends TestCase
 {
-    private CallApiAction $action;
+    private CallApi $action;
     private string $url;
 
     protected function setUp(): void
     {
         parent::setUp();
 
-        $this->action = new CallApiAction();
-        $this->url = config('api-client.base_url');
+        $this->action = new CallApi(
+            env('TEST_BASE_URL'),
+            env('TEST_OAUTH'),
+            env('TEST_CLIENT_ID'),
+            env('TEST_CLIENT_KEY'),
+            'test'
+        );
+        $this->url = env('TEST_BASE_URL');
     }
 
     protected function getPackageProviders($app)
     {
         return [ApiClientServiceProvider::class];
     }
 
-    protected function useClearConfig($app)
-    {
-        $app->config->set('api-client.base_url', '');
-    }
-
     /** @test */
     public function normal_pass()
     {
@@ -56,7 +56,7 @@ public function normal_pass()
             ]
         );
 
-        $result = $this->action->execute($this->url);
+        $result = $this->action->call($this->url);
 
         $this->assertNotEmpty($result);
     }
@@ -71,7 +71,7 @@ public function with_http_error()
         );
 
         try {
-            $this->action->execute($this->url);
+            $this->action->call($this->url);
         } catch (ApiCallException $e) {
             $this->assertTrue(true);
         } catch (TokenIssueException $e) {
@@ -103,8 +103,7 @@ public function with_token_revalidation()
         );
 
         try {
-            $result = $this->action->execute($this->url);
-
+            $result = $this->action->call($this->url);
             $this->assertIsArray($result);
             $this->assertArrayHasKey('data', $result);
         } catch (TokenIssueException $e) {
@@ -114,24 +113,6 @@ public function with_token_revalidation()
         }
     }
 
-    /**
-     * @test
-     * @environment-setup useClearConfig
-     */
-    public function with_no_config()
-    {
-        try {
-            $this->action->execute($this->url);
-            $this->assertTrue(false);
-        } catch (ApiCallException $e) {
-            $this->assertTrue(false);
-        } catch (TokenIssueException $e) {
-            $this->assertTrue(false);
-        } catch (WrongConfigException $e) {
-            $this->assertTrue(true);
-        }
-    }
-
     /** @test */
     public function with_access_denied()
     {
@@ -142,7 +123,7 @@ public function with_access_denied()
         );
 
         try {
-            $this->action->execute($this->url);
+            $this->action->call($this->url);
         } catch (ApiCallException $e) {
             $this->assertTrue(false);
         } catch (TokenIssueException $e) {