Merge pull request #119 from topcoder-platform/develop

Hotfix PS-56
topcoder-platform · Jun 13, 2023 · 4c14ed5 · 4c14ed5
2 parents 3d5bc6c + ddf3723
commit 4c14ed5
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/src/services/MemberService.js b/src/services/MemberService.js
@@ -48,11 +48,13 @@ function omitMemberAttributes (currentUser, mb) {
   // remove some internal fields
   let res = _.omit(mb, INTERNAL_MEMBER_FIELDS)
   // remove identifiable info fields if user is not admin, not M2M and not member himself
-  if (!helper.canManageMember(currentUser, mb)) {
+  const canManageMember = helper.canManageMember(currentUser, mb)
+  const hasAutocompleteRole = helper.hasAutocompleteRole(currentUser)
+
+  if (!canManageMember) {
     res = _.omit(res, config.MEMBER_SECURE_FIELDS)
   }
-  // If a user has one of the autocomplete role, allow them to see fname, lname, email
-  if(!helper.hasAutocompleteRole(currentUser)){
+  if (!canManageMember && !hasAutocompleteRole) {
     res = _.omit(res, config.COMMUNICATION_SECURE_FIELDS)
   }