appwrite · shimonewman · Aug 26, 2025 · Aug 8, 2025 · Aug 8, 2025 · Aug 8, 2025
diff --git a/app/config/collections/projects.php b/app/config/collections/projects.php
@@ -55,7 +55,8 @@
                 '$id' => ID::custom('type'),
                 'type' => Database::VAR_STRING,
                 'size' => 128,
-                'required' => true,
+                'required' => false,
+                'default' => 'grids',
                 'signed' => true,
                 'array' => false,
                 'filters' => [],

diff --git a/app/config/templates/site.php b/app/config/templates/site.php
@@ -473,13 +473,13 @@ function getFramework(string $frameworkEnum, array $overrides)
         'frameworks' => [
             getFramework('FLUTTER', [
                 'providerRootDirectory' => './',
-                'buildCommand' => 'bash build.sh',
+                'buildCommand' => 'bash prepare-env.sh && flutter build web',
             ]),
         ],
         'vcsProvider' => 'github',
         'providerRepositoryId' => 'starter-for-flutter',
         'providerOwner' => 'appwrite',
-        'providerVersion' => '0.1.*',
+        'providerVersion' => '0.2.*',
         'variables' => [
             [
                 'name' => 'APPWRITE_PUBLIC_ENDPOINT',

diff --git a/app/controllers/api/account.php b/app/controllers/api/account.php
@@ -1843,7 +1843,7 @@ function sendSessionAlert(Locale $locale, Document $user, Document $project, Doc
         } elseif ($protocol === 'http' && $port !== '80') {
             $callbackBase .= ':' . $port;
         }
-       var_dump( $callbackBase . '/v1/account/sessions/oauth2/callback/' . $provider . '/' . $project->getId());
+
         $callback = $callbackBase . '/v1/account/sessions/oauth2/callback/' . $provider . '/' . $project->getId();
         $providerEnabled = $project->getAttribute('oAuthProviders', [])[$provider . 'Enabled'] ?? false;
 

diff --git a/app/controllers/api/users.php b/app/controllers/api/users.php
@@ -643,15 +643,20 @@ function createUser(string $hash, mixed $hashOptions, string $userId, ?string $e
             $cursor->setValue($cursorDocument);
         }
 
-        $filterQueries = Query::groupByType($queries)['filters'];
-        try {
-            $users = $dbForProject->find('users', $queries);
-            $total = $dbForProject->count('users', $filterQueries, APP_LIMIT_COUNT);
-        } catch (OrderException $e) {
-            throw new Exception(Exception::DATABASE_QUERY_ORDER_NULL, "The order attribute '{$e->getAttribute()}' had a null value. Cursor pagination requires all documents order attribute values are non-null.");
-        } catch (QueryException $e) {
-            throw new Exception(Exception::GENERAL_QUERY_INVALID, $e->getMessage());
-        }
+        $users = [];
+        $total = 0;
+
+        $dbForProject->skipFilters(function () use ($dbForProject, $queries, &$users, &$total) {
+            try {
+                $users = $dbForProject->find('users', $queries);
+                $total = $dbForProject->count('users', $queries, APP_LIMIT_COUNT);
+            } catch (OrderException $e) {
+                throw new Exception(Exception::DATABASE_QUERY_ORDER_NULL, "The order attribute '{$e->getAttribute()}' had a null value. Cursor pagination requires all documents order attribute values are non-null.");
+            } catch (QueryException $e) {
+                throw new Exception(Exception::GENERAL_QUERY_INVALID, $e->getMessage());
+            }
+        }, ['subQueryAuthenticators', 'subQuerySessions', 'subQueryTokens', 'subQueryChallenges', 'subQueryMemberships']);
+
         $response->dynamic(new Document([
             'users' => $users,
             'total' => $total,

diff --git a/app/init/resources.php b/app/init/resources.php
@@ -243,7 +243,11 @@
             if ($project->getId() === 'console') {
                 $user = $dbForPlatform->getDocument('users', Auth::$unique);
             } else {
+
+               // var_dump(['Authorization users start::$status' =>  Authorization::$status]);
                 $user = $dbForProject->getDocument('users', Auth::$unique);
+                //var_dump(['Authorization users end::$status' =>  Authorization::$status]);
+
             }
         }
     }
@@ -290,7 +294,6 @@
             }
         }
     }
-
     $dbForProject->setMetadata('user', $user->getId());
     $dbForPlatform->setMetadata('user', $user->getId());
 

diff --git a/composer.json b/composer.json
@@ -54,7 +54,7 @@
         "utopia-php/cache": "0.13.*",
         "utopia-php/cli": "0.15.*",
         "utopia-php/config": "0.2.*",
-        "utopia-php/database": "dev-feat-mongo-tmp as 0.73.0",
+        "utopia-php/database": "dev-feat-mongo-tmp-with-uuid7 as 0.73.0",
         "utopia-php/detector": "0.1.*",
         "utopia-php/domains": "0.8.*",
         "utopia-php/dns": "0.3.*",

diff --git a/composer.lock b/composer.lock
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -219,7 +219,7 @@ services:
   appwrite-console:
     <<: *x-logging
     container_name: appwrite-console
-    image: appwrite/console:6.2.0
+    image: appwrite/console:7.0.0-qa.8
     restart: unless-stopped
     networks:
       - appwrite