WIP

Author: RhysLees

src/Connectors/DocuWareConnector.php

@@ -53,8 +53,9 @@ protected function defaultAuth(): TokenAuthenticator
 
     /**
      * @throws InvalidArgumentException
+     * @throws \Exception
      */
-    protected function getOrCreateNewOAuthToken()
+    protected function getOrCreateNewOAuthToken(): string
     {
         $cache = Cache::store($this->configuration->cacheDriver);
 

src/DTO/Config/ConfigWithCredentials.php

@@ -2,6 +2,7 @@
 
 namespace CodebarAg\DocuWare\DTO\Config;
 
+use Illuminate\Support\Facades\Crypt;
 use Illuminate\Support\Facades\Hash;
 
 final class ConfigWithCredentials
@@ -36,7 +37,6 @@ public function __construct(
         ?int $requestTimeoutInSeconds = null,
         ?string $clientId = null,
         ?string $scope = null,
-        ?string $identifier = null,
     ) {
         $this->username = $username;
         $this->password = $password;
@@ -55,6 +55,6 @@ public function __construct(
 
         $this->scope = filled($scope) ? $scope : config('laravel-docuware.configurations.scope');
 
-        $this->identifier = filled($identifier) ? $identifier : Hash::make($this->url.'.'.$this->username.'.'.$this->clientId);
+        $this->identifier = Hash::make($this->url.'.'.$this->username.'.'.Crypt::encrypt($this->password));
     }
 }

src/DTO/Config/ConfigWithCredentialsTrustedUser.php

@@ -2,6 +2,7 @@
 
 namespace CodebarAg\DocuWare\DTO\Config;
 
+use Illuminate\Support\Facades\Crypt;
 use Illuminate\Support\Facades\Hash;
 
 final class ConfigWithCredentialsTrustedUser
@@ -39,7 +40,6 @@ public function __construct(
         ?int $requestTimeoutInSeconds = null,
         ?string $clientId = null,
         ?string $scope = null,
-        ?string $identifier = null,
     ) {
         $this->username = $username;
         $this->password = $password;
@@ -59,6 +59,6 @@ public function __construct(
 
         $this->scope = filled($scope) ? $scope : config('laravel-docuware.configurations.scope');
 
-        $this->identifier = filled($identifier) ? $identifier : Hash::make($this->url.'.'.$this->username.'.'.$this->clientId);
+        $this->identifier = Hash::make($this->url.'.'.$this->username.'.'.Crypt::encrypt($this->password));
     }
 }