Fix getToken call

Author: lennartdohmann

php/src/vaas/Authentication/AuthenticatorInterface.php

@@ -3,8 +3,9 @@
 namespace VaasSdk\Authentication;
 
 use Amp\Cancellation;
+use Amp\Future;
 
 interface AuthenticatorInterface
 {
-    public function getToken(?Cancellation $cancellation = null): string;
+    public function getTokenAsync(?Cancellation $cancellation = null): Future;
 }

php/src/vaas/Authentication/ClientCredentialsGrantAuthenticator.php

@@ -2,7 +2,6 @@
 
 namespace VaasSdk\Authentication;
 
-use Amp\Cancellation;
 use Amp\Http\Client\HttpClient;
 
 class ClientCredentialsGrantAuthenticator extends TokenReceiver implements AuthenticatorInterface
@@ -24,18 +23,6 @@ public function __construct(string $clientId, string $clientSecret, ?string $tok
         $this->clientSecret = $clientSecret;
     }
 
-    /**
-     * Gets the access token asynchronously.
-     * If the token is still valid, it will be returned immediately.
-     * If the token is expired, a new token will be requested.
-     * @param Cancellation|null $cancellation Cancellation token
-     * @return string The access token string
-     */
-    public function getToken(Cancellation $cancellation = null): string
-    {
-        return parent::getTokenAsync($cancellation)->await($cancellation);
-    }
-
     protected function tokenRequestToForm(): string
     {
         return http_build_query([

php/src/vaas/Authentication/ResourceOwnerPasswordGrantAuthenticator.php

@@ -2,7 +2,6 @@
 
 namespace VaasSdk\Authentication;
 
-use Amp\Cancellation;
 use Amp\Http\Client\HttpClient;
 
 class ResourceOwnerPasswordGrantAuthenticator extends TokenReceiver implements AuthenticatorInterface
@@ -28,18 +27,6 @@ public function __construct(string $clientId, string $userName, string $password
         $this->password = $password;
     }
 
-    /**
-     * Gets the access token asynchronously.
-     * If the token is still valid, it will be returned immediately.
-     * If the token is expired, a new token will be requested.
-     * @param Cancellation|null $cancellation Cancellation token
-     * @return string The access token string
-     */
-    public function getToken(Cancellation $cancellation = null): string
-    {
-        return parent::getTokenAsync($cancellation)->await($cancellation);
-    }
-
     protected function tokenRequestToForm(): string
     {
         return http_build_query([

php/src/vaas/Options/VaasOptions.php

@@ -14,7 +14,7 @@ class VaasOptions
     public function __construct(
         public bool  $useHashLookup = true,
         public bool  $useCache = true,
-        public string $vaasUrl = 'https://gateway.production.vaas.gdatasecurity.de/',
+        public string $vaasUrl = 'https://gateway.production.vaas.gdatasecurity.de',
         public int    $timeout = 300
     ) {}
 }

php/src/vaas/Vaas.php

@@ -324,7 +324,7 @@ private function addRequestHeadersAsync(Request $request, ?string $requestId = '
     {
         return async(function () use ($request, $requestId) {
             $this->logger->debug("Add request headers");
-            $request->setHeader('Authorization', 'Bearer ' . $this->authenticator->getToken());
+            $request->setHeader('Authorization', 'Bearer ' . $this->authenticator->getTokenAsync()->await());
             $this->logger->debug("Successfully added authorization header with bearer token");
             $request->setHeader('User-Agent', sprintf('%s/%s', self::PRODUCT_NAME, self::PRODUCT_VERSION));
             if (!empty($requestId)) {

php/tests/VaasTesting/AuthenticatorTest.php

@@ -56,7 +56,7 @@ public function testClientCredentialsGrantAuthenticator_withInvalidCredentials_T
             clientSecret: "invalid"
         );
 
-        $authenticator->getToken();
+        $authenticator->getTokenAsync()->await();
     }
 
     public function testResourceOwnerPasswordGrantAuthenticator_withInvalidCredentials_ThrowsAccessDeniedException(): void
@@ -68,7 +68,7 @@ public function testResourceOwnerPasswordGrantAuthenticator_withInvalidCredentia
             password: "invalid"
         );
 
-        $authenticator->getToken();
+        $authenticator->getTokenAsync()->await();
     }
 
     public function testClientCredentialsGrantAuthenticator_withValidCredentials_ReturnsToken(): void
@@ -79,7 +79,7 @@ public function testClientCredentialsGrantAuthenticator_withValidCredentials_Ret
             tokenUrl: $_ENV["TOKEN_URL"]
         );
 
-        $token = $authenticator->getToken();
+        $token = $authenticator->getTokenAsync()->await();
 
         $this->assertNotNull($token);
     }
@@ -93,7 +93,7 @@ public function testResourceOwnerPasswordGrantAuthenticator_withValidCredentials
             tokenUrl: $_ENV["TOKEN_URL"]
         );
 
-        $token = $authenticator->getToken();
+        $token = $authenticator->getTokenAsync()->await();
 
         $this->assertNotNull($token);
     }