Cursors

src/Database/Validator/Cursor.php

@@ -0,0 +1,21 @@
+<?php
+
+namespace Utopia\Database\Validator;
+
+class Cursor extends UID
+{
+    protected int $maxLength = 100;
+
+    /**
+     * Get Description.
+     *
+     * Returns validator description
+     *
+     * @return string
+     */
+    public function getDescription(): string
+    {
+        $message = 'Cursor must contain at most %u chars. Valid chars are a-z, A-Z, 0-9, and underscore. Can\'t start with a leading underscore';
+        return sprintf($message, $this->maxLength);
+    }
+}

src/Database/Validator/Key.php

@@ -6,7 +6,8 @@
 
 class Key extends Validator
 {
-    protected bool $allowInternal = false; // If true, you keys starting with $ are allowed
+    protected bool $allowInternal = false; // If true, keys starting with $ are allowed
+    protected int $maxLength = 36;
 
     /**
      * @var string
@@ -73,7 +74,7 @@ public function isValid($value): bool
             return false;
         }
 
-        if (\mb_strlen($value) > 36) {
+        if (\mb_strlen($value) > $this->maxLength) {
             return false;
         }
 

src/Database/Validator/Query/Cursor.php

@@ -4,7 +4,7 @@
 
 use Utopia\Database\Document;
 use Utopia\Database\Query;
-use Utopia\Database\Validator\UID;
+use Utopia\Database\Validator\Cursor as CursorUid;
 
 class Cursor extends Base
 {
@@ -33,7 +33,7 @@ public function isValid($value): bool
                 $cursor = $cursor->getId();
             }
 
-            $validator = new UID();
+            $validator = new CursorUid();
             if ($validator->isValid($cursor)) {
                 return true;
             }

tests/Database/Validator/Query/CursorTest.php

@@ -3,6 +3,7 @@
 namespace Utopia\Tests\Validator\Query;
 
 use PHPUnit\Framework\TestCase;
+use Utopia\Database\Document;
 use Utopia\Database\Query;
 use Utopia\Database\Validator\Query\Cursor;
 
@@ -14,6 +15,7 @@ public function testValueSuccess(): void
 
         $this->assertTrue($validator->isValid(new Query(Query::TYPE_CURSORAFTER, values: ['asdf'])));
         $this->assertTrue($validator->isValid(new Query(Query::TYPE_CURSORBEFORE, values: ['asdf'])));
+        $this->assertTrue($validator->isValid(new Query(Query::TYPE_CURSORBEFORE, values: [new Document(['$id' => 'abc102030'])])));
     }
 
     public function testValueFailure(): void
@@ -28,5 +30,11 @@ public function testValueFailure(): void
         $this->assertFalse($validator->isValid(Query::equal('attr', ['v'])));
         $this->assertFalse($validator->isValid(Query::orderAsc('attr')));
         $this->assertFalse($validator->isValid(Query::orderDesc('attr')));
+
+        $uid = 'uid0123456_uid0123456_uid0123456_uid0123456_uid0123456_uid0123456_uid0123456_uid0123456_uid0123456_uid0123456_';
+
+        $this->assertFalse($validator->isValid(new Query(Query::TYPE_CURSORBEFORE, values: [$uid])));
+        $this->assertFalse($validator->isValid(new Query(Query::TYPE_CURSORBEFORE, values: [new Document(['$id' => $uid])])));
+        $this->assertEquals('Invalid cursor: Cursor must contain at most 100 chars. Valid chars are a-z, A-Z, 0-9, and underscore. Can\'t start with a leading underscore', $validator->getDescription());
     }
 }