From 00437130e1e9b01221db1e794753f3ba89b84c6a Mon Sep 17 00:00:00 2001 From: rob Date: Thu, 7 Jul 2022 16:02:26 -0400 Subject: [PATCH] introduce concept of user type (User or CoreUser) --- app/services/core-node.js | 7 +++++-- app/services/user.js | 5 ++++- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/app/services/core-node.js b/app/services/core-node.js index 3bbe988..5e90bd5 100644 --- a/app/services/core-node.js +++ b/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; } } diff --git a/app/services/user.js b/app/services/user.js index 2f741c3..b0d8a7c 100644 --- a/app/services/user.js +++ b/app/services/user.js @@ -351,6 +351,7 @@ class UserService extends SiteService { } async startUserSession (user, now) { + user.type = 'User'; await User.updateOne( { _id: user._id }, { @@ -390,6 +391,7 @@ class UserService extends SiteService { if (!user) { throw new SiteError(404, 'Member account not found'); } + user.type = 'User'; return user; } @@ -406,7 +408,8 @@ class UserService extends SiteService { .limit(pagination.cpp) .lean() ; - return users; + + return users.map((user) => { user.type = 'User'; return user; }); } async getUserProfile (userId) {