Merge pull request #55 from utopia-php/fix-uid-validation

validate UID fix for documents # Conflicts: # composer.lock
utopia-php · Oct 29, 2024 · 6379fd1 · 6379fd1
1 parent ce97cdf
commit 6379fd1
Show file tree

Hide file tree

Showing 2 changed files with 46 additions and 46 deletions.
diff --git a/composer.lock b/composer.lock
diff --git a/src/Migration/Destinations/Appwrite.php b/src/Migration/Destinations/Appwrite.php
@@ -307,13 +307,13 @@ public function importDatabaseResource(Resource $resource, bool $isLast): Resour
      */
     protected function createDatabase(Database $resource): bool
     {
-        $resourceId = $resource->getId() == 'unique()'
-            ? ID::unique()
-            : $resource->getId();
+        if ($resource->getId() == 'unique()') {
+            $resource->setId(ID::unique());
+        }
 
         $validator = new UID();
 
-        if (!$validator->isValid($resourceId)) {
+        if (!$validator->isValid($resource->getId())) {
             throw new Exception(
                 resourceName: $resource->getName(),
                 resourceGroup: $resource->getGroup(),
@@ -322,8 +322,6 @@ protected function createDatabase(Database $resource): bool
             );
         }
 
-        $resource->setId($resourceId);
-
         $database = $this->database->createDocument('databases', new UtopiaDocument([
             '$id' => $resource->getId(),
             'name' => $resource->getDatabaseName(),
@@ -362,13 +360,13 @@ protected function createDatabase(Database $resource): bool
      */
     protected function createCollection(Collection $resource): bool
     {
-        $resourceId = $resource->getId() == 'unique()'
-            ? ID::unique()
-            : $resource->getId();
+        if ($resource->getId() == 'unique()') {
+            $resource->setId(ID::unique());
+        }
 
         $validator = new UID();
 
-        if (!$validator->isValid($resourceId)) {
+        if (!$validator->isValid($resource->getId())) {
             throw new Exception(
                 resourceName: $resource->getName(),
                 resourceGroup: $resource->getGroup(),
@@ -377,8 +375,6 @@ protected function createCollection(Collection $resource): bool
             );
         }
 
-        $resource->setId($resourceId);
-
         $database = $this->database->getDocument(
             'databases',
             $resource->getDatabase()->getId()
@@ -893,6 +889,10 @@ protected function createIndex(Index $resource): bool
      */
     protected function createDocument(Document $resource, bool $isLast): bool
     {
+        if ($resource->getId() == 'unique()') {
+            $resource->setId(ID::unique());
+        }
+
         $validator = new UID();
 
         if (!$validator->isValid($resource->getId())) {