fix: fixed per bug found with parsing user object

cabinjs · Dec 2, 2019 · 6fe0faa · 6fe0faa
1 parent c5fa4f8
commit 6fe0faa
Showing 1 changed file with 21 additions and 2 deletions.
diff --git a/src/index.js b/src/index.js
@@ -365,8 +365,27 @@ const parseRequest = (config = {}) => {
   // default to the user object
   let user = {};
 
-  if (ctx && isObject(ctx.state.user)) user = clone(ctx.state.user);
-  else if (req && isObject(req.user)) user = clone(req.user);
+  let parsedUser;
+  if (ctx && isObject(ctx.state.user)) parsedUser = ctx.state.user;
+  else if (req && isObject(req.user)) parsedUser = req.user;
+
+  if (parsedUser) {
+    try {
+      user =
+        typeof parsedUser.toJSON === 'function'
+          ? parsedUser.toJSON()
+          : typeof parsedUser.toObject === 'function'
+          ? parsedUser.toObject()
+          : clone(parsedUser);
+    } catch (err) {
+      debug(err);
+      try {
+        user = JSON.parse(safeStringify(parsedUser));
+      } catch (err) {
+        debug(err);
+      }
+    }
+  }
 
   const ip = ctx ? ctx.ip : req ? req.ip : null;