Merge pull request #26 from mainick/fix-encryption-key-requirement

Fix encryption key requirement in KeycloakClientBundle
mainick · Oct 28, 2024 · 2715e7d · 2715e7d
2 parents 5904b38 + e7020ad
commit 2715e7d
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/src/DependencyInjection/Configuration.php b/src/DependencyInjection/Configuration.php
@@ -28,6 +28,12 @@ public function getConfigTreeBuilder(): TreeBuilder
                         ->scalarNode('encryption_algorithm')->defaultNull()->end()
                         ->scalarNode('encryption_key')->defaultNull()->end()
                         ->scalarNode('encryption_key_path')->defaultNull()->end()
+                        ->validate()
+                            ->ifTrue(function ($v) {
+                                return empty($v['encryption_key']) && empty($v['encryption_key_path']);
+                            })
+                            ->thenInvalid('At least one of "encryption_key" or "encryption_key_path" must be provided.')
+                        ->end()
                         ->scalarNode('version')->defaultNull()->end()
                     ->end()
                 ->end()

diff --git a/src/Provider/KeycloakClient.php b/src/Provider/KeycloakClient.php
@@ -44,12 +44,11 @@ public function __construct(
 
         if ('RS256' === $this->encryption_algorithm) {
             if ('' === $this->encryption_key && '' === $this->encryption_key_path) {
-                throw new \RuntimeException('encryption_key is empty');
+                throw new \RuntimeException('Either encryption_key or encryption_key_path must be provided.');
             }
             if ('' !== $this->encryption_key) {
                 $this->keycloakProvider->setEncryptionKey($this->encryption_key);
-            }
-            if ('' !== $this->encryption_key_path) {
+            } elseif ('' !== $this->encryption_key_path) {
                 $this->keycloakProvider->setEncryptionKeyPath($this->encryption_key_path);
             }
         }