strapi-custom-auth 1.2.12 → 1.2.14

package/dist/server/index.js

@@ -39333,7 +39333,7 @@ var oauth = ({ strapi: strapi2 }) => ({
   ${storage}.setItem('userInfo', '${JSON.stringify(user)}');
   ${storage}.setItem('refreshToken', '"${refreshToken}"');
   ${storage}.setItem('provider', '${provider}');
-   location.href = '${strapi2.config.admin.url}'
+   location.href = '${strapi2.config.admin.url}?redirectedFrom=plugin'
  })
 <\/script>
 </head>
@@ -39428,14 +39428,14 @@ var role = ({ strapi: strapi2 }) => ({
   },
   async retrieveMicrosoftUserRoles(groupList, config2) {
     const allowedGroups = /* @__PURE__ */ new Set([
-      String(config2["ENTRA_ADMIN_GROUP_NAME"]),
-      String(config2["ENTRA_EDITOR_GROUP_NAME"])
+      String(config2["ENTRA_ADMIN_GROUP_NAME"]).toLowerCase(),
+      String(config2["ENTRA_EDITOR_GROUP_NAME"]).toLowerCase()
     ]);
-    const filteredGroups = groupList.filter((group) => allowedGroups.has(group.displayName));
+    const filteredGroups = groupList.filter((group) => allowedGroups.has(group.displayName.toLowerCase()));
     const dbRoles = await strapi2.db.query("admin::role").findMany();
     console.log("[STRAPI-CUSTOM-AUTH] Microsoft Sign Callback USER strapi roles list", dbRoles);
     const roles2 = filteredGroups.map((group) => {
-      const roleName = group.displayName.includes("Admin") ? "admin" : "editor";
+      const roleName = group.displayName.toLowerCase().includes("admin") ? "admin" : "editor";
       return dbRoles.find((role2) => role2.name.toLowerCase().includes(roleName))?.id;
     }).filter(Boolean);
     console.log("[STRAPI-CUSTOM-AUTH] Microsoft Sign Callback USER strapi roles matched with entra groups", roles2);
@@ -39448,7 +39448,9 @@ var role = ({ strapi: strapi2 }) => ({
     const userCurrentRoles = user.roles.map((role2) => role2.id) || [];
     console.log("[STRAPI-CUSTOM-AUTH] Microsoft Sign Callback checkMicrosoftUserRolesMismatch: User current roles", userCurrentRoles);
     console.log("[STRAPI-CUSTOM-AUTH] Microsoft Sign Callback checkMicrosoftUserRolesMismatch: END");
-    return entraMatchedRoles.some((roleId) => !userCurrentRoles.includes(roleId));
+    const rolesToAdd = entraMatchedRoles.filter((roleId) => !userCurrentRoles.includes(roleId));
+    const rolesToRemove = userCurrentRoles.filter((roleId) => !entraMatchedRoles.includes(roleId));
+    return rolesToAdd.length > 0 || rolesToRemove.length > 0;
   },
   async updateMicrosoftUserRoles(user, groupList, config2) {
     console.log("[STRAPI-CUSTOM-AUTH] Microsoft Sign Callback updateMicrosoftUserRoles: START");
@@ -39456,8 +39458,11 @@ var role = ({ strapi: strapi2 }) => ({
     const entraMatchedRoles = await this.retrieveMicrosoftUserRoles(groupList, config2);
     const userCurrentRoles = user.roles.map((role2) => role2.id) || [];
     const rolesToAdd = entraMatchedRoles.filter((roleId) => !userCurrentRoles.includes(roleId));
+    const rolesToRemove = userCurrentRoles.filter((roleId) => !entraMatchedRoles.includes(roleId));
     console.log("[STRAPI-CUSTOM-AUTH] Microsoft Sign Callback updateMicrosoftUserRoles: Roles to add ->", rolesToAdd);
-    await userService.updateById(user.id, { roles: [...userCurrentRoles, ...rolesToAdd] });
+    console.log("[STRAPI-CUSTOM-AUTH] Microsoft Sign Callback updateMicrosoftUserRoles: Roles to remove ->", rolesToRemove);
+    const updatedRoles = [...userCurrentRoles, ...rolesToAdd].filter((roleId) => !rolesToRemove.includes(roleId));
+    await userService.updateById(user.id, { roles: updatedRoles });
     console.log("[STRAPI-CUSTOM-AUTH] Microsoft Sign Callback updateMicrosoftUserRoles: Updated user roles");
     const updatedUser = await userService.findOne(user.id);
     console.log("[STRAPI-CUSTOM-AUTH] Microsoft Sign Callback updateMicrosoftUserRoles: END");

package/dist/server/index.mjs

@@ -39318,7 +39318,7 @@ var oauth = ({ strapi: strapi2 }) => ({
   ${storage}.setItem('userInfo', '${JSON.stringify(user)}');
   ${storage}.setItem('refreshToken', '"${refreshToken}"');
   ${storage}.setItem('provider', '${provider}');
-   location.href = '${strapi2.config.admin.url}'
+   location.href = '${strapi2.config.admin.url}?redirectedFrom=plugin'
  })
 <\/script>
 </head>
@@ -39413,14 +39413,14 @@ var role = ({ strapi: strapi2 }) => ({
   },
   async retrieveMicrosoftUserRoles(groupList, config2) {
     const allowedGroups = /* @__PURE__ */ new Set([
-      String(config2["ENTRA_ADMIN_GROUP_NAME"]),
-      String(config2["ENTRA_EDITOR_GROUP_NAME"])
+      String(config2["ENTRA_ADMIN_GROUP_NAME"]).toLowerCase(),
+      String(config2["ENTRA_EDITOR_GROUP_NAME"]).toLowerCase()
     ]);
-    const filteredGroups = groupList.filter((group) => allowedGroups.has(group.displayName));
+    const filteredGroups = groupList.filter((group) => allowedGroups.has(group.displayName.toLowerCase()));
     const dbRoles = await strapi2.db.query("admin::role").findMany();
     console.log("[STRAPI-CUSTOM-AUTH] Microsoft Sign Callback USER strapi roles list", dbRoles);
     const roles2 = filteredGroups.map((group) => {
-      const roleName = group.displayName.includes("Admin") ? "admin" : "editor";
+      const roleName = group.displayName.toLowerCase().includes("admin") ? "admin" : "editor";
       return dbRoles.find((role2) => role2.name.toLowerCase().includes(roleName))?.id;
     }).filter(Boolean);
     console.log("[STRAPI-CUSTOM-AUTH] Microsoft Sign Callback USER strapi roles matched with entra groups", roles2);
@@ -39433,7 +39433,9 @@ var role = ({ strapi: strapi2 }) => ({
     const userCurrentRoles = user.roles.map((role2) => role2.id) || [];
     console.log("[STRAPI-CUSTOM-AUTH] Microsoft Sign Callback checkMicrosoftUserRolesMismatch: User current roles", userCurrentRoles);
     console.log("[STRAPI-CUSTOM-AUTH] Microsoft Sign Callback checkMicrosoftUserRolesMismatch: END");
-    return entraMatchedRoles.some((roleId) => !userCurrentRoles.includes(roleId));
+    const rolesToAdd = entraMatchedRoles.filter((roleId) => !userCurrentRoles.includes(roleId));
+    const rolesToRemove = userCurrentRoles.filter((roleId) => !entraMatchedRoles.includes(roleId));
+    return rolesToAdd.length > 0 || rolesToRemove.length > 0;
   },
   async updateMicrosoftUserRoles(user, groupList, config2) {
     console.log("[STRAPI-CUSTOM-AUTH] Microsoft Sign Callback updateMicrosoftUserRoles: START");
@@ -39441,8 +39443,11 @@ var role = ({ strapi: strapi2 }) => ({
     const entraMatchedRoles = await this.retrieveMicrosoftUserRoles(groupList, config2);
     const userCurrentRoles = user.roles.map((role2) => role2.id) || [];
     const rolesToAdd = entraMatchedRoles.filter((roleId) => !userCurrentRoles.includes(roleId));
+    const rolesToRemove = userCurrentRoles.filter((roleId) => !entraMatchedRoles.includes(roleId));
     console.log("[STRAPI-CUSTOM-AUTH] Microsoft Sign Callback updateMicrosoftUserRoles: Roles to add ->", rolesToAdd);
-    await userService.updateById(user.id, { roles: [...userCurrentRoles, ...rolesToAdd] });
+    console.log("[STRAPI-CUSTOM-AUTH] Microsoft Sign Callback updateMicrosoftUserRoles: Roles to remove ->", rolesToRemove);
+    const updatedRoles = [...userCurrentRoles, ...rolesToAdd].filter((roleId) => !rolesToRemove.includes(roleId));
+    await userService.updateById(user.id, { roles: updatedRoles });
     console.log("[STRAPI-CUSTOM-AUTH] Microsoft Sign Callback updateMicrosoftUserRoles: Updated user roles");
     const updatedUser = await userService.findOne(user.id);
     console.log("[STRAPI-CUSTOM-AUTH] Microsoft Sign Callback updateMicrosoftUserRoles: END");

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.2.12",
+  "version": "1.2.14",
   "keywords": [],
   "type": "commonjs",
   "exports": {