From 9ad8e5f56a6e544fca4c13086556ed7db73c3775 Mon Sep 17 00:00:00 2001
From: Andreas Brett <github@abrett.de>
Date: Fri, 22 Oct 2021 13:05:52 +0200
Subject: [PATCH 1/9] show logged in user

---
 server/server.js       | 21 +++++++++++++++++++++
 src/languages/de-DE.js |  1 +
 src/languages/en.js    |  1 +
 src/pages/Settings.vue |  8 ++++++++
 4 files changed, 31 insertions(+)

diff --git a/server/server.js b/server/server.js
index c4d18869..9b670b76 100644
--- a/server/server.js
+++ b/server/server.js
@@ -865,6 +865,27 @@ exports.entryPage = "dashboard";
             }
         });
 
+        socket.on("getUsername", async (callback) => {
+            try {
+                checkLogin(socket);
+
+                let user = await R.findOne("user", " id = ? AND active = 1 ", [
+                    socket.userID,
+                ]);
+
+                callback({
+                    ok: true,
+                    data: user.username,
+                });
+
+            } catch (e) {
+                callback({
+                    ok: false,
+                    msg: e.message,
+                });
+            }
+        });
+
         socket.on("getSettings", async (callback) => {
             try {
                 checkLogin(socket);
diff --git a/src/languages/de-DE.js b/src/languages/de-DE.js
index 5e69899d..0e47701e 100644
--- a/src/languages/de-DE.js
+++ b/src/languages/de-DE.js
@@ -197,4 +197,5 @@ export default {
     pushbullet: "Pushbullet",
     line: "Line Messenger",
     mattermost: "Mattermost",
+    "Current User": "Aktueller Benutzer",
 };
diff --git a/src/languages/en.js b/src/languages/en.js
index 4542d72b..bb8d9635 100644
--- a/src/languages/en.js
+++ b/src/languages/en.js
@@ -305,4 +305,5 @@ export default {
     "One record": "One record",
     "Showing {from} to {to} of {count} records": "Showing {from} to {to} of {count} records",
     steamApiKeyDescription: "For monitoring a Steam Gameserver you need a steam Web-API key. You can register your api key here: ",
+    "Current User": "Current User",
 };
diff --git a/src/pages/Settings.vue b/src/pages/Settings.vue
index dc019853..29209810 100644
--- a/src/pages/Settings.vue
+++ b/src/pages/Settings.vue
@@ -149,6 +149,7 @@
                             <!-- Change Password -->
                             <template v-if="! settings.disableAuth">
                                 <h2 class="mt-5 mb-2">{{ $t("Change Password") }}</h2>
+                                <p>{{ $t("Current User") }}: <strong>{{ this.username }}</strong></p>
                                 <form class="mb-3" @submit.prevent="savePassword">
                                     <div class="mb-3">
                                         <label for="current-password" class="form-label">{{ $t("Current Password") }}</label>
@@ -459,6 +460,7 @@ export default {
     },
 
     mounted() {
+        this.loadUsername();
         this.loadSettings();
     },
 
@@ -484,6 +486,12 @@ export default {
             }
         },
 
+        loadUsername() {
+            this.$root.getSocket().emit("getUsername", (res) => {
+                this.username = res.data;
+            });
+        },
+
         loadSettings() {
             this.$root.getSocket().emit("getSettings", (res) => {
                 this.settings = res.data;

From 93c231b4d9803794f821595e5caf2c6af60b1539 Mon Sep 17 00:00:00 2001
From: Andreas Brett <andreasbrett@users.noreply.github.com>
Date: Sat, 23 Oct 2021 01:52:02 +0200
Subject: [PATCH 2/9] Update server/server.js

Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
---
 server/server.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/server/server.js b/server/server.js
index 9b670b76..cf78ab8b 100644
--- a/server/server.js
+++ b/server/server.js
@@ -877,7 +877,6 @@ exports.entryPage = "dashboard";
                     ok: true,
                     data: user.username,
                 });
-
             } catch (e) {
                 callback({
                     ok: false,

From abdf1ae90a1f25afc3fb6bed99f7c661048b02e6 Mon Sep 17 00:00:00 2001
From: Andreas Brett <andreasbrett@users.noreply.github.com>
Date: Sat, 23 Oct 2021 01:53:31 +0200
Subject: [PATCH 3/9] Update en.js

---
 src/languages/en.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/languages/en.js b/src/languages/en.js
index 1c287030..b4a03a05 100644
--- a/src/languages/en.js
+++ b/src/languages/en.js
@@ -305,6 +305,6 @@ export default {
     records: "records",
     "One record": "One record",
     "Showing {from} to {to} of {count} records": "Showing {from} to {to} of {count} records",
-    steamApiKeyDescription: "For monitoring a Steam Gameserver you need a steam Web-API key. You can register your api key here: ",
+    steamApiKeyDescription: "For monitoring a Steam Game Server you need a steam Web-API key. You can register your api key here: ",
     "Current User": "Current User",
 };

From 85e2b36424d7c67b56efe97ce6eb4b3fd13068b2 Mon Sep 17 00:00:00 2001
From: Andreas Brett <andreasbrett@users.noreply.github.com>
Date: Sat, 23 Oct 2021 01:54:07 +0200
Subject: [PATCH 4/9] Update en.js

---
 src/languages/en.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/languages/en.js b/src/languages/en.js
index b4a03a05..f5cdcdb6 100644
--- a/src/languages/en.js
+++ b/src/languages/en.js
@@ -305,6 +305,6 @@ export default {
     records: "records",
     "One record": "One record",
     "Showing {from} to {to} of {count} records": "Showing {from} to {to} of {count} records",
-    steamApiKeyDescription: "For monitoring a Steam Game Server you need a steam Web-API key. You can register your api key here: ",
+    steamApiKeyDescription: "For monitoring a Steam Game Server you need a steam Web-API key. You can register your API key here: ",
     "Current User": "Current User",
 };

From 4becb97a5d6341ee6d3b864f21719191bd72b484 Mon Sep 17 00:00:00 2001
From: Andreas Brett <andreasbrett@users.noreply.github.com>
Date: Sat, 23 Oct 2021 01:54:36 +0200
Subject: [PATCH 5/9] Update en.js

---
 src/languages/en.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/languages/en.js b/src/languages/en.js
index f5cdcdb6..1c848ff0 100644
--- a/src/languages/en.js
+++ b/src/languages/en.js
@@ -305,6 +305,6 @@ export default {
     records: "records",
     "One record": "One record",
     "Showing {from} to {to} of {count} records": "Showing {from} to {to} of {count} records",
-    steamApiKeyDescription: "For monitoring a Steam Game Server you need a steam Web-API key. You can register your API key here: ",
+    steamApiKeyDescription: "For monitoring a Steam Game Server you need a Steam Web-API key. You can register your API key here: ",
     "Current User": "Current User",
 };

From 9ddd2c73653a2c22e03c8dadc93b69d9c25e12f4 Mon Sep 17 00:00:00 2001
From: Andreas Brett <github@abrett.de>
Date: Mon, 25 Oct 2021 01:23:02 +0200
Subject: [PATCH 6/9] use jwt

---
 server/server.js       | 20 --------------------
 src/pages/Settings.vue |  8 +++++---
 2 files changed, 5 insertions(+), 23 deletions(-)

diff --git a/server/server.js b/server/server.js
index a2169463..11f03061 100644
--- a/server/server.js
+++ b/server/server.js
@@ -894,26 +894,6 @@ exports.entryPage = "dashboard";
             }
         });
 
-        socket.on("getUsername", async (callback) => {
-            try {
-                checkLogin(socket);
-
-                let user = await R.findOne("user", " id = ? AND active = 1 ", [
-                    socket.userID,
-                ]);
-
-                callback({
-                    ok: true,
-                    data: user.username,
-                });
-            } catch (e) {
-                callback({
-                    ok: false,
-                    msg: e.message,
-                });
-            }
-        });
-
         socket.on("getSettings", async (callback) => {
             try {
                 checkLogin(socket);
diff --git a/src/pages/Settings.vue b/src/pages/Settings.vue
index 29209810..2ac85643 100644
--- a/src/pages/Settings.vue
+++ b/src/pages/Settings.vue
@@ -487,9 +487,11 @@ export default {
         },
 
         loadUsername() {
-            this.$root.getSocket().emit("getUsername", (res) => {
-                this.username = res.data;
-            });
+            const jwtToken = localStorage.getItem("token");
+            const [match, headerBase64, payloadBase64, signatureBase64] = jwtToken.match(/^(\S+)\.(\S+)\.(\S+)$/i);
+            const payload = atob(payloadBase64);
+            const oPayload = JSON.parse(payload);
+            this.username = oPayload.username;
         },
 
         loadSettings() {

From 7bc38d423140a8360f3102634856c23855f67644 Mon Sep 17 00:00:00 2001
From: Andreas Brett <github@abrett.de>
Date: Mon, 25 Oct 2021 01:33:45 +0200
Subject: [PATCH 7/9] remove unused vars

---
 src/pages/Settings.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/Settings.vue b/src/pages/Settings.vue
index 2ac85643..f564fa2d 100644
--- a/src/pages/Settings.vue
+++ b/src/pages/Settings.vue
@@ -488,7 +488,7 @@ export default {
 
         loadUsername() {
             const jwtToken = localStorage.getItem("token");
-            const [match, headerBase64, payloadBase64, signatureBase64] = jwtToken.match(/^(\S+)\.(\S+)\.(\S+)$/i);
+            const [, payloadBase64] = jwtToken.match(/^\S+\.(\S+)\.\S+$/i);
             const payload = atob(payloadBase64);
             const oPayload = JSON.parse(payload);
             this.username = oPayload.username;

From 3f3d8b4eb3ff205b6619cb84b72dea75cb5b12ec Mon Sep 17 00:00:00 2001
From: Andreas Brett <github@abrett.de>
Date: Tue, 26 Oct 2021 12:58:04 +0200
Subject: [PATCH 8/9] fixes

---
 src/pages/Settings.vue | 10 ++++------
 src/util-frontend.js   | 19 +++++++++++++++++--
 2 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/src/pages/Settings.vue b/src/pages/Settings.vue
index f564fa2d..ba1e82cd 100644
--- a/src/pages/Settings.vue
+++ b/src/pages/Settings.vue
@@ -417,7 +417,7 @@ import TwoFADialog from "../components/TwoFADialog.vue";
 dayjs.extend(utc);
 dayjs.extend(timezone);
 
-import { timezoneList, setPageLocale } from "../util-frontend";
+import { timezoneList, setPageLocale, jwtDecrypt } from "../util-frontend";
 import { useToast } from "vue-toastification";
 
 const toast = useToast();
@@ -487,11 +487,9 @@ export default {
         },
 
         loadUsername() {
-            const jwtToken = localStorage.getItem("token");
-            const [, payloadBase64] = jwtToken.match(/^\S+\.(\S+)\.\S+$/i);
-            const payload = atob(payloadBase64);
-            const oPayload = JSON.parse(payload);
-            this.username = oPayload.username;
+            const jwtToken = this.$root.storage().token;
+            const jwtPayload = jwtDecrypt(jwtToken);
+            this.username = jwtPayload.username;
         },
 
         loadSettings() {
diff --git a/src/util-frontend.js b/src/util-frontend.js
index 0b33bfd3..2412ced1 100644
--- a/src/util-frontend.js
+++ b/src/util-frontend.js
@@ -51,7 +51,22 @@ export function timezoneList() {
 }
 
 export function setPageLocale() {
-    const html = document.documentElement 
+    const html = document.documentElement
     html.setAttribute('lang', currentLocale() )
     html.setAttribute('dir', localeDirection() )
-  }
\ No newline at end of file
+}
+
+export function jwtDecrypt(token) {
+    const base64Url = token.split(".")[1];
+    const base64 = base64Url.replace(/-/g, "+").replace(/_/g, "/");
+    const jsonPayload = decodeURIComponent(
+      atob(base64)
+        .split("")
+        .map(function(c) {
+            return "%" + ("00" + c.charCodeAt(0).toString(16)).slice(-2);
+        })
+        .join("")
+    );
+
+    return JSON.parse(jsonPayload);
+}

From 8fb8cbdaf3f8331f2c64514f8df8b510511e8992 Mon Sep 17 00:00:00 2001
From: Andreas Brett <github@abrett.de>
Date: Tue, 26 Oct 2021 13:15:31 +0200
Subject: [PATCH 9/9] use auth0/jwt-decode

---
 package-lock.json      | 11 +++++++++++
 package.json           |  1 +
 src/pages/Settings.vue |  5 +++--
 src/util-frontend.js   | 15 ---------------
 4 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 551504d7..9f412529 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -33,6 +33,7 @@
                 "http-graceful-shutdown": "~3.1.4",
                 "iconv-lite": "^0.6.3",
                 "jsonwebtoken": "~8.5.1",
+                "jwt-decode": "^3.1.2",
                 "limiter": "^2.1.0",
                 "nodemailer": "~6.6.5",
                 "notp": "~2.0.3",
@@ -7846,6 +7847,11 @@
                 "safe-buffer": "^5.0.1"
             }
         },
+        "node_modules/jwt-decode": {
+            "version": "3.1.2",
+            "resolved": "https://registry.npmjs.org/jwt-decode/-/jwt-decode-3.1.2.tgz",
+            "integrity": "sha512-UfpWE/VZn0iP50d8cz9NrZLM9lSWhcJ+0Gt/nm4by88UL+J1SiKN8/5dkjMmbEzwL2CAe+67GsegCbIKtbp75A=="
+        },
         "node_modules/kind-of": {
             "version": "3.2.2",
             "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
@@ -18495,6 +18501,11 @@
                 "safe-buffer": "^5.0.1"
             }
         },
+        "jwt-decode": {
+            "version": "3.1.2",
+            "resolved": "https://registry.npmjs.org/jwt-decode/-/jwt-decode-3.1.2.tgz",
+            "integrity": "sha512-UfpWE/VZn0iP50d8cz9NrZLM9lSWhcJ+0Gt/nm4by88UL+J1SiKN8/5dkjMmbEzwL2CAe+67GsegCbIKtbp75A=="
+        },
         "kind-of": {
             "version": "3.2.2",
             "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
diff --git a/package.json b/package.json
index 4f3d32ea..10ad4a08 100644
--- a/package.json
+++ b/package.json
@@ -76,6 +76,7 @@
         "http-graceful-shutdown": "~3.1.4",
         "iconv-lite": "^0.6.3",
         "jsonwebtoken": "~8.5.1",
+        "jwt-decode": "^3.1.2",
         "limiter": "^2.1.0",
         "nodemailer": "~6.6.5",
         "notp": "~2.0.3",
diff --git a/src/pages/Settings.vue b/src/pages/Settings.vue
index ba1e82cd..93ac07a4 100644
--- a/src/pages/Settings.vue
+++ b/src/pages/Settings.vue
@@ -414,10 +414,11 @@ import utc from "dayjs/plugin/utc";
 import timezone from "dayjs/plugin/timezone";
 import NotificationDialog from "../components/NotificationDialog.vue";
 import TwoFADialog from "../components/TwoFADialog.vue";
+import jwt_decode from "jwt-decode";
 dayjs.extend(utc);
 dayjs.extend(timezone);
 
-import { timezoneList, setPageLocale, jwtDecrypt } from "../util-frontend";
+import { timezoneList, setPageLocale } from "../util-frontend";
 import { useToast } from "vue-toastification";
 
 const toast = useToast();
@@ -488,7 +489,7 @@ export default {
 
         loadUsername() {
             const jwtToken = this.$root.storage().token;
-            const jwtPayload = jwtDecrypt(jwtToken);
+            const jwtPayload = jwt_decode(jwtToken);
             this.username = jwtPayload.username;
         },
 
diff --git a/src/util-frontend.js b/src/util-frontend.js
index 2412ced1..9094dda4 100644
--- a/src/util-frontend.js
+++ b/src/util-frontend.js
@@ -55,18 +55,3 @@ export function setPageLocale() {
     html.setAttribute('lang', currentLocale() )
     html.setAttribute('dir', localeDirection() )
 }
-
-export function jwtDecrypt(token) {
-    const base64Url = token.split(".")[1];
-    const base64 = base64Url.replace(/-/g, "+").replace(/_/g, "/");
-    const jsonPayload = decodeURIComponent(
-      atob(base64)
-        .split("")
-        .map(function(c) {
-            return "%" + ("00" + c.charCodeAt(0).toString(16)).slice(-2);
-        })
-        .join("")
-    );
-
-    return JSON.parse(jsonPayload);
-}