CodeMirror/appwrite
1
0
Fork 0
mirror of synced 2024-06-29 11:40:45 +12:00
Code Issues Projects Releases Wiki Activity

Work in progress account/teams/users

Browse source
This commit is contained in:
Eldad Fux 2021-05-07 01:31:05 +03:00
parent ca2dbb9fad
commit e70de897d6
5 changed files with 448 additions and 713 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

543
app/controllers/api/account.php
View file

File diff suppressed because it is too large Load diff

4
app/controllers/api/projects.php
View file

@ -54,9 +54,9 @@ App::post('/v1/projects')
/** @var Utopia\Database\Database $dbForInternal */ /** @var Utopia\Database\Database $dbForInternal */
/** @var Utopia\Database\Database $dbForExternal */ /** @var Utopia\Database\Database $dbForExternal */
$team = $projectDB->getDocument($teamId); $team = $dbForInternal->getDocument('teams', $teamId);
if (empty($team->getId()) || Database::SYSTEM_COLLECTION_TEAMS != $team->getCollection()) { if ($team->isEmpty()) {
throw new Exception('Team not found', 404); throw new Exception('Team not found', 404);
} }

349
app/controllers/api/teams.php
View file

@ -1,24 +1,24 @@
<?php <?php
use Utopia\App;
use Utopia\Exception;
use Utopia\Config\Config;
use Appwrite\Network\Validator\Email;
use Utopia\Validator\Text;
use Appwrite\Network\Validator\Host;
use Utopia\Validator\Range;
use Utopia\Validator\ArrayList;
use Utopia\Validator\WhiteList;
use Appwrite\Auth\Auth; use Appwrite\Auth\Auth;
use Appwrite\Database\Database;
use Appwrite\Database\Document;
use Appwrite\Database\Validator\UID; use Appwrite\Database\Validator\UID;
use Appwrite\Database\Validator\Authorization;
use Appwrite\Database\Exception\Duplicate;
use Appwrite\Database\Validator\Key;
use Appwrite\Detector\Detector; use Appwrite\Detector\Detector;
use Appwrite\Template\Template; use Appwrite\Template\Template;
use Appwrite\Utopia\Response; use Appwrite\Utopia\Response;
use Appwrite\Network\Validator\Email;
use Appwrite\Network\Validator\Host;
use Utopia\App;
use Utopia\Exception;
use Utopia\Config\Config;
use Utopia\Validator\Text;
use Utopia\Validator\Range;
use Utopia\Validator\ArrayList;
use Utopia\Validator\WhiteList;
use Utopia\Database\Document;
use Utopia\Database\Exception\Duplicate;
use Utopia\Database\Query;
use Utopia\Database\Validator\Authorization;
use Utopia\Database\Validator\Key;
App::post('/v1/teams') App::post('/v1/teams')
->desc('Create Team') ->desc('Create Team')
@ -36,41 +36,33 @@ App::post('/v1/teams')
->param('roles', ['owner'], new ArrayList(new Key()), 'Array of strings. Use this param to set the roles in the team for the user who created it. The default role is **owner**. A role can be any string. Learn more about [roles and permissions](/docs/permissions). Max length for each role is 32 chars.', true) ->param('roles', ['owner'], new ArrayList(new Key()), 'Array of strings. Use this param to set the roles in the team for the user who created it. The default role is **owner**. A role can be any string. Learn more about [roles and permissions](/docs/permissions). Max length for each role is 32 chars.', true)
->inject('response') ->inject('response')
->inject('user') ->inject('user')
->inject('projectDB') ->inject('dbForInternal')
->action(function ($name, $roles, $response, $user, $projectDB) { ->action(function ($name, $roles, $response, $user, $dbForInternal) {
/** @var Appwrite\Utopia\Response $response */ /** @var Appwrite\Utopia\Response $response */
/** @var Appwrite\Database\Document $user */ /** @var Utopia\Database\Document $user */
/** @var Appwrite\Database\Database $projectDB */ /** @var Utopia\Database\Database $dbForInternal */
Authorization::disable(); Authorization::disable();
$isPrivilegedUser = Auth::isPrivilegedUser(Authorization::$roles); $isPrivilegedUser = Auth::isPrivilegedUser(Authorization::$roles);
$isAppUser = Auth::isAppUser(Authorization::$roles); $isAppUser = Auth::isAppUser(Authorization::$roles);
$team = $projectDB->createDocument([ $teamId = $dbForInternal->getId();
'$collection' => Database::SYSTEM_COLLECTION_TEAMS, $team = $dbForInternal->createDocument('teams', new Document([
'$permissions' => [ '$id' => $teamId ,
'read' => ['team:{self}'], '$read' => ['team:'.$teamId ],
'write' => ['team:{self}/owner'], '$write' => ['team:'.$teamId .'/owner'],
],
'name' => $name, 'name' => $name,
'sum' => ($isPrivilegedUser || $isAppUser) ? 0 : 1, 'sum' => ($isPrivilegedUser || $isAppUser) ? 0 : 1,
'dateCreated' => \time(), 'dateCreated' => \time(),
]); ]));
Authorization::reset(); Authorization::reset();
if (false === $team) {
throw new Exception('Failed saving team to DB', 500);
}
if (!$isPrivilegedUser && !$isAppUser) { // Don't add user on server mode if (!$isPrivilegedUser && !$isAppUser) { // Don't add user on server mode
$membership = new Document([ $membership = new Document([
'$collection' => Database::SYSTEM_COLLECTION_MEMBERSHIPS, '$read' => ['user:'.$user->getId(), 'team:'.$team->getId()],
'$permissions' => [ '$write' => ['user:'.$user->getId(), 'team:'.$team->getId().'/owner'],
'read' => ['user:'.$user->getId(), 'team:'.$team->getId()],
'write' => ['user:'.$user->getId(), 'team:'.$team->getId().'/owner'],
],
'userId' => $user->getId(), 'userId' => $user->getId(),
'teamId' => $team->getId(), 'teamId' => $team->getId(),
'roles' => $roles, 'roles' => $roles,
@ -80,20 +72,16 @@ App::post('/v1/teams')
'secret' => '', 'secret' => '',
]); ]);
$membership = $dbForInternal->createDocument('memberships', $membership);
// Attach user to team // Attach user to team
$user->setAttribute('memberships', $membership, Document::SET_TYPE_APPEND); $user->setAttribute('memberships', $membership, Document::SET_TYPE_APPEND);
$user = $projectDB->updateDocument($user->getArrayCopy()); $user = $dbForInternal->updateDocument('users', $user->getId(), $user);
if (false === $user) {
throw new Exception('Failed saving user to DB', 500);
}
} }
$response $response->setStatusCode(Response::STATUS_CODE_CREATED);
->setStatusCode(Response::STATUS_CODE_CREATED) $response->dynamic2($team, Response::MODEL_TEAM);
->dynamic($team, Response::MODEL_TEAM)
;
}); });
App::get('/v1/teams') App::get('/v1/teams')
@ -112,23 +100,16 @@ App::get('/v1/teams')
->param('offset', 0, new Range(0, 2000), 'Results offset. The default value is 0. Use this param to manage pagination.', true) ->param('offset', 0, new Range(0, 2000), 'Results offset. The default value is 0. Use this param to manage pagination.', true)
->param('orderType', 'ASC', new WhiteList(['ASC', 'DESC'], true), 'Order result by ASC or DESC order.', true) ->param('orderType', 'ASC', new WhiteList(['ASC', 'DESC'], true), 'Order result by ASC or DESC order.', true)
->inject('response') ->inject('response')
->inject('projectDB') ->inject('dbForInternal')
->action(function ($search, $limit, $offset, $orderType, $response, $projectDB) { ->action(function ($search, $limit, $offset, $orderType, $response, $dbForInternal) {
/** @var Appwrite\Utopia\Response $response */ /** @var Appwrite\Utopia\Response $response */
/** @var Appwrite\Database\Database $projectDB */ /** @var Utopia\Database\Database $dbForInternal */
$results = $projectDB->getCollection([ $results = $dbForInternal->find('teams', [], $limit, $offset);
'limit' => $limit, $sum = $dbForInternal->count('teams', [], 5000);
'offset' => $offset,
'orderType' => $orderType,
'search' => $search,
'filters' => [
'$collection='.Database::SYSTEM_COLLECTION_TEAMS,
],
]);
$response->dynamic(new Document([ $response->dynamic2(new Document([
'sum' => $projectDB->getSum(), 'sum' => $sum,
'teams' => $results 'teams' => $results
]), Response::MODEL_TEAM_LIST); ]), Response::MODEL_TEAM_LIST);
}); });
@ -146,18 +127,18 @@ App::get('/v1/teams/:teamId')
->label('sdk.response.model', Response::MODEL_TEAM) ->label('sdk.response.model', Response::MODEL_TEAM)
->param('teamId', '', new UID(), 'Team unique ID.') ->param('teamId', '', new UID(), 'Team unique ID.')
->inject('response') ->inject('response')
->inject('projectDB') ->inject('dbForInternal')
->action(function ($teamId, $response, $projectDB) { ->action(function ($teamId, $response, $dbForInternal) {
/** @var Appwrite\Utopia\Response $response */ /** @var Appwrite\Utopia\Response $response */
/** @var Appwrite\Database\Database $projectDB */ /** @var Utopia\Database\Database $dbForInternal */
$team = $projectDB->getDocument($teamId); $team = $dbForInternal->getDocument('teams', $teamId);
if (empty($team->getId()) || Database::SYSTEM_COLLECTION_TEAMS != $team->getCollection()) { if (empty($team->getId())) {
throw new Exception('Team not found', 404); throw new Exception('Team not found', 404);
} }
$response->dynamic($team, Response::MODEL_TEAM); $response->dynamic2($team, Response::MODEL_TEAM);
}); });
App::put('/v1/teams/:teamId') App::put('/v1/teams/:teamId')
@ -175,26 +156,20 @@ App::put('/v1/teams/:teamId')
->param('teamId', '', new UID(), 'Team unique ID.') ->param('teamId', '', new UID(), 'Team unique ID.')
->param('name', null, new Text(128), 'Team name. Max length: 128 chars.') ->param('name', null, new Text(128), 'Team name. Max length: 128 chars.')
->inject('response') ->inject('response')
->inject('projectDB') ->inject('dbForInternal')
->action(function ($teamId, $name, $response, $projectDB) { ->action(function ($teamId, $name, $response, $dbForInternal) {
/** @var Appwrite\Utopia\Response $response */ /** @var Appwrite\Utopia\Response $response */
/** @var Appwrite\Database\Database $projectDB */ /** @var Utopia\Database\Database $dbForInternal */
$team = $projectDB->getDocument($teamId); $team = $dbForInternal->getDocument('teams', $teamId);
if (empty($team->getId()) || Database::SYSTEM_COLLECTION_TEAMS != $team->getCollection()) { if (empty($team->getId())) {
throw new Exception('Team not found', 404); throw new Exception('Team not found', 404);
} }
$team = $projectDB->updateDocument(\array_merge($team->getArrayCopy(), [ $team = $dbForInternal->updateDocument('teams', $team->getId(), $team->setAttribute('name', $name));
'name' => $name,
]));
if (false === $team) { $response->dynamic2($team, Response::MODEL_TEAM);
throw new Exception('Failed saving team to DB', 500);
}
$response->dynamic($team, Response::MODEL_TEAM);
}); });
App::delete('/v1/teams/:teamId') App::delete('/v1/teams/:teamId')
@ -210,40 +185,37 @@ App::delete('/v1/teams/:teamId')
->label('sdk.response.model', Response::MODEL_NONE) ->label('sdk.response.model', Response::MODEL_NONE)
->param('teamId', '', new UID(), 'Team unique ID.') ->param('teamId', '', new UID(), 'Team unique ID.')
->inject('response') ->inject('response')
->inject('projectDB') ->inject('dbForInternal')
->inject('events') ->inject('events')
->action(function ($teamId, $response, $projectDB, $events) { ->action(function ($teamId, $response, $dbForInternal, $events) {
/** @var Appwrite\Utopia\Response $response */ /** @var Appwrite\Utopia\Response $response */
/** @var Appwrite\Database\Database $projectDB */ /** @var Utopia\Database\Database $dbForInternal */
/** @var Appwrite\Event\Event $events */ /** @var Appwrite\Event\Event $events */
$team = $projectDB->getDocument($teamId); $team = $dbForInternal->getDocument('teams', $teamId);
if (empty($team->getId()) || Database::SYSTEM_COLLECTION_TEAMS != $team->getCollection()) { if (empty($team->getId())) {
throw new Exception('Team not found', 404); throw new Exception('Team not found', 404);
} }
$memberships = $projectDB->getCollection([ $memberships = $dbForInternal->find('memberships', [
'limit' => 2000, // TODO add members limit new Query('teamId', Query::TYPE_EQUAL, [$teamId]),
'offset' => 0, ], 2000, 0); // TODO fix members limit
'filters' => [
'$collection='.Database::SYSTEM_COLLECTION_MEMBERSHIPS, // TODO delete all members individually from the user object
'teamId='.$teamId,
],
]);
foreach ($memberships as $member) { foreach ($memberships as $member) {
if (!$projectDB->deleteDocument($member->getId())) { if (!$dbForInternal->deleteDocument('memberships', $member->getId())) {
throw new Exception('Failed to remove membership for team from DB', 500); throw new Exception('Failed to remove membership for team from DB', 500);
} }
} }
if (!$projectDB->deleteDocument($teamId)) { if (!$dbForInternal->deleteDocument('teams', $teamId)) {
throw new Exception('Failed to remove team from DB', 500); throw new Exception('Failed to remove team from DB', 500);
} }
$events $events
->setParam('eventData', $response->output($team, Response::MODEL_TEAM)) ->setParam('eventData', $response->output2($team, Response::MODEL_TEAM))
; ;
$response->noContent(); $response->noContent();
@ -271,15 +243,15 @@ App::post('/v1/teams/:teamId/memberships')
->inject('response') ->inject('response')
->inject('project') ->inject('project')
->inject('user') ->inject('user')
->inject('projectDB') ->inject('dbForInternal')
->inject('locale') ->inject('locale')
->inject('audits') ->inject('audits')
->inject('mails') ->inject('mails')
->action(function ($teamId, $email, $name, $roles, $url, $response, $project, $user, $projectDB, $locale, $audits, $mails) { ->action(function ($teamId, $email, $name, $roles, $url, $response, $project, $user, $dbForInternal, $locale, $audits, $mails) {
/** @var Appwrite\Utopia\Response $response */ /** @var Appwrite\Utopia\Response $response */
/** @var Appwrite\Database\Document $project */ /** @var Appwrite\Database\Document $project */
/** @var Appwrite\Database\Document $user */ /** @var Appwrite\Database\Document $user */
/** @var Appwrite\Database\Database $projectDB */ /** @var Utopia\Database\Database $dbForInternal */
/** @var Appwrite\Event\Event $audits */ /** @var Appwrite\Event\Event $audits */
/** @var Appwrite\Event\Event $mails */ /** @var Appwrite\Event\Event $mails */
@ -287,41 +259,21 @@ App::post('/v1/teams/:teamId/memberships')
$isAppUser = Auth::isAppUser(Authorization::$roles); $isAppUser = Auth::isAppUser(Authorization::$roles);
$name = (empty($name)) ? $email : $name; $name = (empty($name)) ? $email : $name;
$team = $projectDB->getDocument($teamId); $team = $dbForInternal->getDocument('teams', $teamId);
if (empty($team->getId()) || Database::SYSTEM_COLLECTION_TEAMS != $team->getCollection()) { if (empty($team->getId())) {
throw new Exception('Team not found', 404); throw new Exception('Team not found', 404);
} }
$memberships = $projectDB->getCollection([ $memberships = $dbForInternal->findFirst('memberships', [new Query('teamId', Query::TYPE_EQUAL, [$team->getId()])], 2000, 0);
'limit' => 50, $invitee = $dbForInternal->findFirst('users', [new Query('email', Query::TYPE_EQUAL, [$email])], 1); // Get user by email address
'offset' => 0,
'filters' => [
'$collection='.Database::SYSTEM_COLLECTION_MEMBERSHIPS,
'teamId='.$team->getId(),
],
]);
$invitee = $projectDB->getCollectionFirst([ // Get user by email address
'limit' => 1,
'filters' => [
'$collection='.Database::SYSTEM_COLLECTION_USERS,
'email='.$email,
],
]);
if (empty($invitee)) { // Create new user if no user with same email found if (empty($invitee)) { // Create new user if no user with same email found
$limit = $project->getAttribute('usersAuthLimit', 0); $limit = $project->getAttribute('usersAuthLimit', 0);
if ($limit !== 0 && $project->getId() !== 'console') { // check users limit, console invites are allways allowed. if ($limit !== 0 && $project->getId() !== 'console') { // check users limit, console invites are allways allowed.
$projectDB->getCollection([ // Count users $sum = $dbForInternal->count('users'); // Count users TODO: add a 10k limit here.
'filters' => [
'$collection='.Database::SYSTEM_COLLECTION_USERS,
],
]);
$sum = $projectDB->getSum();
if($sum >= $limit) { if($sum >= $limit) {
throw new Exception('Project registration is restricted. Contact your administrator for more information.', 501); throw new Exception('Project registration is restricted. Contact your administrator for more information.', 501);
@ -331,12 +283,11 @@ App::post('/v1/teams/:teamId/memberships')
Authorization::disable(); Authorization::disable();
try { try {
$invitee = $projectDB->createDocument([ $userId = $dbForInternal->getId();
'$collection' => Database::SYSTEM_COLLECTION_USERS, $invitee = $dbForInternal->createDocument('users', new Document([
'$permissions' => [ '$id' => $userId,
'read' => ['user:{self}', '*'], '$read' => ['user:'.$userId, '*'],
'write' => ['user:{self}'], '$write' => ['user:'.$userId],
],
'email' => $email, 'email' => $email,
'emailVerification' => false, 'emailVerification' => false,
'status' => Auth::USER_STATUS_UNACTIVATED, 'status' => Auth::USER_STATUS_UNACTIVATED,
@ -347,16 +298,12 @@ App::post('/v1/teams/:teamId/memberships')
'name' => $name, 'name' => $name,
'sessions' => [], 'sessions' => [],
'tokens' => [], 'tokens' => [],
], ['email' => $email]); ]));
} catch (Duplicate $th) { } catch (Duplicate $th) {
throw new Exception('Account already exists', 409); throw new Exception('Account already exists', 409);
} }
Authorization::reset(); Authorization::reset();
if (false === $invitee) {
throw new Exception('Failed saving user to DB', 500);
}
} }
$isOwner = false; $isOwner = false;
@ -378,11 +325,9 @@ App::post('/v1/teams/:teamId/memberships')
$secret = Auth::tokenGenerator(); $secret = Auth::tokenGenerator();
$membership = new Document([ $membership = new Document([
'$collection' => Database::SYSTEM_COLLECTION_MEMBERSHIPS, '$id' => $dbForInternal->getId(),
'$permissions' => [ '$read' => ['*'],
'read' => ['*'], '$write' => ['user:'.$invitee->getId(), 'team:'.$team->getId().'/owner'],
'write' => ['user:'.$invitee->getId(), 'team:'.$team->getId().'/owner'],
],
'userId' => $invitee->getId(), 'userId' => $invitee->getId(),
'teamId' => $team->getId(), 'teamId' => $team->getId(),
'roles' => $roles, 'roles' => $roles,
@ -394,28 +339,18 @@ App::post('/v1/teams/:teamId/memberships')
if ($isPrivilegedUser || $isAppUser) { // Allow admin to create membership if ($isPrivilegedUser || $isAppUser) { // Allow admin to create membership
Authorization::disable(); Authorization::disable();
$membership = $projectDB->createDocument($membership->getArrayCopy()); $membership = $dbForInternal->createDocument('memberships', $membership);
$team = $projectDB->updateDocument(\array_merge($team->getArrayCopy(), [ $team = $dbForInternal->updateDocument('teams', $team->getId(), $team->setAttribute('sum', $team->getAttribute('sum', 0) + 1));
'sum' => $team->getAttribute('sum', 0) + 1,
]));
// Attach user to team // Attach user to team
$invitee->setAttribute('memberships', $membership, Document::SET_TYPE_APPEND); $invitee->setAttribute('memberships', $membership, Document::SET_TYPE_APPEND);
$invitee = $projectDB->updateDocument($invitee->getArrayCopy()); $invitee = $dbForInternal->updateDocument('users', $invitee->getId(), $invitee);
if (false === $invitee) {
throw new Exception('Failed saving user to DB', 500);
}
Authorization::reset(); Authorization::reset();
} else { } else {
$membership = $projectDB->createDocument($membership->getArrayCopy()); $membership = $dbForInternal->createDocument('memberships', $membership);
}
if (false === $membership) {
throw new Exception('Failed saving membership to DB', 500);
} }
$url = Template::parseURL($url); $url = Template::parseURL($url);
@ -462,13 +397,11 @@ App::post('/v1/teams/:teamId/memberships')
->setParam('resource', 'teams/'.$teamId) ->setParam('resource', 'teams/'.$teamId)
; ;
$response $response->setStatusCode(Response::STATUS_CODE_CREATED);
->setStatusCode(Response::STATUS_CODE_CREATED) $response->dynamic2($membership
->dynamic(new Document(\array_merge($membership->getArrayCopy(), [ ->setAttribute('email', $email)
'email' => $email, ->setAttribute('name', $name)
'name' => $name, , Response::MODEL_MEMBERSHIP);
])), Response::MODEL_MEMBERSHIP)
;
}); });
App::get('/v1/teams/:teamId/memberships') App::get('/v1/teams/:teamId/memberships')
@ -488,27 +421,19 @@ App::get('/v1/teams/:teamId/memberships')
->param('offset', 0, new Range(0, 2000), 'Results offset. The default value is 0. Use this param to manage pagination.', true) ->param('offset', 0, new Range(0, 2000), 'Results offset. The default value is 0. Use this param to manage pagination.', true)
->param('orderType', 'ASC', new WhiteList(['ASC', 'DESC'], true), 'Order result by ASC or DESC order.', true) ->param('orderType', 'ASC', new WhiteList(['ASC', 'DESC'], true), 'Order result by ASC or DESC order.', true)
->inject('response') ->inject('response')
->inject('projectDB') ->inject('dbForInternal')
->action(function ($teamId, $search, $limit, $offset, $orderType, $response, $projectDB) { ->action(function ($teamId, $search, $limit, $offset, $orderType, $response, $dbForInternal) {
/** @var Appwrite\Utopia\Response $response */ /** @var Appwrite\Utopia\Response $response */
/** @var Appwrite\Database\Database $projectDB */ /** @var Utopia\Database\Database $dbForInternal */
$team = $projectDB->getDocument($teamId); $team = $dbForInternal->getDocument('teams', $teamId);
if (empty($team->getId()) || Database::SYSTEM_COLLECTION_TEAMS != $team->getCollection()) { if (empty($team->getId())) {
throw new Exception('Team not found', 404); throw new Exception('Team not found', 404);
} }
$memberships = $projectDB->getCollection([ $memberships = $dbForInternal->find('memberships', [new Query('teamId', Query::TYPE_EQUAL, [$teamId])], $limit, $offset);
'limit' => $limit, $sum = $dbForInternal->count('memberships', [new Query('teamId', Query::TYPE_EQUAL, [$teamId])], 5000);
'offset' => $offset,
'orderType' => $orderType,
'search' => $search,
'filters' => [
'$collection='.Database::SYSTEM_COLLECTION_MEMBERSHIPS,
'teamId='.$teamId,
],
]);
$users = []; $users = [];
foreach ($memberships as $membership) { foreach ($memberships as $membership) {
@ -516,12 +441,15 @@ App::get('/v1/teams/:teamId/memberships')
continue; continue;
} }
$temp = $projectDB->getDocument($membership->getAttribute('userId', null))->getArrayCopy(['email', 'name']); $temp = $dbForInternal->getDocument('users', $membership->getAttribute('userId', null))->getArrayCopy(['email', 'name']);
$users[] = new Document(\array_merge($temp, $membership->getArrayCopy())); $users[] = new Document(\array_merge($temp, $membership->getArrayCopy()));
} }
$response->dynamic(new Document(['sum' => $projectDB->getSum(), 'memberships' => $users]), Response::MODEL_MEMBERSHIP_LIST); $response->dynamic2(new Document([
'sum' => $sum,
'memberships' => $users
]), Response::MODEL_MEMBERSHIP_LIST);
}); });
App::patch('/v1/teams/:teamId/memberships/:inviteId/status') App::patch('/v1/teams/:teamId/memberships/:inviteId/status')
@ -543,21 +471,21 @@ App::patch('/v1/teams/:teamId/memberships/:inviteId/status')
->inject('request') ->inject('request')
->inject('response') ->inject('response')
->inject('user') ->inject('user')
->inject('projectDB') ->inject('dbForInternal')
->inject('geodb') ->inject('geodb')
->inject('audits') ->inject('audits')
->action(function ($teamId, $inviteId, $userId, $secret, $request, $response, $user, $projectDB, $geodb, $audits) { ->action(function ($teamId, $inviteId, $userId, $secret, $request, $response, $user, $dbForInternal, $geodb, $audits) {
/** @var Utopia\Swoole\Request $request */ /** @var Utopia\Swoole\Request $request */
/** @var Appwrite\Utopia\Response $response */ /** @var Appwrite\Utopia\Response $response */
/** @var Appwrite\Database\Document $user */ /** @var Appwrite\Database\Document $user */
/** @var Appwrite\Database\Database $projectDB */ /** @var Utopia\Database\Database $dbForInternal */
/** @var MaxMind\Db\Reader $geodb */ /** @var MaxMind\Db\Reader $geodb */
/** @var Appwrite\Event\Event $audits */ /** @var Appwrite\Event\Event $audits */
$protocol = $request->getProtocol(); $protocol = $request->getProtocol();
$membership = $projectDB->getDocument($inviteId); $membership = $dbForInternal->getDocument('memberships', $inviteId);
if (empty($membership->getId()) || Database::SYSTEM_COLLECTION_MEMBERSHIPS != $membership->getCollection()) { if (empty($membership->getId())) {
throw new Exception('Invite not found', 404); throw new Exception('Invite not found', 404);
} }
@ -567,11 +495,11 @@ App::patch('/v1/teams/:teamId/memberships/:inviteId/status')
Authorization::disable(); Authorization::disable();
$team = $projectDB->getDocument($teamId); $team = $dbForInternal->getDocument('teams', $teamId);
Authorization::reset(); Authorization::reset();
if (empty($team->getId()) || Database::SYSTEM_COLLECTION_TEAMS != $team->getCollection()) { if (empty($team->getId())) {
throw new Exception('Team not found', 404); throw new Exception('Team not found', 404);
} }
@ -584,13 +512,7 @@ App::patch('/v1/teams/:teamId/memberships/:inviteId/status')
} }
if (empty($user->getId())) { if (empty($user->getId())) {
$user = $projectDB->getCollectionFirst([ // Get user $user = $dbForInternal->getDocument('users', $userId); // Get user
'limit' => 1,
'filters' => [
'$collection='.Database::SYSTEM_COLLECTION_USERS,
'$id='.$userId,
],
]);
} }
if ($membership->getAttribute('userId') !== $user->getId()) { if ($membership->getAttribute('userId') !== $user->getId()) {
@ -614,8 +536,7 @@ App::patch('/v1/teams/:teamId/memberships/:inviteId/status')
$expiry = \time() + Auth::TOKEN_EXPIRATION_LOGIN_LONG; $expiry = \time() + Auth::TOKEN_EXPIRATION_LOGIN_LONG;
$secret = Auth::tokenGenerator(); $secret = Auth::tokenGenerator();
$session = new Document(array_merge([ $session = new Document(array_merge([
'$collection' => Database::SYSTEM_COLLECTION_SESSIONS, '$id' => $dbForInternal->getId(),
'$permissions' => ['read' => ['user:'.$user->getId()], 'write' => ['user:'.$user->getId()]],
'userId' => $user->getId(), 'userId' => $user->getId(),
'provider' => Auth::SESSION_PROVIDER_EMAIL, 'provider' => Auth::SESSION_PROVIDER_EMAIL,
'providerUid' => $user->getAttribute('email'), 'providerUid' => $user->getAttribute('email'),
@ -630,24 +551,14 @@ App::patch('/v1/teams/:teamId/memberships/:inviteId/status')
Authorization::setRole('user:'.$userId); Authorization::setRole('user:'.$userId);
$user = $projectDB->updateDocument($user->getArrayCopy()); $user = $dbForInternal->updateDocument('users', $user->getId(), $user);
if (false === $user) {
throw new Exception('Failed saving user to DB', 500);
}
Authorization::disable(); Authorization::disable();
$team = $projectDB->updateDocument(\array_merge($team->getArrayCopy(), [ $team = $dbForInternal->updateDocument('teams', $team->getId(), $team->setAttribute('sum', $team->getAttribute('sum', 0) + 1));
'sum' => $team->getAttribute('sum', 0) + 1,
]));
Authorization::reset(); Authorization::reset();
if (false === $team) {
throw new Exception('Failed saving team to DB', 500);
}
$audits $audits
->setParam('userId', $user->getId()) ->setParam('userId', $user->getId())
->setParam('event', 'teams.membership.update') ->setParam('event', 'teams.membership.update')
@ -665,10 +576,10 @@ App::patch('/v1/teams/:teamId/memberships/:inviteId/status')
->addCookie(Auth::$cookieName, Auth::encodeSession($user->getId(), $secret), $expiry, '/', Config::getParam('cookieDomain'), ('https' == $protocol), true, Config::getParam('cookieSamesite')) ->addCookie(Auth::$cookieName, Auth::encodeSession($user->getId(), $secret), $expiry, '/', Config::getParam('cookieDomain'), ('https' == $protocol), true, Config::getParam('cookieSamesite'))
; ;
$response->dynamic(new Document(\array_merge($membership->getArrayCopy(), [ $response->dynamic2($membership
'email' => $user->getAttribute('email'), ->setAttribute('email', $user->getAttribute('email'))
'name' => $user->getAttribute('name'), ->setAttribute('name', $user->getAttribute('name'))
])), Response::MODEL_MEMBERSHIP); , Response::MODEL_MEMBERSHIP);
}); });
App::delete('/v1/teams/:teamId/memberships/:inviteId') App::delete('/v1/teams/:teamId/memberships/:inviteId')
@ -685,18 +596,18 @@ App::delete('/v1/teams/:teamId/memberships/:inviteId')
->param('teamId', '', new UID(), 'Team unique ID.') ->param('teamId', '', new UID(), 'Team unique ID.')
->param('inviteId', '', new UID(), 'Invite unique ID.') ->param('inviteId', '', new UID(), 'Invite unique ID.')
->inject('response') ->inject('response')
->inject('projectDB') ->inject('dbForInternal')
->inject('audits') ->inject('audits')
->inject('events') ->inject('events')
->action(function ($teamId, $inviteId, $response, $projectDB, $audits, $events) { ->action(function ($teamId, $inviteId, $response, $dbForInternal, $audits, $events) {
/** @var Appwrite\Utopia\Response $response */ /** @var Appwrite\Utopia\Response $response */
/** @var Appwrite\Database\Database $projectDB */ /** @var Utopia\Database\Database $dbForInternal */
/** @var Appwrite\Event\Event $audits */ /** @var Appwrite\Event\Event $audits */
/** @var Appwrite\Event\Event $events */ /** @var Appwrite\Event\Event $events */
$membership = $projectDB->getDocument($inviteId); $membership = $dbForInternal->getDocument('memberships', $inviteId);
if (empty($membership->getId()) || Database::SYSTEM_COLLECTION_MEMBERSHIPS != $membership->getCollection()) { if (empty($membership->getId())) {
throw new Exception('Invite not found', 404); throw new Exception('Invite not found', 404);
} }
@ -704,24 +615,18 @@ App::delete('/v1/teams/:teamId/memberships/:inviteId')
throw new Exception('Team IDs don\'t match', 404); throw new Exception('Team IDs don\'t match', 404);
} }
$team = $projectDB->getDocument($teamId); $team = $dbForInternal->getDocument('teams', $teamId);
if (empty($team->getId()) || Database::SYSTEM_COLLECTION_TEAMS != $team->getCollection()) { if (empty($team->getId())) {
throw new Exception('Team not found', 404); throw new Exception('Team not found', 404);
} }
if (!$projectDB->deleteDocument($membership->getId())) { if (!$dbForInternal->deleteDocument('memberships', $membership->getId())) {
throw new Exception('Failed to remove membership from DB', 500); throw new Exception('Failed to remove membership from DB', 500);
} }
if ($membership->getAttribute('confirm')) { // Count only confirmed members if ($membership->getAttribute('confirm')) { // Count only confirmed members
$team = $projectDB->updateDocument(\array_merge($team->getArrayCopy(), [ $team = $dbForInternal->updateDocument('teams', $team->getId(), $team->setAttribute('sum', $team->getAttribute('sum', 0) - 1));
'sum' => $team->getAttribute('sum', 0) - 1,
]));
}
if (false === $team) {
throw new Exception('Failed saving team to DB', 500);
} }
$audits $audits
@ -731,7 +636,7 @@ App::delete('/v1/teams/:teamId/memberships/:inviteId')
; ;
$events $events
->setParam('eventData', $response->output($membership, Response::MODEL_MEMBERSHIP)) ->setParam('eventData', $response->output2($membership, Response::MODEL_MEMBERSHIP))
; ;
$response->noContent(); $response->noContent();

243
app/controllers/api/users.php
View file

@ -1,5 +1,8 @@
<?php <?php
use Appwrite\Auth\Auth;
use Appwrite\Auth\Validator\Password;
use Appwrite\Utopia\Response;
use Utopia\App; use Utopia\App;
use Utopia\Exception; use Utopia\Exception;
use Utopia\Validator\Assoc; use Utopia\Validator\Assoc;
@ -9,13 +12,9 @@ use Utopia\Validator\Text;
use Utopia\Validator\Range; use Utopia\Validator\Range;
use Utopia\Audit\Audit; use Utopia\Audit\Audit;
use Utopia\Audit\Adapters\MySQL as AuditAdapter; use Utopia\Audit\Adapters\MySQL as AuditAdapter;
use Appwrite\Auth\Auth; use Utopia\Database\Document;
use Appwrite\Auth\Validator\Password; use Utopia\Database\Exception\Duplicate;
use Appwrite\Database\Database; use Utopia\Database\Validator\UID;
use Appwrite\Database\Document;
use Appwrite\Database\Exception\Duplicate;
use Appwrite\Database\Validator\UID;
use Appwrite\Utopia\Response;
use DeviceDetector\DeviceDetector; use DeviceDetector\DeviceDetector;
App::post('/v1/users') App::post('/v1/users')
@ -34,30 +33,17 @@ App::post('/v1/users')
->param('password', '', new Password(), 'User password. Must be between 6 to 32 chars.') ->param('password', '', new Password(), 'User password. Must be between 6 to 32 chars.')
->param('name', '', new Text(128), 'User name. Max length: 128 chars.', true) ->param('name', '', new Text(128), 'User name. Max length: 128 chars.', true)
->inject('response') ->inject('response')
->inject('projectDB') ->inject('dbForInternal')
->action(function ($email, $password, $name, $response, $projectDB) { ->action(function ($email, $password, $name, $response, $dbForInternal) {
/** @var Appwrite\Utopia\Response $response */ /** @var Appwrite\Utopia\Response $response */
/** @var Appwrite\Database\Database $projectDB */ /** @var Utopia\Database\Database $dbForInternal */
$profile = $projectDB->getCollectionFirst([ // Get user by email address
'limit' => 1,
'filters' => [
'$collection='.Database::SYSTEM_COLLECTION_USERS,
'email='.$email,
],
]);
if (!empty($profile)) {
throw new Exception('User already registered', 409);
}
try { try {
$user = $projectDB->createDocument([ $userId = $dbForInternal->getId();
'$collection' => Database::SYSTEM_COLLECTION_USERS, $user = $dbForInternal->createDocument('users', new Document([
'$permissions' => [ '$id' => $userId,
'read' => ['*'], '$read' => ['*'],
'write' => ['user:{self}'], '$write' => ['user:'.$userId],
],
'email' => $email, 'email' => $email,
'emailVerification' => false, 'emailVerification' => false,
'status' => Auth::USER_STATUS_UNACTIVATED, 'status' => Auth::USER_STATUS_UNACTIVATED,
@ -66,15 +52,17 @@ App::post('/v1/users')
'registration' => \time(), 'registration' => \time(),
'reset' => false, 'reset' => false,
'name' => $name, 'name' => $name,
], ['email' => $email]); 'prefs' => [],
'sessions' => [],
'tokens' => [],
'memberships' => [],
]));
} catch (Duplicate $th) { } catch (Duplicate $th) {
throw new Exception('Account already exists', 409); throw new Exception('Account already exists', 409);
} }
$response $response->setStatusCode(Response::STATUS_CODE_CREATED);
->setStatusCode(Response::STATUS_CODE_CREATED) $response->dynamic2($user, Response::MODEL_USER);
->dynamic($user, Response::MODEL_USER)
;
}); });
App::get('/v1/users') App::get('/v1/users')
@ -93,23 +81,16 @@ App::get('/v1/users')
->param('offset', 0, new Range(0, 2000), 'Results offset. The default value is 0. Use this param to manage pagination.', true) ->param('offset', 0, new Range(0, 2000), 'Results offset. The default value is 0. Use this param to manage pagination.', true)
->param('orderType', 'ASC', new WhiteList(['ASC', 'DESC'], true), 'Order result by ASC or DESC order.', true) ->param('orderType', 'ASC', new WhiteList(['ASC', 'DESC'], true), 'Order result by ASC or DESC order.', true)
->inject('response') ->inject('response')
->inject('projectDB') ->inject('dbForInternal')
->action(function ($search, $limit, $offset, $orderType, $response, $projectDB) { ->action(function ($search, $limit, $offset, $orderType, $response, $dbForInternal) {
/** @var Appwrite\Utopia\Response $response */ /** @var Appwrite\Utopia\Response $response */
/** @var Appwrite\Database\Database $projectDB */ /** @var Utopia\Database\Database $dbForInternal */
$results = $projectDB->getCollection([ $results = $dbForInternal->find('users', [], $limit, $offset);
'limit' => $limit, $sum = $dbForInternal->count('users', [], 5000);
'offset' => $offset,
'orderType' => $orderType,
'search' => $search,
'filters' => [
'$collection='.Database::SYSTEM_COLLECTION_USERS,
],
]);
$response->dynamic(new Document([ $response->dynamic2(new Document([
'sum' => $projectDB->getSum(), 'sum' => $sum,
'users' => $results 'users' => $results
]), Response::MODEL_USER_LIST); ]), Response::MODEL_USER_LIST);
}); });
@ -127,18 +108,18 @@ App::get('/v1/users/:userId')
->label('sdk.response.model', Response::MODEL_USER) ->label('sdk.response.model', Response::MODEL_USER)
->param('userId', '', new UID(), 'User unique ID.') ->param('userId', '', new UID(), 'User unique ID.')
->inject('response') ->inject('response')
->inject('projectDB') ->inject('dbForInternal')
->action(function ($userId, $response, $projectDB) { ->action(function ($userId, $response, $dbForInternal) {
/** @var Appwrite\Utopia\Response $response */ /** @var Appwrite\Utopia\Response $response */
/** @var Appwrite\Database\Database $projectDB */ /** @var Utopia\Database\Database $dbForInternal */
$user = $projectDB->getDocument($userId); $user = $dbForInternal->getDocument('users', $userId);
if (empty($user->getId()) || Database::SYSTEM_COLLECTION_USERS != $user->getCollection()) { if (empty($user->getId())) {
throw new Exception('User not found', 404); throw new Exception('User not found', 404);
} }
$response->dynamic($user, Response::MODEL_USER); $response->dynamic2($user, Response::MODEL_USER);
}); });
App::get('/v1/users/:userId/prefs') App::get('/v1/users/:userId/prefs')
@ -154,20 +135,20 @@ App::get('/v1/users/:userId/prefs')
->label('sdk.response.model', Response::MODEL_PREFERENCES) ->label('sdk.response.model', Response::MODEL_PREFERENCES)
->param('userId', '', new UID(), 'User unique ID.') ->param('userId', '', new UID(), 'User unique ID.')
->inject('response') ->inject('response')
->inject('projectDB') ->inject('dbForInternal')
->action(function ($userId, $response, $projectDB) { ->action(function ($userId, $response, $dbForInternal) {
/** @var Appwrite\Utopia\Response $response */ /** @var Appwrite\Utopia\Response $response */
/** @var Appwrite\Database\Database $projectDB */ /** @var Utopia\Database\Database $dbForInternal */
$user = $projectDB->getDocument($userId); $user = $dbForInternal->getDocument('users', $userId);
if (empty($user->getId()) || Database::SYSTEM_COLLECTION_USERS != $user->getCollection()) { if (empty($user->getId())) {
throw new Exception('User not found', 404); throw new Exception('User not found', 404);
} }
$prefs = $user->getAttribute('prefs', new \stdClass()); $prefs = $user->getAttribute('prefs', new \stdClass());
$response->dynamic(new Document($prefs), Response::MODEL_PREFERENCES); $response->dynamic2(new Document($prefs), Response::MODEL_PREFERENCES);
}); });
App::get('/v1/users/:userId/sessions') App::get('/v1/users/:userId/sessions')
@ -183,16 +164,16 @@ App::get('/v1/users/:userId/sessions')
->label('sdk.response.model', Response::MODEL_SESSION_LIST) ->label('sdk.response.model', Response::MODEL_SESSION_LIST)
->param('userId', '', new UID(), 'User unique ID.') ->param('userId', '', new UID(), 'User unique ID.')
->inject('response') ->inject('response')
->inject('projectDB') ->inject('dbForInternal')
->inject('locale') ->inject('locale')
->action(function ($userId, $response, $projectDB, $locale) { ->action(function ($userId, $response, $dbForInternal, $locale) {
/** @var Appwrite\Utopia\Response $response */ /** @var Appwrite\Utopia\Response $response */
/** @var Appwrite\Database\Database $projectDB */ /** @var Utopia\Database\Database $dbForInternal */
/** @var Utopia\Locale\Locale $locale */ /** @var Utopia\Locale\Locale $locale */
$user = $projectDB->getDocument($userId); $user = $dbForInternal->getDocument('users', $userId);
if (empty($user->getId()) || Database::SYSTEM_COLLECTION_USERS != $user->getCollection()) { if (empty($user->getId())) {
throw new Exception('User not found', 404); throw new Exception('User not found', 404);
} }
@ -210,11 +191,11 @@ App::get('/v1/users/:userId/sessions')
$sessions[$key] = $session; $sessions[$key] = $session;
} }
$response->dynamic(new Document([ $response->dynamic2(new Document([
'sum' => count($sessions), 'sum' => count($sessions),
'sessions' => $sessions 'sessions' => $sessions
]), Response::MODEL_SESSION_LIST); ]), Response::MODEL_SESSION_LIST);
}, ['response', 'projectDB', 'locale']); }, ['response', 'dbForInternal', 'locale']);
App::get('/v1/users/:userId/logs') App::get('/v1/users/:userId/logs')
->desc('Get User Logs') ->desc('Get User Logs')
@ -231,20 +212,20 @@ App::get('/v1/users/:userId/logs')
->inject('response') ->inject('response')
->inject('register') ->inject('register')
->inject('project') ->inject('project')
->inject('projectDB') ->inject('dbForInternal')
->inject('locale') ->inject('locale')
->inject('geodb') ->inject('geodb')
->action(function ($userId, $response, $register, $project, $projectDB, $locale, $geodb) { ->action(function ($userId, $response, $register, $project, $dbForInternal, $locale, $geodb) {
/** @var Appwrite\Utopia\Response $response */ /** @var Appwrite\Utopia\Response $response */
/** @var Utopia\Registry\Registry $register */ /** @var Utopia\Registry\Registry $register */
/** @var Appwrite\Database\Document $project */ /** @var Appwrite\Database\Document $project */
/** @var Appwrite\Database\Database $projectDB */ /** @var Utopia\Database\Database $dbForInternal */
/** @var Utopia\Locale\Locale $locale */ /** @var Utopia\Locale\Locale $locale */
/** @var MaxMind\Db\Reader $geodb */ /** @var MaxMind\Db\Reader $geodb */
$user = $projectDB->getDocument($userId); $user = $dbForInternal->getDocument('users', $userId);
if (empty($user->getId()) || Database::SYSTEM_COLLECTION_USERS != $user->getCollection()) { if (empty($user->getId())) {
throw new Exception('User not found', 404); throw new Exception('User not found', 404);
} }
@ -327,7 +308,7 @@ App::get('/v1/users/:userId/logs')
} }
} }
$response->dynamic(new Document(['logs' => $output]), Response::MODEL_LOG_LIST); $response->dynamic2(new Document(['logs' => $output]), Response::MODEL_LOG_LIST);
}); });
App::patch('/v1/users/:userId/status') App::patch('/v1/users/:userId/status')
@ -345,26 +326,20 @@ App::patch('/v1/users/:userId/status')
->param('userId', '', new UID(), 'User unique ID.') ->param('userId', '', new UID(), 'User unique ID.')
->param('status', '', new WhiteList([Auth::USER_STATUS_ACTIVATED, Auth::USER_STATUS_BLOCKED, Auth::USER_STATUS_UNACTIVATED], true), 'User Status code. To activate the user pass '.Auth::USER_STATUS_ACTIVATED.', to block the user pass '.Auth::USER_STATUS_BLOCKED.' and for disabling the user pass '.Auth::USER_STATUS_UNACTIVATED) ->param('status', '', new WhiteList([Auth::USER_STATUS_ACTIVATED, Auth::USER_STATUS_BLOCKED, Auth::USER_STATUS_UNACTIVATED], true), 'User Status code. To activate the user pass '.Auth::USER_STATUS_ACTIVATED.', to block the user pass '.Auth::USER_STATUS_BLOCKED.' and for disabling the user pass '.Auth::USER_STATUS_UNACTIVATED)
->inject('response') ->inject('response')
->inject('projectDB') ->inject('dbForInternal')
->action(function ($userId, $status, $response, $projectDB) { ->action(function ($userId, $status, $response, $dbForInternal) {
/** @var Appwrite\Utopia\Response $response */ /** @var Appwrite\Utopia\Response $response */
/** @var Appwrite\Database\Database $projectDB */ /** @var Utopia\Database\Database $dbForInternal */
$user = $projectDB->getDocument($userId); $user = $dbForInternal->getDocument('users', $userId);
if (empty($user->getId()) || Database::SYSTEM_COLLECTION_USERS != $user->getCollection()) { if (empty($user->getId())) {
throw new Exception('User not found', 404); throw new Exception('User not found', 404);
} }
$user = $projectDB->updateDocument(\array_merge($user->getArrayCopy(), [ $user = $dbForInternal->updateDocument('users', $user->getId(), $user->setAttribute('status', (int)$status));
'status' => (int)$status,
]));
if (false === $user) { $response->dynamic2($user, Response::MODEL_USER);
throw new Exception('Failed saving user to DB', 500);
}
$response->dynamic($user, Response::MODEL_USER);
}); });
App::patch('/v1/users/:userId/prefs') App::patch('/v1/users/:userId/prefs')
@ -382,26 +357,20 @@ App::patch('/v1/users/:userId/prefs')
->param('userId', '', new UID(), 'User unique ID.') ->param('userId', '', new UID(), 'User unique ID.')
->param('prefs', '', new Assoc(), 'Prefs key-value JSON object.') ->param('prefs', '', new Assoc(), 'Prefs key-value JSON object.')
->inject('response') ->inject('response')
->inject('projectDB') ->inject('dbForInternal')
->action(function ($userId, $prefs, $response, $projectDB) { ->action(function ($userId, $prefs, $response, $dbForInternal) {
/** @var Appwrite\Utopia\Response $response */ /** @var Appwrite\Utopia\Response $response */
/** @var Appwrite\Database\Database $projectDB */ /** @var Utopia\Database\Database $dbForInternal */
$user = $projectDB->getDocument($userId); $user = $dbForInternal->getDocument('users', $userId);
if (empty($user->getId()) || Database::SYSTEM_COLLECTION_USERS != $user->getCollection()) { if ($user->isEmpty()) {
throw new Exception('User not found', 404); throw new Exception('User not found', 404);
} }
$user = $projectDB->updateDocument(\array_merge($user->getArrayCopy(), [ $user = $dbForInternal->updateDocument('users', $user->getId(), $user->setAttribute('prefs', $prefs));
'prefs' => $prefs,
]));
if (false === $user) { $response->dynamic2(new Document($prefs), Response::MODEL_PREFERENCES);
throw new Exception('Failed saving user to DB', 500);
}
$response->dynamic(new Document($prefs), Response::MODEL_PREFERENCES);
}); });
App::delete('/v1/users/:userId/sessions/:sessionId') App::delete('/v1/users/:userId/sessions/:sessionId')
@ -418,32 +387,34 @@ App::delete('/v1/users/:userId/sessions/:sessionId')
->param('userId', '', new UID(), 'User unique ID.') ->param('userId', '', new UID(), 'User unique ID.')
->param('sessionId', null, new UID(), 'User unique session ID.') ->param('sessionId', null, new UID(), 'User unique session ID.')
->inject('response') ->inject('response')
->inject('projectDB') ->inject('dbForInternal')
->inject('events') ->inject('events')
->action(function ($userId, $sessionId, $response, $projectDB, $events) { ->action(function ($userId, $sessionId, $response, $dbForInternal, $events) {
/** @var Appwrite\Utopia\Response $response */ /** @var Appwrite\Utopia\Response $response */
/** @var Appwrite\Database\Database $projectDB */ /** @var Utopia\Database\Database $dbForInternal */
/** @var Appwrite\Event\Event $events */ /** @var Appwrite\Event\Event $events */
$user = $projectDB->getDocument($userId); $user = $dbForInternal->getDocument('users', $userId);
if (empty($user->getId()) || Database::SYSTEM_COLLECTION_USERS != $user->getCollection()) { if (empty($user->getId())) {
throw new Exception('User not found', 404); throw new Exception('User not found', 404);
} }
$sessions = $user->getAttribute('sessions', []); $sessions = $user->getAttribute('sessions', []);
foreach ($sessions as $session) { foreach ($sessions as $key => $session) {
/** @var Document $session */ /** @var Document $session */
if ($sessionId == $session->getId()) { if ($sessionId == $session->getId()) {
if (!$projectDB->deleteDocument($session->getId())) { unset($sessions[$key]);
throw new Exception('Failed to remove token from DB', 500);
}
$user->setAttribute('sessions', $sessions);
$events $events
->setParam('eventData', $response->output($user, Response::MODEL_USER)) ->setParam('eventData', $response->output2($user, Response::MODEL_USER))
; ;
$dbForInternal->updateDocument('users', $user->getId(), $user);
} }
} }
@ -464,31 +435,25 @@ App::delete('/v1/users/:userId/sessions')
->label('sdk.response.model', Response::MODEL_NONE) ->label('sdk.response.model', Response::MODEL_NONE)
->param('userId', '', new UID(), 'User unique ID.') ->param('userId', '', new UID(), 'User unique ID.')
->inject('response') ->inject('response')
->inject('projectDB') ->inject('dbForInternal')
->inject('events') ->inject('events')
->action(function ($userId, $response, $projectDB, $events) { ->action(function ($userId, $response, $dbForInternal, $events) {
/** @var Appwrite\Utopia\Response $response */ /** @var Appwrite\Utopia\Response $response */
/** @var Appwrite\Database\Database $projectDB */ /** @var Utopia\Database\Database $dbForInternal */
/** @var Appwrite\Event\Event $events */ /** @var Appwrite\Event\Event $events */
$user = $projectDB->getDocument($userId); $user = $dbForInternal->getDocument('users', $userId);
if (empty($user->getId()) || Database::SYSTEM_COLLECTION_USERS != $user->getCollection()) { if (empty($user->getId())) {
throw new Exception('User not found', 404); throw new Exception('User not found', 404);
} }
$sessions = $user->getAttribute('sessions', []); $sessions = $user->getAttribute('sessions', []);
foreach ($sessions as $session) { $dbForInternal->updateDocument('users', $user->getId(), $user);
/** @var Document $session */
if (!$projectDB->deleteDocument($session->getId())) {
throw new Exception('Failed to remove token from DB', 500);
}
}
$events $events
->setParam('eventData', $response->output($user, Response::MODEL_USER)) ->setParam('eventData', $response->output2($user, Response::MODEL_USER))
; ;
// TODO : Response filter implementation // TODO : Response filter implementation
@ -508,39 +473,29 @@ App::delete('/v1/users/:userId')
->label('sdk.response.model', Response::MODEL_NONE) ->label('sdk.response.model', Response::MODEL_NONE)
->param('userId', '', function () {return new UID();}, 'User unique ID.') ->param('userId', '', function () {return new UID();}, 'User unique ID.')
->inject('response') ->inject('response')
->inject('projectDB') ->inject('dbForInternal')
->inject('events') ->inject('events')
->inject('deletes') ->inject('deletes')
->action(function ($userId, $response, $projectDB, $events, $deletes) { ->action(function ($userId, $response, $dbForInternal, $events, $deletes) {
/** @var Appwrite\Utopia\Response $response */ /** @var Appwrite\Utopia\Response $response */
/** @var Appwrite\Database\Database $projectDB */ /** @var Utopia\Database\Database $dbForInternal */
/** @var Appwrite\Event\Event $events */ /** @var Appwrite\Event\Event $events */
/** @var Appwrite\Event\Event $deletes */ /** @var Appwrite\Event\Event $deletes */
$user = $projectDB->getDocument($userId); $user = $dbForInternal->getDocument('users', $userId);
if (empty($user->getId()) || Database::SYSTEM_COLLECTION_USERS != $user->getCollection()) { if ($user->isEmpty()) {
throw new Exception('User not found', 404); throw new Exception('User not found', 404);
} }
if (!$projectDB->deleteDocument($userId)) {
if (!$dbForInternal->deleteDocument('users', $userId)) {
throw new Exception('Failed to remove user from DB', 500); throw new Exception('Failed to remove user from DB', 500);
} }
if (!$projectDB->deleteUniqueKey(md5('users:email='.$user->getAttribute('email', null)))) {
throw new Exception('Failed to remove unique key from DB', 500);
}
$reservedId = $projectDB->createDocument([ // $dbForInternal->createDocument('users', new Document([
'$collection' => Database::SYSTEM_COLLECTION_RESERVED, // '$id' => $userId,
'$id' => $userId, // '$read' => ['*'],
'$permissions' => [ // ]));
'read' => ['*'],
],
]);
if (false === $reservedId) {
throw new Exception('Failed saving reserved id to DB', 500);
}
$deletes $deletes
->setParam('type', DELETE_TYPE_DOCUMENT) ->setParam('type', DELETE_TYPE_DOCUMENT)
@ -548,7 +503,7 @@ App::delete('/v1/users/:userId')
; ;
$events $events
->setParam('eventData', $response->output($user, Response::MODEL_USER)) ->setParam('eventData', $response->output2($user, Response::MODEL_USER))
; ;
// TODO : Response filter implementation // TODO : Response filter implementation

22
app/init.php
View file

@ -406,12 +406,12 @@ App::setResource('clients', function($request, $console, $project) {
return $clients; return $clients;
}, ['request', 'console', 'project']); }, ['request', 'console', 'project']);
App::setResource('user', function($mode, $project, $console, $request, $response, $projectDB, $consoleDB) { App::setResource('user', function($mode, $project, $console, $request, $response, $dbForInternal, $dbForConsole) {
/** @var Utopia\Swoole\Request $request */ /** @var Utopia\Swoole\Request $request */
/** @var Appwrite\Utopia\Response $response */ /** @var Appwrite\Utopia\Response $response */
/** @var Appwrite\Database\Document $project */ /** @var Utopia\Database\Document $project */
/** @var Appwrite\Database\Database $consoleDB */ /** @var Utopia\Database\Database $dbForInternal */
/** @var Appwrite\Database\Database $projectDB */ /** @var Utopia\Database\Database $dbForConsole */
/** @var bool $mode */ /** @var bool $mode */
Authorization::setDefaultStatus(true); Authorization::setDefaultStatus(true);
@ -437,14 +437,14 @@ App::setResource('user', function($mode, $project, $console, $request, $response
$session = Auth::decodeSession(((isset($fallback[Auth::$cookieName])) ? $fallback[Auth::$cookieName] : '')); $session = Auth::decodeSession(((isset($fallback[Auth::$cookieName])) ? $fallback[Auth::$cookieName] : ''));
} }
Auth::$unique = $session['id']; Auth::$unique = $session['id'] ?? '';
Auth::$secret = $session['secret']; Auth::$secret = $session['secret'] ?? '';
if (APP_MODE_ADMIN !== $mode) { if (APP_MODE_ADMIN !== $mode) {
$user = $projectDB->getDocument(Auth::$unique); $user = $dbForInternal->getDocument('users', Auth::$unique);
} }
else { else {
$user = $consoleDB->getDocument(Auth::$unique); $user = $dbForConsole->getDocument('users', Auth::$unique);
$user $user
->setAttribute('$id', 'admin-'.$user->getAttribute('$id')) ->setAttribute('$id', 'admin-'.$user->getAttribute('$id'))
@ -481,7 +481,7 @@ App::setResource('user', function($mode, $project, $console, $request, $response
$jwtSessionId = $payload['sessionId'] ?? ''; $jwtSessionId = $payload['sessionId'] ?? '';
if($jwtUserId && $jwtSessionId) { if($jwtUserId && $jwtSessionId) {
$user = $projectDB->getDocument($jwtUserId); $user = $dbForInternal->getDocument('users', $jwtUserId);
} }
if (empty($user->search('$id', $jwtSessionId, $user->getAttribute('tokens')))) { // Match JWT to active token if (empty($user->search('$id', $jwtSessionId, $user->getAttribute('tokens')))) { // Match JWT to active token
@ -490,7 +490,7 @@ App::setResource('user', function($mode, $project, $console, $request, $response
} }
return $user; return $user;
}, ['mode', 'project', 'console', 'request', 'response', 'projectDB', 'consoleDB']); }, ['mode', 'project', 'console', 'request', 'response', 'dbForInternal', 'dbForConsole']);
App::setResource('project', function($consoleDB, $request) { App::setResource('project', function($consoleDB, $request) {
/** @var Utopia\Swoole\Request $request */ /** @var Utopia\Swoole\Request $request */
@ -500,7 +500,7 @@ App::setResource('project', function($consoleDB, $request) {
Authorization2::disable(); Authorization2::disable();
$project = $consoleDB->getDocument($request->getParam('project', $project = $consoleDB->getDocument($request->getParam('project',
$request->getHeader('x-appwrite-project', ''))); $request->getHeader('x-appwrite-project', 'console')));
Authorization::reset(); Authorization::reset();
Authorization2::reset(); Authorization2::reset();