From c453252c39a016e182f1e189606b541ebb356c5b Mon Sep 17 00:00:00 2001 From: Jake Barnby Date: Tue, 18 Mar 2025 22:25:37 +1300 Subject: [PATCH] Format --- app/controllers/api/account.php | 15 ++++++++++----- app/init/resources.php | 1 - 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/app/controllers/api/account.php b/app/controllers/api/account.php index 4bf3487d82..cb362069c4 100644 --- a/app/controllers/api/account.php +++ b/app/controllers/api/account.php @@ -329,7 +329,8 @@ App::post('/v1/account') $limit = $project->getAttribute('auths', [])['limit'] ?? 0; if ($limit !== 0) { - $total = $useProjectDB(fn (Database $dbForProject) => + $total = $useProjectDB( + fn (Database $dbForProject) => $dbForProject->count('users', max: APP_LIMIT_USERS) ); @@ -342,7 +343,8 @@ App::post('/v1/account') } // Makes sure this email is not already used in another identity - $identityWithMatchingEmail = $useProjectDB(fn (Database $dbForProject) => + $identityWithMatchingEmail = $useProjectDB( + fn (Database $dbForProject) => $dbForProject->findOne('identities', [ Query::equal('providerEmail', [$email]), ]) @@ -391,11 +393,13 @@ App::post('/v1/account') 'accessedAt' => DateTime::now(), ]); $user->removeAttribute('$internalId'); - $user = Authorization::skip(fn () => $useProjectDB(fn (Database $dbForProject) => + $user = Authorization::skip(fn () => $useProjectDB( + fn (Database $dbForProject) => $dbForProject->createDocument('users', $user) )); try { - $target = Authorization::skip(fn () => $useProjectDB(fn (Database $dbForProject) => + $target = Authorization::skip(fn () => $useProjectDB( + fn (Database $dbForProject) => $dbForProject->createDocument('targets', new Document([ '$permissions' => [ Permission::read(Role::user($user->getId())), @@ -418,7 +422,8 @@ App::post('/v1/account') } } - $useProjectDB(fn (Database $dbForProject) => + $useProjectDB( + fn (Database $dbForProject) => $dbForProject->purgeCachedDocument('users', $user->getId()) ); } catch (Duplicate) { diff --git a/app/init/resources.php b/app/init/resources.php index 488ec7018c..3b780c209c 100644 --- a/app/init/resources.php +++ b/app/init/resources.php @@ -36,7 +36,6 @@ use Utopia\Database\Validator\Authorization; use Utopia\DSN\DSN; use Utopia\Locale\Locale; use Utopia\Logger\Log; -use Utopia\Pools\Connection; use Utopia\Pools\Group; use Utopia\Queue\Publisher; use Utopia\Storage\Device;