From 5149b3880aac2c2dfeb554aed995bedf3fb7806a Mon Sep 17 00:00:00 2001
From: Torsten Dittmann <torsten.dittmann@googlemail.com>
Date: Thu, 20 May 2021 16:03:47 +0200
Subject: [PATCH] refactor(console): users devices into session

---
 app/config/auth.php                                 |   2 +-
 app/views/console/users/index.phtml                 |   3 ++-
 app/views/console/users/user.phtml                  |  10 ++++++----
 public/images/users/{oauth2 => }/amazon.png         | Bin
 public/images/users/{oauth2 => }/apple.png          | Bin
 public/images/users/{oauth2 => }/bitbucket.png      | Bin
 public/images/users/{oauth2 => }/bitly.png          | Bin
 public/images/users/{oauth2 => }/box.png            | Bin
 public/images/users/{oauth2 => }/discord.png        | Bin
 public/images/users/{oauth2 => }/dropbox.png        | Bin
 .../images/users/{email-password.png => email.png}  | Bin
 public/images/users/{oauth2 => }/facebook.png       | Bin
 public/images/users/{oauth2 => }/github.png         | Bin
 public/images/users/{oauth2 => }/gitlab.png         | Bin
 public/images/users/{oauth2 => }/google.png         | Bin
 public/images/users/{oauth2 => }/linkedin.png       | Bin
 public/images/users/{oauth2 => }/microsoft.png      | Bin
 public/images/users/{oauth2 => }/paypal.png         | Bin
 public/images/users/{oauth2 => }/paypalsandbox.png  | Bin
 public/images/users/{oauth2 => }/salesforce.png     | Bin
 public/images/users/{oauth2 => }/slack.png          | Bin
 public/images/users/{oauth2 => }/spotify.png        | Bin
 public/images/users/{oauth2 => }/tradeshift.png     | Bin
 public/images/users/{oauth2 => }/tradeshiftbox.png  | Bin
 public/images/users/{oauth2 => }/twitch.png         | Bin
 public/images/users/{oauth2 => }/twitter.png        | Bin
 public/images/users/{oauth2 => }/vk.png             | Bin
 public/images/users/{oauth2 => }/wordpress.png      | Bin
 public/images/users/{oauth2 => }/yahoo.png          | Bin
 public/images/users/{oauth2 => }/yandex.png         | Bin
 30 files changed, 9 insertions(+), 6 deletions(-)
 rename public/images/users/{oauth2 => }/amazon.png (100%)
 rename public/images/users/{oauth2 => }/apple.png (100%)
 rename public/images/users/{oauth2 => }/bitbucket.png (100%)
 rename public/images/users/{oauth2 => }/bitly.png (100%)
 rename public/images/users/{oauth2 => }/box.png (100%)
 rename public/images/users/{oauth2 => }/discord.png (100%)
 rename public/images/users/{oauth2 => }/dropbox.png (100%)
 rename public/images/users/{email-password.png => email.png} (100%)
 rename public/images/users/{oauth2 => }/facebook.png (100%)
 rename public/images/users/{oauth2 => }/github.png (100%)
 rename public/images/users/{oauth2 => }/gitlab.png (100%)
 rename public/images/users/{oauth2 => }/google.png (100%)
 rename public/images/users/{oauth2 => }/linkedin.png (100%)
 rename public/images/users/{oauth2 => }/microsoft.png (100%)
 rename public/images/users/{oauth2 => }/paypal.png (100%)
 rename public/images/users/{oauth2 => }/paypalsandbox.png (100%)
 rename public/images/users/{oauth2 => }/salesforce.png (100%)
 rename public/images/users/{oauth2 => }/slack.png (100%)
 rename public/images/users/{oauth2 => }/spotify.png (100%)
 rename public/images/users/{oauth2 => }/tradeshift.png (100%)
 rename public/images/users/{oauth2 => }/tradeshiftbox.png (100%)
 rename public/images/users/{oauth2 => }/twitch.png (100%)
 rename public/images/users/{oauth2 => }/twitter.png (100%)
 rename public/images/users/{oauth2 => }/vk.png (100%)
 rename public/images/users/{oauth2 => }/wordpress.png (100%)
 rename public/images/users/{oauth2 => }/yahoo.png (100%)
 rename public/images/users/{oauth2 => }/yandex.png (100%)

diff --git a/app/config/auth.php b/app/config/auth.php
index 8e718e6804..11b89dd9ec 100644
--- a/app/config/auth.php
+++ b/app/config/auth.php
@@ -6,7 +6,7 @@ return [
     'email-password' => [
         'name' => 'Email/Password',
         'key' => 'usersAuthEmailPassword',
-        'icon' => '/images/users/email-password.png',
+        'icon' => '/images/users/email.png',
         'docs' => 'https://appwrite.io/docs/client/account?sdk=web#accountCreateSession',
         'enabled' => true,
     ],
diff --git a/app/views/console/users/index.phtml b/app/views/console/users/index.phtml
index 8cb4b7e55c..0b5641807b 100644
--- a/app/views/console/users/index.phtml
+++ b/app/views/console/users/index.phtml
@@ -78,6 +78,7 @@ $auth = $this->getParam('auth', []);
                                         <a data-ls-attrs="href=/console/users/user?id={{user.$id}}&project={{router.params.project}}">
                                             <span data-ls-bind="{{user.name}}"></span>
                                             <span data-ls-if="{{user.name|escape}} === ''">-----</span>
+                                            <span data-ls-if="{{user.email}} === ''">Anonymous User</span>
                                         </a>
                                     </td>
                                     <td data-title="Email: ">
@@ -479,7 +480,7 @@ $auth = $this->getParam('auth', []);
                                     <button class="switch pull-end" data-ls-ui-trigger="provider-update-<?php echo $this->escape($provider); ?>"></button>
                                 </span>
 
-                                <img src="/images/users/oauth2/<?php echo $this->escape(strtolower($provider)); ?>.png?buster=<?php echo APP_CACHE_BUSTER; ?>" alt="<?php echo $this->escape(ucfirst($provider)); ?> Logo" class="pull-start provider margin-end" />
+                                <img src="/images/users/<?php echo $this->escape(strtolower($provider)); ?>.png?buster=<?php echo APP_CACHE_BUSTER; ?>" alt="<?php echo $this->escape(ucfirst($provider)); ?> Logo" class="pull-start provider margin-end" />
                                 
                                 <span class="text-size-small">
                                     <?php echo $this->escape($name); ?> <?php if($sandbox): ?><span class="text-size-xs text-fade">sandbox</span><?php endif; ?> <?php if($beta): ?><span class="text-size-xs text-fade">beta</span><?php endif; ?>
diff --git a/app/views/console/users/user.phtml b/app/views/console/users/user.phtml
index 048d870071..b9dfcb8ea3 100644
--- a/app/views/console/users/user.phtml
+++ b/app/views/console/users/user.phtml
@@ -12,7 +12,8 @@
             <br />
 
             <span data-ls-bind="{{user.name}}">&nbsp;</span>
-            <span data-ls-if="{{user.name}} === ''">Unknown</span>
+            <span data-ls-if="{{user.name}} === '' && {{user.email}} !== ''">Unknown</span>
+            <span data-ls-if="{{user.name}} === '' && {{user.email}} === ''">Anonymous User</span>
         </h1>
     </div>
 
@@ -180,8 +181,8 @@
                     </div>
                 </div>
             </li>
-            <li data-state="/console/users/user/devices?id={{router.params.id}}&project={{router.params.project}}">
-                <h2>Devices</h2>
+            <li data-state="/console/users/user/sessions?id={{router.params.id}}&project={{router.params.project}}">
+                <h2>Sessions</h2>
 
                 <div
                     data-service="users.getSessions"
@@ -218,6 +219,7 @@
                                     </form>
 
                                     <img onerror="this.onerror=null;this.src='/images/unknown.svg'" data-ls-attrs="src={{env.API}}/avatars/browsers/{{session.clientCode|lowercase}}?width=120&height=120&project={{env.PROJECT}},title={{session.clientName}},alt={{session.clientName}}" class="avatar trans pull-start margin-end" />
+                                    <img data-ls-attrs="src=/images/users/{{session.provider}}.png?buster=<?php echo APP_CACHE_BUSTER; ?>,title={{session.provider}},alt={{session.provider}}" class="avatar trans pull-start margin-end" />
 
                                     <span data-ls-bind="{{session.clientName}}"></span> <span data-ls-bind="{{session.clientVersion}}"></span> on <span data-ls-bind="{{session.deviceModel}}"></span> <span data-ls-bind="{{session.osName}}"></span> <span data-ls-bind="{{session.osVersion}}"></span>
 
@@ -244,7 +246,7 @@
                             data-failure-param-alert-text="Failed to logout all sessions"
                             data-failure-param-alert-classname="error">
                             
-                            <button class="danger">Logout from all devices</button>
+                            <button class="danger">Logout from all sessions</button>
                         </form>
                     </div>
                 </div>
diff --git a/public/images/users/oauth2/amazon.png b/public/images/users/amazon.png
similarity index 100%
rename from public/images/users/oauth2/amazon.png
rename to public/images/users/amazon.png
diff --git a/public/images/users/oauth2/apple.png b/public/images/users/apple.png
similarity index 100%
rename from public/images/users/oauth2/apple.png
rename to public/images/users/apple.png
diff --git a/public/images/users/oauth2/bitbucket.png b/public/images/users/bitbucket.png
similarity index 100%
rename from public/images/users/oauth2/bitbucket.png
rename to public/images/users/bitbucket.png
diff --git a/public/images/users/oauth2/bitly.png b/public/images/users/bitly.png
similarity index 100%
rename from public/images/users/oauth2/bitly.png
rename to public/images/users/bitly.png
diff --git a/public/images/users/oauth2/box.png b/public/images/users/box.png
similarity index 100%
rename from public/images/users/oauth2/box.png
rename to public/images/users/box.png
diff --git a/public/images/users/oauth2/discord.png b/public/images/users/discord.png
similarity index 100%
rename from public/images/users/oauth2/discord.png
rename to public/images/users/discord.png
diff --git a/public/images/users/oauth2/dropbox.png b/public/images/users/dropbox.png
similarity index 100%
rename from public/images/users/oauth2/dropbox.png
rename to public/images/users/dropbox.png
diff --git a/public/images/users/email-password.png b/public/images/users/email.png
similarity index 100%
rename from public/images/users/email-password.png
rename to public/images/users/email.png
diff --git a/public/images/users/oauth2/facebook.png b/public/images/users/facebook.png
similarity index 100%
rename from public/images/users/oauth2/facebook.png
rename to public/images/users/facebook.png
diff --git a/public/images/users/oauth2/github.png b/public/images/users/github.png
similarity index 100%
rename from public/images/users/oauth2/github.png
rename to public/images/users/github.png
diff --git a/public/images/users/oauth2/gitlab.png b/public/images/users/gitlab.png
similarity index 100%
rename from public/images/users/oauth2/gitlab.png
rename to public/images/users/gitlab.png
diff --git a/public/images/users/oauth2/google.png b/public/images/users/google.png
similarity index 100%
rename from public/images/users/oauth2/google.png
rename to public/images/users/google.png
diff --git a/public/images/users/oauth2/linkedin.png b/public/images/users/linkedin.png
similarity index 100%
rename from public/images/users/oauth2/linkedin.png
rename to public/images/users/linkedin.png
diff --git a/public/images/users/oauth2/microsoft.png b/public/images/users/microsoft.png
similarity index 100%
rename from public/images/users/oauth2/microsoft.png
rename to public/images/users/microsoft.png
diff --git a/public/images/users/oauth2/paypal.png b/public/images/users/paypal.png
similarity index 100%
rename from public/images/users/oauth2/paypal.png
rename to public/images/users/paypal.png
diff --git a/public/images/users/oauth2/paypalsandbox.png b/public/images/users/paypalsandbox.png
similarity index 100%
rename from public/images/users/oauth2/paypalsandbox.png
rename to public/images/users/paypalsandbox.png
diff --git a/public/images/users/oauth2/salesforce.png b/public/images/users/salesforce.png
similarity index 100%
rename from public/images/users/oauth2/salesforce.png
rename to public/images/users/salesforce.png
diff --git a/public/images/users/oauth2/slack.png b/public/images/users/slack.png
similarity index 100%
rename from public/images/users/oauth2/slack.png
rename to public/images/users/slack.png
diff --git a/public/images/users/oauth2/spotify.png b/public/images/users/spotify.png
similarity index 100%
rename from public/images/users/oauth2/spotify.png
rename to public/images/users/spotify.png
diff --git a/public/images/users/oauth2/tradeshift.png b/public/images/users/tradeshift.png
similarity index 100%
rename from public/images/users/oauth2/tradeshift.png
rename to public/images/users/tradeshift.png
diff --git a/public/images/users/oauth2/tradeshiftbox.png b/public/images/users/tradeshiftbox.png
similarity index 100%
rename from public/images/users/oauth2/tradeshiftbox.png
rename to public/images/users/tradeshiftbox.png
diff --git a/public/images/users/oauth2/twitch.png b/public/images/users/twitch.png
similarity index 100%
rename from public/images/users/oauth2/twitch.png
rename to public/images/users/twitch.png
diff --git a/public/images/users/oauth2/twitter.png b/public/images/users/twitter.png
similarity index 100%
rename from public/images/users/oauth2/twitter.png
rename to public/images/users/twitter.png
diff --git a/public/images/users/oauth2/vk.png b/public/images/users/vk.png
similarity index 100%
rename from public/images/users/oauth2/vk.png
rename to public/images/users/vk.png
diff --git a/public/images/users/oauth2/wordpress.png b/public/images/users/wordpress.png
similarity index 100%
rename from public/images/users/oauth2/wordpress.png
rename to public/images/users/wordpress.png
diff --git a/public/images/users/oauth2/yahoo.png b/public/images/users/yahoo.png
similarity index 100%
rename from public/images/users/oauth2/yahoo.png
rename to public/images/users/yahoo.png
diff --git a/public/images/users/oauth2/yandex.png b/public/images/users/yandex.png
similarity index 100%
rename from public/images/users/oauth2/yandex.png
rename to public/images/users/yandex.png