Merge branch 'release-15.17.0'

oat-sa · Mar 12, 2024 · 8168f6e · 8168f6e
2 parents 27390e7 + c35f5bc
commit 8168f6e
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 8 deletions.
diff --git a/models/classes/Security/DataAccess/Repository/CachedPlatformKeyChainRepository.php b/models/classes/Security/DataAccess/Repository/CachedPlatformKeyChainRepository.php
@@ -66,11 +66,11 @@ public function find(string $identifier): ?KeyChainInterface
                 ]
             );
 
-            $platformKeyChainRepository = $this->getPlatformKeyChainRepository();
+            $configuration = $this->getPlatformKeyChainRepository()->findConfiguration($identifier);
 
             return new KeyChain(
-                $platformKeyChainRepository->getOption(PlatformKeyChainRepository::OPTION_DEFAULT_KEY_ID),
-                $platformKeyChainRepository->getOption(PlatformKeyChainRepository::OPTION_DEFAULT_KEY_NAME),
+                $configuration[PlatformKeyChainRepository::OPTION_DEFAULT_KEY_ID] ?? '',
+                $configuration[PlatformKeyChainRepository::OPTION_DEFAULT_KEY_NAME] ?? '',
                 new Key($rawKeys[sprintf(self::PUBLIC_PATTERN, $identifier)]),
                 new Key($rawKeys[sprintf(self::PRIVATE_PATTERN, $identifier)])
             );
@@ -99,12 +99,12 @@ public function findAll(KeyChainQuery $query): KeyChainCollection
                 ]
             );
 
-            $platformKeyChainRepository = $this->getPlatformKeyChainRepository();
+            $configuration = $this->getPlatformKeyChainRepository()->findConfiguration($query->getIdentifier());
 
             return new KeyChainCollection(
                 new TaoKeyChain(
-                    $platformKeyChainRepository->getOption(PlatformKeyChainRepository::OPTION_DEFAULT_KEY_ID),
-                    $platformKeyChainRepository->getOption(PlatformKeyChainRepository::OPTION_DEFAULT_KEY_NAME),
+                    $configuration[PlatformKeyChainRepository::OPTION_DEFAULT_KEY_ID] ?? '',
+                    $configuration[PlatformKeyChainRepository::OPTION_DEFAULT_KEY_NAME] ?? '',
                     new TaoKey($rawKeys[sprintf(self::PUBLIC_PATTERN, $query->getIdentifier())]),
                     new TaoKey($rawKeys[sprintf(self::PRIVATE_PATTERN, $query->getIdentifier())])
                 )

diff --git a/models/classes/Security/DataAccess/Repository/PlatformKeyChainRepository.php b/models/classes/Security/DataAccess/Repository/PlatformKeyChainRepository.php
@@ -181,7 +181,7 @@ private function getFileSystem(): FilesystemInterface
      * @param string $identifier
      * @return array|null
      */
-    protected function findConfiguration(string $identifier): ?array
+    public function findConfiguration(string $identifier): ?array
     {
         $options = $this->getOptions();
         foreach ($options as $configs) {

diff --git a/scripts/install/GenerateKeys.php b/scripts/install/GenerateKeys.php
@@ -24,11 +24,13 @@
 
 use oat\oatbox\extension\AbstractAction;
 use oat\taoLti\models\classes\Platform\Service\CachedKeyChainGenerator;
+use oat\taoLti\models\classes\Security\DataAccess\Repository\PlatformKeyChainRepository;
 
 class GenerateKeys extends AbstractAction
 {
     public function __invoke($params)
     {
-        $this->getServiceLocator()->get(CachedKeyChainGenerator::class)->generate();
+        $defaultKeyId = $this->getServiceLocator()->get(PlatformKeyChainRepository::SERVICE_ID)->getDefaultKeyId();
+        $this->getServiceLocator()->get(CachedKeyChainGenerator::class)->generate($defaultKeyId);
     }
 }
diff --git a/...it/models/classes/Security/DataAccess/Repository/CachedPlatformKeyChainRepositoryTest.php b/...it/models/classes/Security/DataAccess/Repository/CachedPlatformKeyChainRepositoryTest.php
@@ -176,6 +176,11 @@ public function testFind(): void
                 ]
             );
 
+        $this->platformKeyChainRepository
+            ->expects($this->once())
+            ->method('findConfiguration')
+            ->willReturn([PlatformKeyChainRepository::OPTION_DEFAULT_KEY_ID => self::KEY_CHAIN_ID]);
+
         $keyChain = $this->subject->find(self::KEY_CHAIN_ID);
 
         $this->assertSame(self::KEY_CHAIN_ID, $keyChain->getIdentifier());