WIP

RhysLees · RhysLees · commit 9cbc47fcff90 · 2024-09-12T12:54:39.000+01:00
diff --git a/src/Connectors/DocuWareConnector.php b/src/Connectors/DocuWareConnector.php
@@ -85,9 +85,6 @@ protected function getOrCreateNewOAuthToken()
 
             return $token->accessToken;
         }
-
-        // If configuration type is unsupported, throw an exception
-        throw new \Exception('Unsupported configuration type');
     }
 
     protected function getAuthenticationTokenEndpoint(): IdentityServiceConfiguration
diff --git a/src/DocuWareUrl.php b/src/DocuWareUrl.php
@@ -84,7 +84,7 @@ public function make(): string
         }
 
         // Source: https://support.docuware.com/en-US/forums/help-with-technical-problems/ea9618df-c491-e911-80e7-0003ff59a7c6
-        $key = utf8_encode($this->passphrase);
+        $key = mb_convert_encoding($this->passphrase, 'UTF-8', 'ISO-8859-1');
         $passphrase = hash('sha512', $key, true);
         $encryption_key = substr($passphrase, 0, 32);
         $iv = substr($passphrase, 32, 16);

Original file line number	Diff line number	Diff line change
`@@ -85,9 +85,6 @@ protected function getOrCreateNewOAuthToken()`
`85`	`85`
`86`	`86`	`return $token->accessToken;`
`87`	`87`	`}`
`88`		`-`
`89`		`- // If configuration type is unsupported, throw an exception`
`90`		`- throw new \Exception('Unsupported configuration type');`
`91`	`88`	`}`
`92`	`89`
`93`	`90`	`protected function getAuthenticationTokenEndpoint(): IdentityServiceConfiguration`
Original file line number	Diff line number	Diff line change
`@@ -84,7 +84,7 @@ public function make(): string`
`84`	`84`	`}`
`85`	`85`
`86`	`86`	`// Source: https://support.docuware.com/en-US/forums/help-with-technical-problems/ea9618df-c491-e911-80e7-0003ff59a7c6`
`87`		`- $key = utf8_encode($this->passphrase);`
	`87`	`+ $key = mb_convert_encoding($this->passphrase, 'UTF-8', 'ISO-8859-1');`
`88`	`88`	`$passphrase = hash('sha512', $key, true);`
`89`	`89`	`$encryption_key = substr($passphrase, 0, 32);`
`90`	`90`	`$iv = substr($passphrase, 32, 16);`