1
0
Fork 0
mirror of synced 2024-10-01 01:37:56 +13:00

Merge pull request #4631 from appwrite/feat-fix-account-naming

Updated titles on account routes
This commit is contained in:
Eldad A. Fux 2022-11-03 18:19:41 +02:00 committed by GitHub
commit 44ca7d9459
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -5,7 +5,6 @@ use Appwrite\Auth\Auth;
use Appwrite\Auth\Validator\Password; use Appwrite\Auth\Validator\Password;
use Appwrite\Auth\Validator\Phone; use Appwrite\Auth\Validator\Phone;
use Appwrite\Detector\Detector; use Appwrite\Detector\Detector;
use Appwrite\Event\Audit;
use Appwrite\Event\Event; use Appwrite\Event\Event;
use Appwrite\Event\Mail; use Appwrite\Event\Mail;
use Appwrite\Event\Phone as EventPhone; use Appwrite\Event\Phone as EventPhone;
@ -39,7 +38,6 @@ use Utopia\Database\Validator\UID;
use Utopia\Locale\Locale; use Utopia\Locale\Locale;
use Utopia\Validator\ArrayList; use Utopia\Validator\ArrayList;
use Utopia\Validator\Assoc; use Utopia\Validator\Assoc;
use Utopia\Validator\Range;
use Utopia\Validator\Text; use Utopia\Validator\Text;
use Utopia\Validator\WhiteList; use Utopia\Validator\WhiteList;
@ -141,7 +139,7 @@ App::post('/v1/account')
App::post('/v1/account/sessions/email') App::post('/v1/account/sessions/email')
->alias('/v1/account/sessions') ->alias('/v1/account/sessions')
->desc('Create Account Session with Email') ->desc('Create Email Session')
->groups(['api', 'account', 'auth']) ->groups(['api', 'account', 'auth'])
->label('event', 'users.[userId].sessions.[sessionId].create') ->label('event', 'users.[userId].sessions.[sessionId].create')
->label('scope', 'public') ->label('scope', 'public')
@ -255,7 +253,7 @@ App::post('/v1/account/sessions/email')
}); });
App::get('/v1/account/sessions/oauth2/:provider') App::get('/v1/account/sessions/oauth2/:provider')
->desc('Create Account Session with OAuth2') ->desc('Create OAuth2 Session')
->groups(['api', 'account']) ->groups(['api', 'account'])
->label('error', __DIR__ . '/../../views/general/error.phtml') ->label('error', __DIR__ . '/../../views/general/error.phtml')
->label('scope', 'public') ->label('scope', 'public')
@ -1223,7 +1221,7 @@ App::post('/v1/account/sessions/anonymous')
}); });
App::post('/v1/account/jwt') App::post('/v1/account/jwt')
->desc('Create Account JWT') ->desc('Create JWT')
->groups(['api', 'account', 'auth']) ->groups(['api', 'account', 'auth'])
->label('scope', 'account') ->label('scope', 'account')
->label('auth.type', 'jwt') ->label('auth.type', 'jwt')
@ -1310,7 +1308,7 @@ App::get('/v1/account/prefs')
}); });
App::get('/v1/account/sessions') App::get('/v1/account/sessions')
->desc('List Account Sessions') ->desc('List Sessions')
->groups(['api', 'account']) ->groups(['api', 'account'])
->label('scope', 'account') ->label('scope', 'account')
->label('usage.metric', 'users.{scope}.requests.read') ->label('usage.metric', 'users.{scope}.requests.read')
@ -1345,7 +1343,7 @@ App::get('/v1/account/sessions')
}); });
App::get('/v1/account/logs') App::get('/v1/account/logs')
->desc('List Account Logs') ->desc('List Logs')
->groups(['api', 'account']) ->groups(['api', 'account'])
->label('scope', 'account') ->label('scope', 'account')
->label('usage.metric', 'users.{scope}.requests.read') ->label('usage.metric', 'users.{scope}.requests.read')
@ -1406,7 +1404,7 @@ App::get('/v1/account/logs')
}); });
App::get('/v1/account/sessions/:sessionId') App::get('/v1/account/sessions/:sessionId')
->desc('Get Session By ID') ->desc('Get Session')
->groups(['api', 'account']) ->groups(['api', 'account'])
->label('scope', 'account') ->label('scope', 'account')
->label('usage.metric', 'users.{scope}.requests.read') ->label('usage.metric', 'users.{scope}.requests.read')
@ -1446,7 +1444,7 @@ App::get('/v1/account/sessions/:sessionId')
}); });
App::patch('/v1/account/name') App::patch('/v1/account/name')
->desc('Update Account Name') ->desc('Update Name')
->groups(['api', 'account']) ->groups(['api', 'account'])
->label('event', 'users.[userId].update.name') ->label('event', 'users.[userId].update.name')
->label('scope', 'account') ->label('scope', 'account')
@ -1477,7 +1475,7 @@ App::patch('/v1/account/name')
}); });
App::patch('/v1/account/password') App::patch('/v1/account/password')
->desc('Update Account Password') ->desc('Update Password')
->groups(['api', 'account']) ->groups(['api', 'account'])
->label('event', 'users.[userId].update.password') ->label('event', 'users.[userId].update.password')
->label('scope', 'account') ->label('scope', 'account')
@ -1517,7 +1515,7 @@ App::patch('/v1/account/password')
}); });
App::patch('/v1/account/email') App::patch('/v1/account/email')
->desc('Update Account Email') ->desc('Update Email')
->groups(['api', 'account']) ->groups(['api', 'account'])
->label('event', 'users.[userId].update.email') ->label('event', 'users.[userId].update.email')
->label('scope', 'account') ->label('scope', 'account')
@ -1569,7 +1567,7 @@ App::patch('/v1/account/email')
}); });
App::patch('/v1/account/phone') App::patch('/v1/account/phone')
->desc('Update Account Phone') ->desc('Update Phone')
->groups(['api', 'account']) ->groups(['api', 'account'])
->label('event', 'users.[userId].update.phone') ->label('event', 'users.[userId].update.phone')
->label('scope', 'account') ->label('scope', 'account')
@ -1617,7 +1615,7 @@ App::patch('/v1/account/phone')
}); });
App::patch('/v1/account/prefs') App::patch('/v1/account/prefs')
->desc('Update Account Preferences') ->desc('Update Preferences')
->groups(['api', 'account']) ->groups(['api', 'account'])
->label('event', 'users.[userId].update.prefs') ->label('event', 'users.[userId].update.prefs')
->label('scope', 'account') ->label('scope', 'account')
@ -1646,7 +1644,7 @@ App::patch('/v1/account/prefs')
}); });
App::patch('/v1/account/status') App::patch('/v1/account/status')
->desc('Update Account Status') ->desc('Update Status')
->groups(['api', 'account']) ->groups(['api', 'account'])
->label('event', 'users.[userId].update.status') ->label('event', 'users.[userId].update.status')
->label('scope', 'account') ->label('scope', 'account')
@ -1681,7 +1679,7 @@ App::patch('/v1/account/status')
}); });
App::delete('/v1/account/sessions/:sessionId') App::delete('/v1/account/sessions/:sessionId')
->desc('Delete Account Session') ->desc('Delete Session')
->groups(['api', 'account']) ->groups(['api', 'account'])
->label('scope', 'account') ->label('scope', 'account')
->label('event', 'users.[userId].sessions.[sessionId].delete') ->label('event', 'users.[userId].sessions.[sessionId].delete')
@ -1752,7 +1750,7 @@ App::delete('/v1/account/sessions/:sessionId')
}); });
App::patch('/v1/account/sessions/:sessionId') App::patch('/v1/account/sessions/:sessionId')
->desc('Update Session (Refresh Tokens)') ->desc('Update OAuth Session (Refresh Tokens)')
->groups(['api', 'account']) ->groups(['api', 'account'])
->label('scope', 'account') ->label('scope', 'account')
->label('event', 'users.[userId].sessions.[sessionId].update') ->label('event', 'users.[userId].sessions.[sessionId].update')
@ -1834,7 +1832,7 @@ App::patch('/v1/account/sessions/:sessionId')
}); });
App::delete('/v1/account/sessions') App::delete('/v1/account/sessions')
->desc('Delete All Account Sessions') ->desc('Delete Sessions')
->groups(['api', 'account']) ->groups(['api', 'account'])
->label('scope', 'account') ->label('scope', 'account')
->label('event', 'users.[userId].sessions.[sessionId].delete') ->label('event', 'users.[userId].sessions.[sessionId].delete')
@ -1886,8 +1884,6 @@ App::delete('/v1/account/sessions')
$dbForProject->deleteCachedDocument('users', $user->getId()); $dbForProject->deleteCachedDocument('users', $user->getId());
$numOfSessions = count($sessions);
$events $events
->setParam('userId', $user->getId()) ->setParam('userId', $user->getId())
->setParam('sessionId', $session->getId()); ->setParam('sessionId', $session->getId());