wip

Author: StanBarrows

README.md

@@ -79,15 +79,6 @@ $token = $request->send()->dto();
 // Returns AuthenticationToken with sessionId
 ```
 
-### Logout
-
-```php
-use CodebarAg\MFiles\Requests\Authentication\LogOutFromVaultRequest;
-
-$logout = (new LogOutFromVaultRequest(config: $config))->send()->dto();
-// Returns true on successful logout, clears cached token
-```
-
 ## Requests
 
 ### Authentication Requests
@@ -133,25 +124,6 @@ $result = $request->send()->dto();
 // Returns true on successful logout
 ```
 
-### Vault Requests
-
-#### GetVaultsRequest
-
-Gets the list of available vaults for the authenticated user.
-
-**Request:**
-```php
-use CodebarAg\MFiles\Requests\GetVaultsRequest;
-
-$request = new GetVaultsRequest();
-```
-
-**Response:**
-```php
-$vaults = $connector->send($request)->json();
-// Returns array of available vaults
-```
-
 ### Object Requests
 
 #### GetObjectInformationRequest
@@ -273,28 +245,11 @@ $request = new DownloadFileRequest(
     objectId: 123,
     fileId: 456,
     objectTypeId: 0,
-    includeDeleted: false
 );
 ```
 
 ## DTOs
 
-### Authentication DTOs
-
-#### AuthenticationToken
-
-Represents an M-Files authentication token.
-
-**Properties:**
-- `sessionId` (string) - The session ID for the authenticated session
-
-**Usage:**
-```php
-use CodebarAg\MFiles\DTO\AuthenticationToken;
-
-$token = new AuthenticationToken(sessionId: 'abc123');
-```
-
 ### Configuration DTOs
 
 #### ConfigWithCredentials

src/Connectors/MFilesConnector.php

@@ -6,7 +6,6 @@
 
 use CodebarAg\MFiles\DTO\AuthenticationToken;
 use CodebarAg\MFiles\DTO\ConfigWithCredentials;
-use Saloon\Http\Auth\HeaderAuthenticator;
 use Saloon\Http\Connector;
 use Saloon\Traits\Plugins\AcceptsJson;
 
@@ -28,13 +27,14 @@ public function defaultHeaders(): array
         return [
             'Accept' => 'application/json',
             'Content-Type' => 'application/json',
+            'X-Requested-With' => $this->getToken(),
         ];
     }
 
-    protected function defaultAuth(): HeaderAuthenticator
+    public function getToken(): ?string
     {
-        $token = AuthenticationToken::getOrCreate($this->configuration);
+        $authToken = AuthenticationToken::getOrCreate($this->configuration);
 
-        return new HeaderAuthenticator($token->value, 'X-Authentication');
+        return $authToken->sessionId;
     }
 }

src/DTO/AuthenticationToken.php

@@ -5,41 +5,33 @@
 namespace CodebarAg\MFiles\DTO;
 
 use CodebarAg\MFiles\Helpers\CacheKeyManager;
-use CodebarAg\MFiles\Requests\LogInToVaultRequest;
-use Illuminate\Support\Str;
 
 class AuthenticationToken
 {
     public function __construct(
-        public string $value,
-        public ?string $sessionId = null,
+        public readonly string $sessionId
     ) {}
 
-    public function toArray(): array
+    public static function getOrCreate(ConfigWithCredentials $config): self
     {
-        return [
-            'Value' => $this->value,
-            'SessionID' => $this->sessionId,
-        ];
-    }
-
-    /**
-     * Get or create an authentication token with caching
-     */
-    public static function getOrCreate(
-        ConfigWithCredentials $config
-    ): AuthenticationToken {
-
         $cacheManager = new CacheKeyManager($config);
 
         return $cacheManager->rememberAuthToken(3600, function () use ($config) {
-            return new LogInToVaultRequest(
+            $request = new \CodebarAg\MFiles\Requests\LogInToVaultRequest(
                 url: $config->url,
                 vaultGuid: $config->vaultGuid,
                 username: $config->username,
                 password: $config->password,
-                sessionId: Str::uuid()->toString()
-            )->send()->dto();
+            );
+
+            $sessionId = $request->send()->dto();
+
+            return new self($sessionId);
         });
     }
+
+    public function __toString(): string
+    {
+        return $this->sessionId;
+    }
 }

src/Requests/GetVaultsRequest.php

@@ -4,7 +4,6 @@
 
 namespace CodebarAg\MFiles\Requests;
 
-use CodebarAg\MFiles\DTO\AuthenticationToken;
 use Illuminate\Support\Arr;
 use Saloon\Contracts\Body\HasBody;
 use Saloon\Enums\Method;
@@ -25,7 +24,6 @@ public function __construct(
         public string $vaultGuid,
         public string $username,
         public string $password,
-        public ?string $sessionId = null,
     ) {}
 
     public function resolveEndpoint(): string
@@ -44,28 +42,16 @@ protected function defaultHeaders(): array
     protected function defaultBody(): array
     {
         $body = [
-            'VaultGuid' => $this->vaultGuid,
             'Username' => $this->username,
             'Password' => $this->password,
-            'Expiration' => now()->addDay()->toIso8601String(),
-            'SessionID' => $this->sessionId,
+            'VaultGuid' => $this->vaultGuid,
         ];
 
         return $body;
     }
 
-    public function createDtoFromResponse(Response $response): AuthenticationToken
+    public function createDtoFromResponse(Response $response): ?string
     {
-        $responseData = $response->json();
-
-        $value = Arr::get($responseData, 'Value');
-        if (empty($value)) {
-            throw new \InvalidArgumentException('Authentication token value not found in response');
-        }
-
-        return new AuthenticationToken(
-            value: $value,
-            sessionId: $this->sessionId,
-        );
+        return Arr::get($response->json(), 'Value');
     }
 }

src/Requests/LogInToVaultRequest.php

@@ -11,8 +11,6 @@ final class CreateSingleFileDocumentResponse
 {
     public static function createDtoFromResponse(Response $response): Document
     {
-        $data = $response->json();
-
-        return Document::fromArray($data);
+        return Document::fromArray($response->json());
     }
 }

src/Requests/LogOutFromVaultRequest.php

@@ -11,8 +11,6 @@ final class GetObjectInformationResponse
 {
     public static function createDtoFromResponse(Response $response): ObjectProperties
     {
-        $data = $response->json();
-
-        return ObjectProperties::fromArray($data);
+        return ObjectProperties::fromArray($response->json());
     }
 }

src/Responses/CreateSingleFileDocumentResponse.php

@@ -2,13 +2,8 @@
 
 declare(strict_types=1);
 
-use CodebarAg\MFiles\Connectors\MFilesConnector;
-use CodebarAg\MFiles\DTO\AuthenticationToken;
 use CodebarAg\MFiles\DTO\ConfigWithCredentials;
-use CodebarAg\MFiles\Helpers\CacheKeyManager;
 use CodebarAg\MFiles\Requests\LogInToVaultRequest;
-use CodebarAg\MFiles\Requests\LogOutFromVaultRequest;
-use Illuminate\Support\Facades\Cache;
 use Saloon\Http\Faking\MockResponse;
 use Saloon\Laravel\Facades\Saloon;
 
@@ -19,11 +14,10 @@
     ]);
 
     $config = new ConfigWithCredentials(
-        url: 'https://test.m-files.com',
-        vaultGuid: 'test-vault-guid',
-        username: 'test-user',
-        password: 'test-password',
-        cacheDriver: 'array'
+        url: config('m-files.auth.url'),
+        vaultGuid: config('m-files.vault_guid'),
+        username: config('m-files.auth.username'),
+        password: config('m-files.auth.password')
     );
 
     expect($config)->toBeInstanceOf(ConfigWithCredentials::class);
@@ -35,50 +29,19 @@
     ]);
 
     $config = new ConfigWithCredentials(
-        url: 'https://test.m-files.com',
-        vaultGuid: 'test-vault-guid',
-        username: 'test-user',
-        password: 'test-password',
-        cacheDriver: 'array'
+        url: config('m-files.auth.url'),
+        vaultGuid: config('m-files.vault_guid'),
+        username: config('m-files.auth.username'),
+        password: config('m-files.auth.password')
     );
 
     $config2 = new ConfigWithCredentials(
-        url: 'https://test.m-files.com',
-        vaultGuid: 'test-vault-guid',
-        username: 'test-user',
-        password: 'test-password',
-        cacheDriver: 'array'
+        url: config('m-files.auth.url'),
+        vaultGuid: config('m-files.vault_guid'),
+        username: config('m-files.auth.username'),
+        password: config('m-files.auth.password')
     );
 
     expect($config)->toBeInstanceOf(ConfigWithCredentials::class);
     expect($config->toArray())->toBe($config2->toArray());
 });
-
-test('can logout session', function () {
-    $config = new ConfigWithCredentials(
-        url: 'https://test.m-files.com',
-        vaultGuid: 'test-vault-guid',
-        username: 'test-user',
-        password: 'test-password',
-        cacheDriver: 'array'
-    );
-
-    Saloon::fake([
-        LogInToVaultRequest::class => MockResponse::fixture('login-to-vault'),
-        LogOutFromVaultRequest::class => MockResponse::fixture('logout-from-vault'),
-    ]);
-
-    $cacheManager = new CacheKeyManager($config);
-    $cacheKey = $cacheManager->getAuthKey();
-
-    // First, create an authentication token
-    AuthenticationToken::getOrCreate($config);
-
-    expect(Cache::store($config->cacheDriver)->has($cacheKey))->toBeTrue();
-
-    $connector = new MFilesConnector($config);
-    $logout = $connector->send(new LogOutFromVaultRequest($config))->dto();
-
-    expect($logout)->toBeTrue();
-    expect(Cache::store($config->cacheDriver)->has($cacheKey))->toBeFalse();
-});