From 45e72ac60804f14c8dceff3def72136e0e4a3d3c Mon Sep 17 00:00:00 2001
From: eldadfux <eldad.fux@gmail.com>
Date: Tue, 6 Aug 2019 23:31:09 +0300
Subject: [PATCH] Fixed logout

---
 app/views/console/account/index.phtml  | 6 +++---
 app/views/console/settings/index.phtml | 3 ++-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/app/views/console/account/index.phtml b/app/views/console/account/index.phtml
index 6b34e3c0f9..ab651e839c 100644
--- a/app/views/console/account/index.phtml
+++ b/app/views/console/account/index.phtml
@@ -131,7 +131,7 @@ use Utopia\Locale\Locale;
                     <li class="clear">
                         <span data-ls-if="true != {{session.current}}" style="display: none;">
                             <!-- From remote session (-logout event) -->
-                            <form class="pull-end" data-service="auth.logoutById" data-scope="console" data-event="submit" data-loading="<?php echo $this->escape(Locale::getText('general.loading')); ?>" data-success="trigger" data-success-triggers="account.update" data-error="alert" data-error-alert="<?php echo $this->escape(Locale::getText('console.account.section.security.devices.logout.failure')); ?>">
+                            <form class="pull-end" data-service="auth.logoutBySession" data-scope="console" data-event="submit" data-loading="<?php echo $this->escape(Locale::getText('general.loading')); ?>" data-success="trigger" data-success-triggers="account.update" data-error="alert" data-error-alert="<?php echo $this->escape(Locale::getText('console.account.section.security.devices.logout.failure')); ?>">
                                 <input type="hidden" name="userId" data-ls-bind="{{session.id}}">
                                 <button class="danger"><?php echo Locale::getText('console.account.section.security.devices.logout'); ?></button>
                             </form>
@@ -139,7 +139,7 @@ use Utopia\Locale\Locale;
 
                         <span data-ls-if="true == {{session.current}}" style="display: none;">
                             <!-- From current session (+logout event) -->
-                            <form class="pull-end" data-service="auth.logoutById" data-scope="console" data-event="submit" data-loading="<?php echo $this->escape(Locale::getText('general.loading')); ?>" data-success="trigger,redirect" data-success-triggers="logout" data-success-redirect-url="/" data-error="alert" data-error-alert="<?php echo $this->escape(Locale::getText('console.account.section.security.devices.logout.failure')); ?>">
+                            <form class="pull-end" data-service="auth.logoutBySession" data-scope="console" data-event="submit" data-loading="<?php echo $this->escape(Locale::getText('general.loading')); ?>" data-success="trigger,redirect" data-success-triggers="logout" data-success-redirect-url="/" data-error="alert" data-error-alert="<?php echo $this->escape(Locale::getText('console.account.section.security.devices.logout.failure')); ?>">
                                 <input type="hidden" name="userId" data-ls-bind="{{session.id}}">
                                 <button class="danger"><?php echo Locale::getText('console.account.section.security.devices.logout'); ?></button>
                             </form>
@@ -161,7 +161,7 @@ use Utopia\Locale\Locale;
                 </ul>
             </div>
 
-            <form class="inline margin-bottom-large" data-service="auth.logoutById" data-scope="console" data-event="submit" data-success="trigger,redirect" data-success-triggers="account.update" data-success-redirect-url="/" data-error="alert" data-error-alert="<?php echo $this->escape(Locale::getText('console.account.section.security.devices.logout-all')); ?>">
+            <form class="inline margin-bottom-large" data-service="auth.logoutBySession" data-scope="console" data-event="submit" data-success="trigger,redirect" data-success-triggers="account.update" data-success-redirect-url="/" data-error="alert" data-error-alert="<?php echo $this->escape(Locale::getText('console.account.section.security.devices.logout-all')); ?>">
                 <input type="hidden" name="userId" value="0">
                 <button class="danger"><?php echo Locale::getText('console.account.section.security.devices.logout-all'); ?></button>
             </form>
diff --git a/app/views/console/settings/index.phtml b/app/views/console/settings/index.phtml
index 35025d4e3f..7dad245c12 100644
--- a/app/views/console/settings/index.phtml
+++ b/app/views/console/settings/index.phtml
@@ -131,8 +131,9 @@ use Utopia\Locale\Locale;
                     <div class="box margin-bottom">
                         <ul data-ls-loop="members" data-ls-as="member" class="list">
                             <li class="clear">
-                                <form class="pull-end" data-service="auth.leave" data-scope="console" data-event="submit" data-success="alert,trigger" data-success-alert="<?php echo Locale::getText('console.settings.section.members.leave.success'); ?>" data-success-triggers="auth.leave,project.update" data-error="alert" data-error-alert="<?php echo Locale::getText('console.settings.section.members.leave.failure'); ?>">
+                                <form class="pull-end" data-service="team.deleteTeamMembership" data-scope="console" data-event="submit" data-success="alert,trigger" data-success-alert="<?php echo Locale::getText('console.settings.section.members.leave.success'); ?>" data-success-triggers="auth.leave,project.update" data-error="alert" data-error-alert="<?php echo Locale::getText('console.settings.section.members.leave.failure'); ?>">
 
+                                    <input name="teamId" id="teamId" type="hidden" data-ls-bind="{{console-project.teamId}}">
                                     <input name="inviteId" id="inviteId" type="hidden" data-ls-bind="{{member.inviteId}}">
 
                                     <button class="danger"><?php echo Locale::getText('console.settings.section.members.labels.leave'); ?></button>