From bee53bb34be7980634ae23c854b3c5a6ff5b9b03 Mon Sep 17 00:00:00 2001
From: M4IK <53058001+mkllrtxn@users.noreply.github.com>
Date: Sat, 2 Mar 2024 17:18:46 +0100
Subject: [PATCH 1/4] Not fetch geo data if hidepii is true

If logChannelHidePii is set to true do not fetch geo data from ip-api.com
---
 server/src/services/logUserAuth.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server/src/services/logUserAuth.js b/server/src/services/logUserAuth.js
index 302686057..99061e905 100644
--- a/server/src/services/logUserAuth.js
+++ b/server/src/services/logUserAuth.js
@@ -50,7 +50,7 @@ async function getAuthInfo(req, user, strategy = 'custom', hidePii = false) {
       /[0-9]+.[0-9].+[0-9]+.[0-9]+$/,
     )[0]
 
-  const geo = await fetch(
+  const geo = hidePii ? await fetch(
     `http://ip-api.com/json/${ip}?fields=66846719&lang=en`,
   )
     .then((res) => res.json())

From 28f3a10d4786d029652c79e50c0831013b9240ed Mon Sep 17 00:00:00 2001
From: M4IK <53058001+mkllrtxn@users.noreply.github.com>
Date: Sat, 2 Mar 2024 17:27:11 +0100
Subject: [PATCH 2/4] fix update logUserAuth.js

---
 server/src/services/logUserAuth.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server/src/services/logUserAuth.js b/server/src/services/logUserAuth.js
index 99061e905..54c8fa224 100644
--- a/server/src/services/logUserAuth.js
+++ b/server/src/services/logUserAuth.js
@@ -61,7 +61,7 @@ async function getAuthInfo(req, user, strategy = 'custom', hidePii = false) {
         err,
       )
       return {}
-    })
+    }) : {}
 
   const embed = {
     color: 0xff0000,

From 0e4fdb1bdb036a1248ceba2449e65decef36de3c Mon Sep 17 00:00:00 2001
From: M4IK <53058001+mkllrtxn@users.noreply.github.com>
Date: Sat, 2 Mar 2024 17:58:38 +0100
Subject: [PATCH 3/4] Run prettier in logUserAuth.js

---
 server/src/services/logUserAuth.js | 25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/server/src/services/logUserAuth.js b/server/src/services/logUserAuth.js
index 54c8fa224..a7a14f825 100644
--- a/server/src/services/logUserAuth.js
+++ b/server/src/services/logUserAuth.js
@@ -50,18 +50,19 @@ async function getAuthInfo(req, user, strategy = 'custom', hidePii = false) {
       /[0-9]+.[0-9].+[0-9]+.[0-9]+$/,
     )[0]
 
-  const geo = hidePii ? await fetch(
-    `http://ip-api.com/json/${ip}?fields=66846719&lang=en`,
-  )
-    .then((res) => res.json())
-    .catch((err) => {
-      log.warn(
-        HELPERS.custom(strategy, '#7289da'),
-        'failed to fetch user information',
-        err,
-      )
-      return {}
-    }) : {}
+  const geo = hidePii
+    ? await fetch(`http://ip-api.com/json/${ip}?fields=66846719&lang=en`)
+        .then((res) => res.json())
+        .catch((err) => {
+          log.warn(
+            HELPERS.custom(strategy, '#7289da'),
+            'failed to fetch user information',
+            err,
+          )
+          return {}
+        })
+    : {}
+
 
   const embed = {
     color: 0xff0000,

From 74ff9fe63acf29f2a316f24268b992a706ecd313 Mon Sep 17 00:00:00 2001
From: M4IK <53058001+mkllrtxn@users.noreply.github.com>
Date: Sat, 2 Mar 2024 18:14:31 +0100
Subject: [PATCH 4/4] Rerun prettier in logUserAuth.js

---
 server/src/services/logUserAuth.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/server/src/services/logUserAuth.js b/server/src/services/logUserAuth.js
index a7a14f825..422fef07f 100644
--- a/server/src/services/logUserAuth.js
+++ b/server/src/services/logUserAuth.js
@@ -63,7 +63,6 @@ async function getAuthInfo(req, user, strategy = 'custom', hidePii = false) {
         })
     : {}
 
-
   const embed = {
     color: 0xff0000,
     title: 'Authentication',