Merge branch 'main' into dependabot/composer/phpstan/phpstan-tw-0.12.…

…90or-tw-1.0.0or-tw-2.0.0

tests/GraphServiceClientTest.php

@@ -5,6 +5,7 @@
 use GuzzleHttp\Client;
 use GuzzleHttp\Handler\MockHandler;
 use GuzzleHttp\Psr7\Response;
+use League\OAuth2\Client\Grant\AuthorizationCode;
 use League\OAuth2\Client\Token\AccessToken;
 use Microsoft\Graph\Core\Authentication\GraphPhpLeagueAccessTokenProvider;
 use Microsoft\Graph\Core\Authentication\GraphPhpLeagueAuthenticationProvider;
@@ -100,12 +101,15 @@ function (RequestInterface $request) {
 
         // cache is populated
         $this->assertInstanceOf(AccessToken::class, $customCache->getTokenWithContext($tokenRequestContext));
+        $this->assertEquals($this->testJWT, $customCache->getTokenWithContext($tokenRequestContext)->getToken());
 
         // hydrate another cache for follow-up request
-        $newCache = new InMemoryAccessTokenCache($tokenRequestContext, $customCache->getTokenWithContext($tokenRequestContext));
+        $previousAccessToken = $customCache->getTokenWithContext($tokenRequestContext);
+        $newTokenRequestContext = new AuthorizationCodeContext('tenant', 'clientId', 'clientSecret', 'redirectUri', 'code');
+        $newCache = new InMemoryAccessTokenCache($newTokenRequestContext, $previousAccessToken);
         $accessTokenProvider = GraphPhpLeagueAccessTokenProvider::createWithCache(
             $newCache,
-            $tokenRequestContext,
+            $newTokenRequestContext,
             $scopes
         );
         $client = GraphServiceClient::createWithRequestAdapter(
@@ -119,6 +123,7 @@ function (RequestInterface $request) {
 
         $me = $client->me()->get()->wait();
         // cache is populated
-        $this->assertInstanceOf(AccessToken::class, $customCache->getTokenWithContext($tokenRequestContext));
+        $this->assertInstanceOf(AccessToken::class, $newCache->getTokenWithContext($newTokenRequestContext));
+        $this->assertEquals($this->testJWT, $newCache->getTokenWithContext($newTokenRequestContext)->getToken());
     }
 }