Merge branch 'develop' into pm-2539

Author: hentrymartin

src/scripts/migrate-dynamo-data.js

@@ -1760,6 +1760,9 @@ async function importElasticSearchMember (filename, dateFilter = null) {
     })
 
     const dataObj = await fixMemberUpdateData(dataItem._source, dbItem || {})
+    if (!dataObj) {
+      continue
+    }
 
     await updateMembersWithTraitsAndSkills(dataObj)
     total += 1

src/services/SearchService.js

@@ -156,7 +156,7 @@ async function searchMembers (currentUser, query) {
     if (currentUser == null) {
       throw new errors.UnauthorizedError('Authentication token is required to query users by email')
     }
-    if (!helper.hasSearchByEmailRole(currentUser)) {
+    if (!currentUser.isMachine && !helper.hasSearchByEmailRole(currentUser)) {
       throw new errors.BadRequestError('Admin role is required to query users by email')
     }
   }