Altera sanitização do UUID para permitir prefixos dinâmicos

Author: jeffesonmaia

src/Support/Uri.php

@@ -27,7 +27,7 @@ public static function sanitize(string $uri, array $uriMask = []): string
                     '/\/(?<=\/)[0-9A-F]{16,24}(?=\/)?/i',
                     '/\/(?<=\/)\d+(?=\/)?/',
                     '/\/(?<=\/)R[RN]\d{16}[A-Za-z0-9]{11}/',
-                    '/\/(?<=\/)BILL-([A-F0-9]{8}-[A-F0-9]{4}-[A-F0-9]{4}-[A-F0-9]{4}-[A-F0-9]{12})(?=\/)?/i',
+                    '/\/(?<=\/)([A-Z]+(?:-[A-Z]+)*)-([0-9a-zA-Z]{8}-[0-9a-zA-Z]{4}-[0-9a-zA-Z]{4}-[0-9a-zA-Z]{4}-[0-9a-zA-Z]{12})(?=\/|$)/i',
                 ],
             ),
             array_merge(
@@ -40,7 +40,7 @@ public static function sanitize(string $uri, array $uriMask = []): string
                     '/<OID>',
                     '/<NUMBER>',
                     '/<EXTERNAL-ID>',
-                    '/<BILL-UUID>',
+                    '/<PREFIXED-UUID>',
                 ],
             ),
             '/' . ltrim($uri, '/'),

tests/Cases/UriTest.php

@@ -162,17 +162,62 @@ public function testClearUriExternalIds(): void
         self::assertSame('/v9/test/<EXTERNAL-ID>/bar/<NUMBER>', Uri::sanitize('/v9/test/RR2101818220123720H9KJTERfw1a/bar/12345'));
     }
 
-    public function testClearUriBillUuid(): void
+    public function testClearUriPrefixedUuid(): void
     {
+        // Gera prefixos aleatórios para tornar o teste mais robusto
+        $prefixes = ['BILL', 'USER', 'ADMIN', 'CLIENT', 'ORDER', 'PAYMENT', 'COMPANY-ADMIN', 'SUB-TENANT', 'API-KEY'];
+        $randomPrefix = $prefixes[array_rand($prefixes)];
+
+        // Gera UUIDs aleatórios (incluindo caracteres não-hexadecimais para testar a regex)
+        $uuidChars = '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ';
+        $randomUuid = sprintf(
+            '%s-%s-%s-%s-%s',
+            substr(str_shuffle($uuidChars), 0, 8),
+            substr(str_shuffle($uuidChars), 0, 4),
+            substr(str_shuffle($uuidChars), 0, 4),
+            substr(str_shuffle($uuidChars), 0, 4),
+            substr(str_shuffle($uuidChars), 0, 12)
+        );
+
+        $prefixedUuid = "{$randomPrefix}-{$randomUuid}";
+
+        // Casos de teste estático para garantir consistência
         $billUuid = 'BILL-123e4567-e89b-12d3-a456-426614174000';
+        $userUuid = 'USER-abc1234d-e56f-78g9-h012-345678901234';
+        $companyUuid = 'COMPANY-ADMIN-456e7890-f12a-34b5-c678-901234567890';
 
+        // Testes básicos
         self::assertSame('/v1/test', Uri::sanitize('/v1/test'));
-        self::assertSame('/v2/test/<BILL-UUID>', Uri::sanitize("/v2/test/{$billUuid}"));
-        self::assertSame('/v3/test/<BILL-UUID>/bar', Uri::sanitize("/v3/test/{$billUuid}/bar"));
-        self::assertSame('/v4/test/<BILL-UUID>/bar/<BILL-UUID>/', Uri::sanitize("/v4/test/{$billUuid}/bar/{$billUuid}/"));
-        self::assertSame('/v5/test/<BILL-UUID>/<BILL-UUID>', Uri::sanitize("/v5/test/{$billUuid}/{$billUuid}"));
-        self::assertSame('/v6/test/<BILL-UUID>/<BILL-UUID>/', Uri::sanitize("/v6/test/{$billUuid}/{$billUuid}/"));
-        self::assertSame('/v7/test/<BILL-UUID>/<BILL-UUID>/<BILL-UUID>', Uri::sanitize("/v7/test/{$billUuid}/{$billUuid}/{$billUuid}"));
-        self::assertSame('/v8/test/<BILL-UUID>/<BILL-UUID>/<BILL-UUID>/', Uri::sanitize("/v8/test/{$billUuid}/{$billUuid}/{$billUuid}/"));
+
+        // Testes com prefixo randômico
+        self::assertSame('/v2/test/<PREFIXED-UUID>', Uri::sanitize("/v2/test/{$prefixedUuid}"));
+        self::assertSame('/v3/test/<PREFIXED-UUID>/bar', Uri::sanitize("/v3/test/{$prefixedUuid}/bar"));
+        self::assertSame('/v4/test/<PREFIXED-UUID>/bar/<PREFIXED-UUID>/', Uri::sanitize("/v4/test/{$prefixedUuid}/bar/{$prefixedUuid}/"));
+
+        // Testes com casos estáticos conhecidos
+        self::assertSame('/v2/test/<PREFIXED-UUID>', Uri::sanitize("/v2/test/{$billUuid}"));
+        self::assertSame('/v3/test/<PREFIXED-UUID>/bar', Uri::sanitize("/v3/test/{$billUuid}/bar"));
+        self::assertSame('/v4/test/<PREFIXED-UUID>/bar/<PREFIXED-UUID>/', Uri::sanitize("/v4/test/{$billUuid}/bar/{$billUuid}/"));
+
+        // Testes com UUID não-hexadecimal
+        self::assertSame('/v2/test/<PREFIXED-UUID>', Uri::sanitize("/v2/test/{$userUuid}"));
+        self::assertSame('/v3/test/<PREFIXED-UUID>/bar', Uri::sanitize("/v3/test/{$userUuid}/bar"));
+
+        // Testes com prefixo composto
+        self::assertSame('/v2/test/<PREFIXED-UUID>', Uri::sanitize("/v2/test/{$companyUuid}"));
+        self::assertSame('/v3/test/<PREFIXED-UUID>/bar', Uri::sanitize("/v3/test/{$companyUuid}/bar"));
+
+        // Testes com múltiplos UUIDs (randômico + estático)
+        self::assertSame('/v5/test/<PREFIXED-UUID>/<PREFIXED-UUID>', Uri::sanitize("/v5/test/{$prefixedUuid}/{$billUuid}"));
+        self::assertSame('/v6/test/<PREFIXED-UUID>/<PREFIXED-UUID>/', Uri::sanitize("/v6/test/{$billUuid}/{$prefixedUuid}/"));
+        self::assertSame('/v7/test/<PREFIXED-UUID>/<PREFIXED-UUID>/<PREFIXED-UUID>', Uri::sanitize("/v7/test/{$prefixedUuid}/{$billUuid}/{$userUuid}"));
+        self::assertSame('/v8/test/<PREFIXED-UUID>/<PREFIXED-UUID>/<PREFIXED-UUID>/', Uri::sanitize("/v8/test/{$billUuid}/{$userUuid}/{$prefixedUuid}/"));
+
+        // Casos edge: diferentes contextos de API
+        self::assertSame('/users/<PREFIXED-UUID>/profile', Uri::sanitize("/users/{$prefixedUuid}/profile"));
+        self::assertSame('/api/v1/bills/<PREFIXED-UUID>/details', Uri::sanitize("/api/v1/bills/{$billUuid}/details"));
+
+        // Teste sem barra final
+        self::assertSame('/test/<PREFIXED-UUID>', Uri::sanitize("/test/{$prefixedUuid}"));
     }
 }