Merge pull request #120 from microsoftgraph/dev

Release 2.0.0-RC9

Author: Ndiritu

README.md

@@ -8,7 +8,7 @@ To install the `microsoft-graph-core` library with Composer, either run `compose
 ```
 {
     "require": {
-        "microsoft/microsoft-graph-core": "^2.0.0-RC7"
+        "microsoft/microsoft-graph-core": "^2.0.0-RC9"
     }
 }
 ```

src/Authentication/GraphPhpLeagueAccessTokenProvider.php

@@ -9,6 +9,9 @@
 namespace Microsoft\Graph\Core\Authentication;
 
 
+use InvalidArgumentException;
+use Microsoft\Graph\Core\NationalCloud;
+use Microsoft\Kiota\Authentication\Oauth\ProviderFactory;
 use Microsoft\Kiota\Authentication\Oauth\TokenRequestContext;
 use Microsoft\Kiota\Authentication\PhpLeagueAccessTokenProvider;
 
@@ -24,14 +27,40 @@
  */
 class GraphPhpLeagueAccessTokenProvider extends PhpLeagueAccessTokenProvider
 {
+    public const NATIONAL_CLOUD_TO_AZURE_AD_ENDPOINT = [
+        NationalCloud::GLOBAL => 'https://login.microsoftonline.com',
+        NationalCloud::US_GOV => 'https://login.microsoftonline.us',
+        NationalCloud::CHINA => 'https://login.chinacloudapi.cn'
+    ];
+
     /**
      * @param TokenRequestContext $tokenRequestContext
      * @param array<string> $scopes if left empty, it's set to ["https://[graph national cloud host]/.default"] scope
+     * @param string $nationalCloud Defaults to https://graph.microsoft.com. See
+     * https://learn.microsoft.com/en-us/graph/deployments
      */
-    public function __construct(TokenRequestContext $tokenRequestContext, array $scopes = [])
+    public function __construct(
+        TokenRequestContext $tokenRequestContext,
+        array $scopes = [],
+        string $nationalCloud = NationalCloud::GLOBAL
+    )
     {
-        $allowedHosts = ["graph.microsoft.com", "graph.microsoft.us", "dod-graph.microsoft.us", "graph.microsoft.de",
-            "microsoftgraph.chinacloudapi.cn", "canary.graph.microsoft.com"];
-        parent::__construct($tokenRequestContext, $scopes, $allowedHosts);
+        $allowedHosts = [
+            "graph.microsoft.com",
+            "graph.microsoft.us",
+            "dod-graph.microsoft.us",
+            "microsoftgraph.chinacloudapi.cn",
+            "canary.graph.microsoft.com",
+            "graph.microsoft-ppe.com"
+        ];
+        $tokenBaseServiceUrl = self::NATIONAL_CLOUD_TO_AZURE_AD_ENDPOINT[$nationalCloud] ??
+            self::NATIONAL_CLOUD_TO_AZURE_AD_ENDPOINT[NationalCloud::GLOBAL];
+        $oauthProvider = ProviderFactory::create(
+            $tokenRequestContext,
+            [],
+            $tokenBaseServiceUrl,
+            $nationalCloud
+        );
+        parent::__construct($tokenRequestContext, $scopes, $allowedHosts, $oauthProvider);
     }
 }

src/Authentication/GraphPhpLeagueAuthenticationProvider.php

@@ -8,6 +8,7 @@
 
 namespace Microsoft\Graph\Core\Authentication;
 
+use Microsoft\Graph\Core\NationalCloud;
 use Microsoft\Kiota\Abstractions\Authentication\BaseBearerTokenAuthenticationProvider;
 use Microsoft\Kiota\Authentication\Oauth\TokenRequestContext;
 
@@ -23,10 +24,16 @@ class GraphPhpLeagueAuthenticationProvider extends BaseBearerTokenAuthentication
     /**
      * @param TokenRequestContext $tokenRequestContext
      * @param array<string> $scopes defaults to ["https://[graph national cloud host]/.default"] scope
+     * @param string $nationalCloud defaults to https://graph.microsoft.com. See
+     * https://learn.microsoft.com/en-us/graph/deployments
      */
-    public function __construct(TokenRequestContext $tokenRequestContext, array $scopes = [])
+    public function __construct(
+        TokenRequestContext $tokenRequestContext,
+        array $scopes = [],
+        string $nationalCloud = NationalCloud::GLOBAL
+    )
     {
-        $accessTokenProvider = new GraphPhpLeagueAccessTokenProvider($tokenRequestContext, $scopes);
+        $accessTokenProvider = new GraphPhpLeagueAccessTokenProvider($tokenRequestContext, $scopes, $nationalCloud);
         parent::__construct($accessTokenProvider);
     }
 }

src/GraphConstants.php

@@ -25,7 +25,7 @@ final class GraphConstants
     const REST_ENDPOINT = "https://graph.microsoft.com/";
 
     // Define HTTP request constants
-    const SDK_VERSION = "2.0.0-RC8";
+    const SDK_VERSION = "2.0.0-RC9";
 
     // Define error constants
     const MAX_PAGE_SIZE = 999;

tests/Authentication/GraphPhpLeagueAccessTokenProviderTest.php

@@ -2,7 +2,9 @@
 
 namespace Microsoft\Graph\Core\Test\Authentication;
 
+use League\OAuth2\Client\Token\AccessToken;
 use Microsoft\Graph\Core\Authentication\GraphPhpLeagueAccessTokenProvider;
+use Microsoft\Graph\Core\NationalCloud;
 use Microsoft\Kiota\Authentication\Oauth\ClientCredentialContext;
 use PHPUnit\Framework\TestCase;
 
@@ -15,4 +17,31 @@ public function testSuccessfullyInitializesClass(): void
         $this->assertNotEmpty($leagueAccessTokenProvider->getAllowedHostsValidator()->getAllowedHosts());
     }
 
+    public function testTokenServiceDefaultsToAzureADGlobalEndpoint(): void
+    {
+        $tokenProvider = new GraphPhpLeagueAccessTokenProvider(
+            new ClientCredentialContext('tenant', 'client', 'secret'),
+            [],
+            'https://canary.microsoft.com'
+        );
+        $baseUrl = GraphPhpLeagueAccessTokenProvider::NATIONAL_CLOUD_TO_AZURE_AD_ENDPOINT[NationalCloud::GLOBAL];
+        $this->assertEquals("$baseUrl/tenant/oauth2/v2.0/token", $tokenProvider->getOauthProvider()->getBaseAccessTokenUrl([]));
+        $this->assertEquals("$baseUrl/tenant/oauth2/v2.0/authorize", $tokenProvider->getOauthProvider()->getBaseAuthorizationUrl());
+    }
+
+    public function testCorrectOAuthEndpointsSet(): void
+    {
+        $tokenProvider = new GraphPhpLeagueAccessTokenProvider(
+            new ClientCredentialContext('tenant', 'client', 'secret'),
+            [],
+            NationalCloud::CHINA
+        );
+        $baseUrl = GraphPhpLeagueAccessTokenProvider::NATIONAL_CLOUD_TO_AZURE_AD_ENDPOINT[NationalCloud::CHINA];
+        $this->assertEquals(NationalCloud::CHINA."/oidc/userinfo", $tokenProvider->getOauthProvider()->getResourceOwnerDetailsUrl(
+            $this->createMock(AccessToken::class)
+        ));
+        $this->assertEquals("$baseUrl/tenant/oauth2/v2.0/token", $tokenProvider->getOauthProvider()->getBaseAccessTokenUrl([]));
+        $this->assertEquals("$baseUrl/tenant/oauth2/v2.0/authorize", $tokenProvider->getOauthProvider()->getBaseAuthorizationUrl());
+    }
+
 }