Resolve #3483483 "Id token"

Closes #3483483

src/OpenIdConnect/OpenIdConnectIdTokenResponse.php

@@ -25,8 +25,8 @@ class OpenIdConnectIdTokenResponse extends IdTokenResponse implements LoggerAwar
    */
   protected function getBuilder(AccessTokenEntityInterface $accessToken, UserEntityInterface $userEntity) {
     $builder = parent::getBuilder($accessToken, $userEntity);
-    $builder->issuedBy(Url::fromUri('internal:/')->setAbsolute()->toString());
-    return $builder;
+
+    return $builder->issuedBy(Url::fromUri('internal:/')->setAbsolute()->toString());
   }
 
   /**
@@ -52,10 +52,10 @@ class OpenIdConnectIdTokenResponse extends IdTokenResponse implements LoggerAwar
       ->extract($accessToken->getScopes(), $userEntity->getClaims());
 
     if (isset($claims['iss'])) {
-      $builder->issuedBy($claims['iss']);
+      $builder = $builder->issuedBy($claims['iss']);
     }
     if (isset($claims['sub'])) {
-      $builder->relatedTo($claims['sub']);
+      $builder = $builder->relatedTo($claims['sub']);
     }
     foreach ($claims as $claim_name => $value) {
       if (in_array($claim_name, RegisteredClaims::ALL)) {
@@ -64,7 +64,7 @@ class OpenIdConnectIdTokenResponse extends IdTokenResponse implements LoggerAwar
       }
 
       try {
-        $builder->withClaim($claim_name, $value);
+        $builder = $builder->withClaim($claim_name, $value);
       }
       catch (\Exception $e) {
         $this->logger->error('Could not add private claim @claim_name to token: @error_message', [