changed oidc_azure adapter options to optional

gyselroth · Oct 30, 2024 · f947dd9 · f947dd9
1 parent 4711da4
commit f947dd9
Showing 1 changed file with 19 additions and 8 deletions.
diff --git a/src/Adapter/OidcAzure.php b/src/Adapter/OidcAzure.php
@@ -23,21 +23,21 @@ class OidcAzure extends AbstractAdapter
      *
      * @var string
      */
-    protected $tenant = 'common';
+    protected $tenant;
 
     /**
      * ClientId.
      *
      * @var string
      */
-    protected $client_id = '';
+    protected $client_id;
 
     /**
      * Default endpoint version.
      *
      * @var string
      */
-    protected $default_end_point_version = '2.0';
+    protected $default_end_point_version;
 
     /**
      * Attributes.
@@ -148,12 +148,23 @@ protected function verifyToken(string $token): ?array
             'category' => get_class($this),
         ]);
 
+        $options = [];
+
+        if (isset($this->tenant)) {
+            $options['tenant'] = $this->tenant;
+        }
+
+        if (isset($this->client_id)) {
+            $options['clientId'] = $this->client_id;
+        }
+
+        if (isset($this->default_end_point_version)) {
+            $options['defaultEndPointVersion'] = $this->default_end_point_version;
+        }
+
         try {
-            $claims = (new \TheNetworg\OAuth2\Client\Provider\Azure([
-                'tenant' => $this->tenant,
-                'clientId' => $this->client_id,
-                'defaultEndPointVersion' => $this->default_end_point_version
-            ]))->validateAccessToken($token);
+            $claims = (new \TheNetworg\OAuth2\Client\Provider\Azure($options))
+                ->validateAccessToken($token);
         } catch (\Exception $exception) {
             $this->logger->error('cannot get claims of accessToken', [
                 'category' => get_class($this),