Send internal id not client id to fetch client

cultuurnet · Jun 7, 2024 · 62cc202 · 62cc202
1 parent ada312e
commit 62cc202
Showing 1 changed file with 6 additions and 5 deletions.
diff --git a/app/Keycloak/Client/KeycloakApiClient.php b/app/Keycloak/Client/KeycloakApiClient.php
@@ -36,6 +36,7 @@ public function createClient(
         ClientIdFactory $clientIdFactory
     ): Client {
         $clientId = $clientIdFactory->create();
+        $id = Uuid::uuid4();
 
         try {
             $response = $this->client->sendWithBearer(
@@ -44,7 +45,7 @@ public function createClient(
                     sprintf('admin/realms/%s/clients', $realm->internalName),
                     [],
                     Json::encode(IntegrationToKeycloakClientConverter::convert(
-                        Uuid::uuid4(),
+                        $id,
                         $integration,
                         $clientId
                     ))
@@ -61,7 +62,7 @@ public function createClient(
 
         $this->logger->info(sprintf('Client %s for realm %s created with client id %s', $integration->name, $realm->publicName, $clientId));
 
-        return $this->fetchClient($realm, $integration, $clientId);
+        return $this->fetchClient($realm, $integration, $id->toString());
     }
 
     /**
@@ -111,13 +112,13 @@ public function deleteScopes(Client $client): void
     /**
      * @throws KeyCloakApiFailed
      */
-    private function fetchClient(Realm $realm, Integration $integration, string $clientId): Client
+    private function fetchClient(Realm $realm, Integration $integration, string $id): Client
     {
         try {
             $response = $this->client->sendWithBearer(
                 new Request(
                     'GET',
-                    sprintf('admin/realms/%s/clients/%s', $realm->internalName, $clientId)
+                    sprintf('admin/realms/%s/clients/%s', $realm->internalName, $id)
                 ),
                 $realm
             );
@@ -129,7 +130,7 @@ private function fetchClient(Realm $realm, Integration $integration, string $cli
             }
 
             return Client::createFromJson($realm, $integration->id, Json::decodeAssociatively($body));
-        } catch (Throwable $e) {
+        } catch (KeyCloakApiFailed $e) {
             throw KeyCloakApiFailed::failedToFetchClient($realm, $e->getMessage());
         }
     }