Browse Source

introduce concept of user type (User or CoreUser)

pull/1/head
Rob Colbert 3 years ago
parent
commit
00437130e1
  1. 7
      app/services/core-node.js
  2. 5
      app/services/user.js

7
app/services/core-node.js

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

5
app/services/user.js

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

Loading…
Cancel
Save