From d2e5c0afab56774f5aaa298de73f8e61534f152b Mon Sep 17 00:00:00 2001
From: Jack <bartnikjack@gmail.com>
Date: Sat, 25 Sep 2021 13:52:09 +0100
Subject: [PATCH] only adding device when needed

---
 backend/api/controllers/user.js | 33 +++++++++++++++++++--------------
 1 file changed, 19 insertions(+), 14 deletions(-)

diff --git a/backend/api/controllers/user.js b/backend/api/controllers/user.js
index 147b06a76..78c60e207 100644
--- a/backend/api/controllers/user.js
+++ b/backend/api/controllers/user.js
@@ -115,20 +115,25 @@ class UserController {
         }
       }
       let agent = uaparser(req.headers["user-agent"]);
-      Logger.log(
-        "user_data_requested",
-        {
-          ip:
-            req.headers["cf-connecting-ip"] ||
-            req.headers["x-forwarded-for"] ||
-            req.ip ||
-            "255.255.255.255",
-          os: agent.os.name + " " + agent.os.version,
-          browser: agent.browser.name + " " + agent.browser.version,
-          device: agent.device.vendor + " " + agent.device.model,
-        },
-        uid
-      );
+      let logobj = {
+        ip:
+          req.headers["cf-connecting-ip"] ||
+          req.headers["x-forwarded-for"] ||
+          req.ip ||
+          "255.255.255.255",
+        os: agent.os.name + " " + agent.os.version,
+        browser: agent.browser.name + " " + agent.browser.version,
+        device: agent.device.vendor + " " + agent.device.model,
+      };
+      if (agent.device.vendor) {
+        logobj.device =
+          agent.device.vendor +
+          " " +
+          agent.device.model +
+          " " +
+          agent.device.type;
+      }
+      Logger.log("user_data_requested", logobj, uid);
       return res.status(200).json(userInfo);
     } catch (e) {
       return next(e);