fix: group duplication on invite

eea · Dec 13, 2023 · e80099e · e80099e
1 parent 5cf6966
commit e80099e
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 44 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "eionet2-user-management",
-    "version": "1.2.2",
+    "version": "1.2.3",
     "description": "",
     "author": "",
     "scripts": {

diff --git a/tabs/package-lock.json b/tabs/package-lock.json
diff --git a/tabs/package.json b/tabs/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@eeacms/eionet2-user-management",
-  "version": "1.2.2",
+  "version": "1.2.3",
   "license": "MIT",
   "description": "Teams app for managing Eionet users.",
   "dependencies": {
@@ -88,4 +88,4 @@
     "@azure/core-rest-pipeline": "1.12.1"
   },
   "homepage": "."
-}
+}
diff --git a/tabs/src/data/provider.js b/tabs/src/data/provider.js
@@ -306,12 +306,10 @@ export async function inviteUser(user, mappings) {
       config = await getConfiguration();
     let userId = undefined,
       invitationResponse = undefined,
-      sendMail = false,
-      onlyNFP = false;
+      sendMail = false;
 
     if (user.NFP && !firstMapping) {
       firstMapping = mappings.find((m) => m.O365GroupId === config.MainEionetGroupId);
-      onlyNFP = true;
     }
 
     if (!user.ADProfile) {
@@ -367,48 +365,41 @@ export async function inviteUser(user, mappings) {
 
           try {
             await addTag(config.MainEionetGroupId, constants.NFP_TAG, userId);
-            onlyNFP &&
-              (await addTag(config.MainEionetGroupId, getCountryName(user.Country), userId));
+            await addTag(config.MainEionetGroupId, getCountryName(user.Country), userId);
           } catch (err) {
             return wrapError(err, messages.UserInvite.Errors.TagsCreation);
           }
         }
 
-        mappings
-          .filter(
-            (m) =>
-              (user.Membership && user.Membership.includes(m.Membership)) ||
-              (user.OtherMemberships && user.OtherMemberships.includes(m.Membership)),
-          )
-          .forEach(async (mapping) => {
-            //Set groups and tags
-            try {
-              const groupIds = [
-                ...new Set(
-                  [mapping.O365GroupId, mapping.MailingGroupId, mapping.AdditionalGroupId].filter(
-                    (g) => !!g,
-                  ),
-                ),
-              ];
-
-              const existingGroups = await getExistingGroups(userId, groupIds);
-
-              for (const groupId of groupIds.filter((id) => !existingGroups?.includes(id))) {
-                await postUserGroup(groupId, userId);
-              }
-            } catch (err) {
-              return wrapError(err, messages.UserInvite.Errors.JoiningTeam);
-            }
-            try {
-              if (mapping.Tag) {
-                //TeamId is the same as O365GroupId
-                await addTag(mapping.O365GroupId, mapping.Tag, userId);
-                await addTag(mapping.O365GroupId, getCountryName(user.Country), userId);
-              }
-            } catch (err) {
-              return wrapError(err, messages.UserInvite.Errors.TagsCreation);
-            }
-          });
+        const userMappings = mappings.filter(
+          (m) =>
+            (user.Membership && user.Membership.includes(m.Membership)) ||
+            (user.OtherMemberships && user.OtherMemberships.includes(m.Membership)),
+        );
+
+        //apply user membership and country tag
+        const userGroupIds = getDistinctGroupsIds(userMappings);
+        const existingGroups = await getExistingGroups(userId, userGroupIds);
+        try {
+          for (const groupId of userGroupIds.filter((id) => !existingGroups?.includes(id))) {
+            await postUserGroup(groupId, userId);
+
+            const groupMapping = userMappings.filter((m) => m.O365GroupId === groupId);
+            groupMapping[0]?.Tag && addTag(groupId, getCountryName(user.Country), userId);
+          }
+        } catch (err) {
+          return wrapError(err, messages.UserInvite.Errors.JoiningTeam);
+        }
+
+        //apply membership tags
+        try {
+          const tags = [...new Set(userMappings.filter((m) => m.Tag))];
+          for (const m of tags) {
+            addTag(m.O365GroupId, m.Tag, userId);
+          }
+        } catch (err) {
+          return wrapError(err, messages.UserInvite.Errors.TagsCreation);
+        }
 
         if (sendMail) {
           try {