From c96836b1c0a1656d60cdfef4c0f0c4e70ab2f1d8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matej=20Ba=C4=8Do?= <matejbaco2000@gmail.com>
Date: Tue, 28 Apr 2026 17:10:58 +0200
Subject: [PATCH] Improve code quality of folder decoding project ID

---
 src/Appwrite/Utopia/Response/Filters/V24.php | 37 ++++++++++++--------
 1 file changed, 23 insertions(+), 14 deletions(-)

diff --git a/src/Appwrite/Utopia/Response/Filters/V24.php b/src/Appwrite/Utopia/Response/Filters/V24.php
index 8ac5305dc1..29cc2ff4a1 100644
--- a/src/Appwrite/Utopia/Response/Filters/V24.php
+++ b/src/Appwrite/Utopia/Response/Filters/V24.php
@@ -2,8 +2,11 @@
 
 namespace Appwrite\Utopia\Response\Filters;
 
+use Ahc\Jwt\JWT;
+use Ahc\Jwt\JWTException;
 use Appwrite\Utopia\Response;
 use Appwrite\Utopia\Response\Filter;
+use Utopia\System\System;
 
 // Convert 1.9.3 Data format to 1.9.2 format
 class V24 extends Filter
@@ -26,22 +29,28 @@ class V24 extends Filter
         unset($content['sdks']);
         unset($content['accessedAt']);
 
-        $projectId = '';
-        if (isset($content['secret'])) {
-            $parts = explode('_', $content['secret'], 2);
-            if (count($parts) === 2) {
-                $jwtParts = explode('.', $parts[1]);
-                if (count($jwtParts) >= 2) {
-                    $payload = json_decode(base64_decode(str_replace(['-', '_'], ['+', '/'], $jwtParts[1])), true);
-                    $projectId = $payload['projectId'] ?? '';
-                }
-            }
-        }
-        $content['projectId'] = $projectId;
-
-        $content['jwt'] = $content['secret'] ?? '';
+        $secret = $content['secret'] ?? '';
         unset($content['secret']);
 
+        $content['projectId'] = $this->extractProjectId($secret);
+        $content['jwt'] = $secret;
+
         return $content;
     }
+
+    private function extractProjectId(string $secret): string
+    {
+        $token = explode('_', $secret, 2)[1] ?? '';
+        if ($token === '') {
+            return '';
+        }
+
+        $jwt = new JWT(System::getEnv('_APP_OPENSSL_KEY_V1'), 'HS256');
+
+        try {
+            return $jwt->decode($token, false)['projectId'] ?? '';
+        } catch (JWTException) {
+            return '';
+        }
+    }
 }