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

Updated session ID

Browse Source
This commit is contained in:
Eldad Fux
2020-02-15 20:34:16 +02:00
parent 96578c3348
commit ae6999aee3
7 changed files with 24 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/controllers/api/account.php
+6 -6
View File
@@ -848,7 +848,7 @@ $utopia->delete('/v1/account')
}
);
$utopia->delete('/v1/account/sessions/:sessionUid')
$utopia->delete('/v1/account/sessions/:sessionId')
->desc('Delete Account Session')
->label('scope', 'account')
->label('webhook', 'account.sessions.delete')
@@ -857,17 +857,17 @@ $utopia->delete('/v1/account/sessions/:sessionUid')
->label('sdk.method', 'deleteSession')
->label('sdk.description', '/docs/references/account/delete-session.md')
->label('abuse-limit', 100)
->param('sessionUid', null, function () { return new UID(); }, 'Session unique ID. Use the string \'current\' to delete the current device session.')
->param('sessionId', null, function () { return new UID(); }, 'Session unique ID. Use the string \'current\' to delete the current device session.')
->action(
function ($sessionUid) use ($response, $request, $user, $projectDB, $webhook, $audit) {
$sessionUid = ($sessionUid === 'current')
function ($sessionId) use ($response, $request, $user, $projectDB, $webhook, $audit) {
$sessionId = ($sessionId === 'current')
? Auth::tokenVerify($user->getAttribute('tokens'), Auth::TOKEN_TYPE_LOGIN, Auth::$secret)
: $sessionUid;
: $sessionId;
$tokens = $user->getAttribute('tokens', []);
foreach ($tokens as $token) { /* @var $token Document */
if (($sessionUid == $token->getUid()) && Auth::TOKEN_TYPE_LOGIN == $token->getAttribute('type')) {
if (($sessionId == $token->getUid()) && Auth::TOKEN_TYPE_LOGIN == $token->getAttribute('type')) {
if (!$projectDB->deleteDocument($token->getUid())) {
throw new Exception('Failed to remove token from DB', 500);
}
app/views/console/account/index.phtml
+3 -3
View File
@@ -130,7 +130,7 @@
data-failure-param-alert-text="Logout failed"
data-failure-param-alert-classname="error">
<input type="hidden" name="sessionUid" value="current">
<input type="hidden" name="sessionId" value="current">
<button class="fill danger icon fill"><i class="icon-login"></i> Logout</button>
</form>
@@ -213,7 +213,7 @@
data-failure-param-alert-text="Logout from Session Failed"
data-failure-param-alert-classname="error">
<input type="hidden" name="sessionUid" data-ls-bind="{{session.$uid}}">
<input type="hidden" name="sessionId" data-ls-bind="{{session.$uid}}">
<button class="danger">Logout</button>
</form>
</span>
@@ -234,7 +234,7 @@
data-failure="alert"
data-failure-param-alert-text="Logout from Session Failed"
data-failure-param-alert-classname="error">
<input type="hidden" name="sessionUid" data-ls-bind="{{session.$uid}}">
<input type="hidden" name="sessionId" data-ls-bind="{{session.$uid}}">
<button class="danger">Logout</button>
</form>
</span>