Appwrite/appwrite
1
0
Fork 0
mirror of https://github.com/appwrite/appwrite.git synced 2026-05-26 13:51:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: remove redundant new User(getArrayCopy()) wrapping

Browse Source 
Since setDocumentType('users', User::class) is registered on all
database instances, getDocument('users', ...) already returns User
instances. The new User($doc->getArrayCopy()) pattern was redundant
and could lose internal state managed by the database layer.

https://claude.ai/code/session_01JLPDurUgyj7qViA8JqQFTH
This commit is contained in:
Claude
2026-03-29 03:04:34 +00:00
parent 98c63a87d1
commit 32005c0a49
2 changed files with 17 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/init/resources.php
+13 -8
View File
@@ -390,16 +390,19 @@ Http::setResource('user', function (string $mode, Document $project, Document $c
$user = null;
if ($mode === APP_MODE_ADMIN) {
$user = new User($dbForPlatform->getDocument('users', $store->getProperty('id', ''))->getArrayCopy());
/** @var User $user */
$user = $dbForPlatform->getDocument('users', $store->getProperty('id', ''));
} else {
if ($project->isEmpty()) {
$user = new User([]);
} else {
if (! empty($store->getProperty('id', ''))) {
if ($project->getId() === 'console') {
$user = new User($dbForPlatform->getDocument('users', $store->getProperty('id', ''))->getArrayCopy());
/** @var User $user */
$user = $dbForPlatform->getDocument('users', $store->getProperty('id', ''));
} else {
$user = new User($dbForProject->getDocument('users', $store->getProperty('id', ''))->getArrayCopy());
/** @var User $user */
$user = $dbForProject->getDocument('users', $store->getProperty('id', ''));
}
}
}
@@ -429,9 +432,11 @@ Http::setResource('user', function (string $mode, Document $project, Document $c
$jwtUserId = $payload['userId'] ?? '';
if (! empty($jwtUserId)) {
if ($mode === APP_MODE_ADMIN) {
$user = new User($dbForPlatform->getDocument('users', $jwtUserId)->getArrayCopy());
/** @var User $user */
$user = $dbForPlatform->getDocument('users', $jwtUserId);
} else {
$user = new User($dbForProject->getDocument('users', $jwtUserId)->getArrayCopy());
/** @var User $user */
$user = $dbForProject->getDocument('users', $jwtUserId);
}
}
$jwtSessionId = $payload['sessionId'] ?? '';
@@ -450,9 +455,9 @@ Http::setResource('user', function (string $mode, Document $project, Document $c
throw new Exception(Exception::USER_API_KEY_AND_SESSION_SET);
}
$accountKeyDoc = $dbForPlatform->getAuthorization()->skip(fn () => $dbForPlatform->getDocument('users', $accountKeyUserId));
if (! $accountKeyDoc->isEmpty()) {
$accountKeyUser = new User($accountKeyDoc->getArrayCopy());
/** @var User $accountKeyUser */
$accountKeyUser = $dbForPlatform->getAuthorization()->skip(fn () => $dbForPlatform->getDocument('users', $accountKeyUserId));
if (! $accountKeyUser->isEmpty()) {
$key = $accountKeyUser->find(
key: 'secret',
find: $accountKey,
app/realtime.php
+4 -2
View File
@@ -518,7 +518,8 @@ $server->onWorkerStart(function (int $workerId) use ($server, $register, $stats,
$project = $consoleDatabase->getAuthorization()->skip(fn () => $consoleDatabase->getDocument('projects', $projectId));
$database = getProjectDB($project);
$user = new User($database->getDocument('users', $userId)->getArrayCopy());
/** @var User $user */
$user = $database->getDocument('users', $userId);
$roles = $user->getRoles($database->getAuthorization());
$authorization = $realtime->connections[$connection]['authorization'] ?? null;
@@ -887,7 +888,8 @@ $server->onMessage(function (int $connection, string $message) use ($server, $re
$store->decode($message['data']['session']);
$user = new User($database->getDocument('users', $store->getProperty('id', ''))->getArrayCopy());
/** @var User $user */
$user = $database->getDocument('users', $store->getProperty('id', ''));
/**
* TODO: