Merge pull request #37 from ArtFXDev/beta

Beta to prod
ArtFXDev · Jan 25, 2022 · deb0bc7 · deb0bc7
2 parents 172abe8 + 81e2869
commit deb0bc7
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 4 deletions.
diff --git a/package.json b/package.json
@@ -4,7 +4,7 @@
     "type": "git",
     "url": "https://github.com/ArtFXDev/silex-socket-service"
   },
-  "version": "1.5.2",
+  "version": "1.5.3",
   "description": "",
   "main": "src/index.js",
   "scripts": {

diff --git a/src/events/ui/getConnectedDccs.js b/src/events/ui/getConnectedDccs.js
@@ -9,8 +9,8 @@ const logger = require("../../utils/logger");
 const getConnectedDccs = (socket) => {
   socket.on("getConnectedDccs", (callback) => {
     logger.debugReceiveMessage("/ui", "getConnectedDccs");
-
     logger.debugSendMessage("/ui", "getConnectedDccs");
+
     callback({
       status: 200, // ok
       data: store.instance.data.dccs,

diff --git a/src/events/ui/getRunningActions.js b/src/events/ui/getRunningActions.js
@@ -9,6 +9,7 @@ const logger = require("../../utils/logger");
 const getRunningActions = (socket) => {
   socket.on("getRunningActions", (callback) => {
     logger.debugReceiveMessage("/ui", "getRunningActions");
+    logger.debugSendMessage("/ui", "getRunningActions");
 
     // Send the stored actions to the UI
     callback({

diff --git a/src/routes/auth.js b/src/routes/auth.js
@@ -33,8 +33,12 @@ authRouter.post("/login", async (req, res) => {
       // Save the store
       persistStore();
 
-      // Return the data
-      res.json(response.data);
+      // Filter out the tokens
+      // eslint-disable-next-line no-unused-vars
+      const { access_token, refresh_token, ...rest } = response.data;
+
+      // Return the rest of the data
+      res.json(rest);
 
       logger.info("Logging successful!");
     } catch (err) {