Merge 386c5cc into a866ceb

City-of-Helsinki · Dec 21, 2023 · c9356b1 · c9356b1
2 parents a866ceb + 386c5cc
commit c9356b1
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/Plugin/OpenIDConnectClient/Tunnistamo.php b/src/Plugin/OpenIDConnectClient/Tunnistamo.php
@@ -297,7 +297,7 @@ public function getClientScopes(): array {
     $scopes = $this->configuration['client_scopes'] ?? [];
 
     if (!$scopes) {
-      return [];
+      return parent::getClientScopes();
     }
     return explode(',', $this->configuration['client_scopes']);
   }

diff --git a/tests/src/Kernel/TunnistamoClientTest.php b/tests/src/Kernel/TunnistamoClientTest.php
@@ -22,7 +22,7 @@ public function testGetClientScopes() : void {
     $config = $plugin->getConfiguration();
     $this->assertSame($config['client_scopes'], $plugin->defaultConfiguration()['client_scopes']);
     $this->setPluginConfiguration('client_scopes', '');
-    $this->assertSame([], $this->getPlugin()->getClientScopes());
+    $this->assertSame(['openid', 'email'], $this->getPlugin()->getClientScopes());
   }
 
   /**