wip

Author: StanBarrows

src/Connectors/MFilesConnector.php

@@ -4,8 +4,9 @@
 
 namespace CodebarAg\MFiles\Connectors;
 
-use CodebarAg\MFiles\DTO\AuthenticationToken;
 use CodebarAg\MFiles\DTO\ConfigWithCredentials;
+use CodebarAg\MFiles\Helpers\CacheKeyManager;
+use CodebarAg\MFiles\Requests\LogInToVaultRequest;
 use Saloon\Http\Connector;
 use Saloon\Traits\Plugins\AcceptsJson;
 
@@ -33,8 +34,18 @@ public function defaultHeaders(): array
 
     public function getToken(): ?string
     {
-        $authToken = AuthenticationToken::getOrCreate($this->configuration);
-
-        return $authToken->sessionId;
+        $cacheManager = new CacheKeyManager($this->configuration);
+
+        return $cacheManager->rememberAuthToken(3600, function () {
+            $request = new LogInToVaultRequest(
+                url: $this->configuration->url,
+                vaultGuid: $this->configuration->vaultGuid,
+                username: $this->configuration->username,
+                password: $this->configuration->password,
+            );
+            $response = $request->send();
+
+            return $response->dto();
+        });
     }
 }

src/DTO/AuthenticationToken.php

@@ -13,7 +13,6 @@ public function __construct(
         public string $vaultGuid,
         public string $username,
         public string $password,
-        public ?string $sessionId = null,
         public ?string $cacheDriver = null
     ) {}
 
@@ -24,7 +23,6 @@ public static function fromArray(array $data): self
             vaultGuid: Arr::get($data, 'vaultGuid'),
             username: Arr::get($data, 'username'),
             password: Arr::get($data, 'password'),
-            sessionId: Arr::get($data, 'sessionId'),
             cacheDriver: Arr::get($data, 'cacheDriver', config('m-files.cache_driver')),
         );
     }
@@ -36,7 +34,6 @@ public function toArray(): array
             'vaultGuid' => $this->vaultGuid,
             'username' => $this->username,
             'password' => $this->password,
-            'sessionId' => $this->sessionId,
             'cacheDriver' => $this->cacheDriver,
         ];
     }

src/DTO/ConfigWithCredentials.php

@@ -41,13 +41,11 @@ protected function defaultHeaders(): array
 
     protected function defaultBody(): array
     {
-        $body = [
+        return [
             'Username' => $this->username,
             'Password' => $this->password,
             'VaultGuid' => $this->vaultGuid,
         ];
-
-        return $body;
     }
 
     public function createDtoFromResponse(Response $response): ?string

src/Requests/LogInToVaultRequest.php

@@ -2,7 +2,6 @@
 
 declare(strict_types=1);
 
-use CodebarAg\MFiles\DTO\ConfigWithCredentials;
 use CodebarAg\MFiles\Requests\LogInToVaultRequest;
 use Saloon\Http\Faking\MockResponse;
 use Saloon\Laravel\Facades\Saloon;
@@ -13,13 +12,6 @@
         LogInToVaultRequest::class => MockResponse::fixture('login-to-vault'),
     ]);
 
-    $config = new ConfigWithCredentials(
-        url: config('m-files.auth.url'),
-        vaultGuid: config('m-files.vault_guid'),
-        username: config('m-files.auth.username'),
-        password: config('m-files.auth.password'),
-    );
-
     $request = new LogInToVaultRequest(
         url: config('m-files.auth.url'),
         vaultGuid: config('m-files.vault_guid'),