Merge branch 'develop' of git.digitaltelepresence.com:digital-telepresence/dtp-base into develop

app/services/core-node.js

@@ -121,7 +121,7 @@ class CoreNodeService extends SiteService {
         const NOW = new Date();
         try {
           const coreUserId = mongoose.Types.ObjectId(params.coreUserId);
-          const user = await CoreUser.findOneAndUpdate(
+          let user = await CoreUser.findOneAndUpdate(
             {
               core: core._id,
               coreUserId,
@@ -164,7 +164,9 @@ class CoreNodeService extends SiteService {
               new: true,
             },
           );
-          return cb(null, user.toObject());
+          user = user.toObject();
+          user.type = 'CoreUser';
+          return cb(null, user);
         } catch (error) {
           return cb(error);
         }
@@ -386,6 +388,7 @@ class CoreNodeService extends SiteService {
       .select('+flags +permissions +optIn')
       .populate(this.populateCoreUser)
       .lean();
+    user.type = 'CoreUser';
     return user;
   }
 }

app/services/user.js

@@ -358,6 +358,7 @@ class UserService extends SiteService {
   }
 
   async startUserSession (user, now) {
+    user.type = 'User';
     await User.updateOne(
       { _id: user._id },
       {
@@ -397,6 +398,7 @@ class UserService extends SiteService {
     if (!user) {
       throw new SiteError(404, 'Member account not found');
     }
+    user.type = 'User';
     return user;
   }
 
@@ -413,7 +415,8 @@ class UserService extends SiteService {
       .limit(pagination.cpp)
       .lean()
     ;
-    return users;
+
+    return users.map((user) => { user.type = 'User'; return user; });
   }
 
   async getUserProfile (userId) {