Use Promises generic types

CHANGELOG.md

@@ -8,10 +8,19 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ## [Unreleased]
 
 ### Added
-- Adds CHANGELOG.
+
+
+### Changed
+
+## [0.9.0] - 2023-10-30
+
+### Added
+- Adds CHANGELOG. [#54](https://github.com/microsoft/kiota-authentication-phpleague-php/pull/54)
+- Adds Generics to Promise return types. [#59](https://github.com/microsoft/kiota-authentication-phpleague-php/pull/59)
 
 ### Changed
 - Allow `http` scheme for localhost urls. [#56](https://github.com/microsoft/kiota-authentication-phpleague-php/pull/56)
+- Disable PHP-HTTP discovery plugin. [#58](https://github.com/microsoft/kiota-authentication-phpleague-php/pull/58)
 
 ## [0.8.3] - 2023-10-05
 

composer.json

@@ -13,7 +13,7 @@
         "php": "^7.4 | ^8.0",
         "league/oauth2-client": "^2.6.1",
         "php-http/promise": "^1.1.0",
-        "microsoft/kiota-abstractions": "^0.7.0 || ^0.8.0",
+        "microsoft/kiota-abstractions": "^0.9.0",
         "firebase/php-jwt": "^v6.0.0",
         "ramsey/uuid": "^4.2.3",
         "ext-openssl": "*",
@@ -32,5 +32,10 @@
         "psr-4": {
             "Microsoft\\Kiota\\Authentication\\Test\\": "tests/"
         }
+    },
+    "config": {
+        "allow-plugins": {
+            "php-http/discovery": false
+        }
     }
 }

src/Constants.php

@@ -4,5 +4,5 @@
 
 class Constants
 {
-    public const VERSION = "0.8.3";
+    public const VERSION = "0.9.0";
 }

src/Oauth/CAEConfigurationTrait.php

@@ -14,7 +14,7 @@ trait CAEConfigurationTrait
 {
     /**
      * Should return Promise that resolves with a new TokenRequestContext object to be used for a new token request
-     * @var null|callable(string $claims): Promise
+     * @var null|callable(string $claims): Promise<TokenRequestContext>
      */
     private $caeRedirectCallback = null;
 
@@ -43,7 +43,7 @@ public function isCAEEnabled(): bool
      * when this lib is unable to refresh the token using CAE claims.
      * If this callback returns a Promise that resolves to a new token request context with the new authentication
      * code/assertion then a new token is requested.
-     * @return null|callable(string $claims): Promise
+     * @return null|callable(string $claims): Promise<TokenRequestContext>
      */
     public function getCAERedirectCallback(): ?callable
     {
@@ -59,7 +59,7 @@ public function setCAEEnabled(bool $caeEnabled): void
     }
 
     /**
-     * @param null|callable(string $claims): Promise $callback
+     * @param null|callable(string $claims): Promise<TokenRequestContext> $callback
      */
     public function setCAERedirectCallback(?callable $callback = null): void
     {

src/Oauth/TokenRequestContext.php

@@ -78,7 +78,7 @@ public function isCAEEnabled(): bool;
      * If this callback returns a Promise that resolves to a new token request context with the new authentication
      * code/assertion then a new token is requested.
      *
-     * @return null|callable(string $claims): Promise
+     * @return null|callable(string $claims): Promise<TokenRequestContext>
      */
     public function getCAERedirectCallback(): ?callable;
 }

src/PhpLeagueAccessTokenProvider.php

@@ -13,6 +13,7 @@
 use Http\Promise\FulfilledPromise;
 use Http\Promise\Promise;
 use Http\Promise\RejectedPromise;
+use InvalidArgumentException;
 use League\OAuth2\Client\Provider\AbstractProvider;
 use League\OAuth2\Client\Provider\Exception\IdentityProviderException;
 use League\OAuth2\Client\Token\AccessToken;
@@ -112,24 +113,27 @@ public function __construct(
      */
     public function getAuthorizationTokenAsync(string $url, array $additionalAuthenticationContext = []): Promise
     {
-        $span = $this->tracer->spanBuilder('getAuthorizationTokenAsync')
-            ->startSpan();
+        $span = $this->tracer->spanBuilder('getAuthorizationTokenAsync')->startSpan();
         $scope = $span->activate();
         $parsedUrl = parse_url($url);
         $scheme = $parsedUrl["scheme"] ?? null;
         $host = $parsedUrl["host"] ?? '';
         try {
+            if (!$this->getAllowedHostsValidator()->isUrlHostValid($url)) {
+                $span->setAttribute(self::URL_VALID_KEY, false);
+                return new FulfilledPromise(null);
+            }
+
             $isLocalhost = $this->isLocalHostUrl($host);
 
-            if (($scheme !== 'https' || !$this->getAllowedHostsValidator()->isUrlHostValid($url))
-                && !$isLocalhost) {
+            if ($scheme !== 'https' && !$isLocalhost) {
                 $span->setAttribute(self::URL_VALID_KEY, false);
-                return new FulfilledPromise(null);
+                throw new InvalidArgumentException("Invalid URL. External URLs MUST use HTTPS and localhost URLs MAY use HTTP.");
             }
             $span->setAttribute(self::URL_VALID_KEY, true);
             $this->scopes = $this->scopes ?: ["{$scheme}://{$host}/.default"];
             $span->setAttribute(self::SCOPES_KEY, implode(',', $this->scopes));
-            $params       = array_merge($this->tokenRequestContext->getParams(), ['scope' => implode(' ', $this->scopes)]);
+            $params = array_merge($this->tokenRequestContext->getParams(), ['scope' => implode(' ', $this->scopes)]);
             if ($additionalAuthenticationContext['claims'] ?? false) {
                 $span->setAttribute(self::CONTAINS_CLAIMS_KEY, true);
                 $claims = base64_decode(strval($additionalAuthenticationContext['claims']));

tests/PhpLeagueAccessTokenProviderTest.php

@@ -8,6 +8,7 @@
 use GuzzleHttp\Psr7\Request;
 use GuzzleHttp\Psr7\Response;
 use Http\Promise\FulfilledPromise;
+use InvalidArgumentException;
 use League\OAuth2\Client\Token\AccessToken;
 use Microsoft\Kiota\Authentication\Oauth\AuthorizationCodeCertificateContext;
 use Microsoft\Kiota\Authentication\Oauth\AuthorizationCodeContext;
@@ -189,7 +190,8 @@ function (Request $request) use ($tokenRequestContext) {
 
     public function testGetAuthTokenWithInsecureUrlDoesntReturnAccessToken(): void
     {
-        $this->assertNull($this->defaultTokenProvider->getAuthorizationTokenAsync('http://example.com')->wait());
+        $this->expectException(InvalidArgumentException::class);
+        $this->defaultTokenProvider->getAuthorizationTokenAsync('http://example.com')->wait();
     }
 
     public function testGetAccessTokenWithLocalhostStringWithHttpReturnsAccessToken(): void