strapi-custom-auth 1.2.8 → 1.2.10

package/dist/_chunks/{DynamicExpenses-ZL8hH1s8.js → DynamicExpenses-DS5zRFz3.js}

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const jsxRuntime = require("react/jsx-runtime");
-const React = require("react");
+const react = require("react");
 const designSystem = require("@strapi/design-system");
 const DynamicExpenses = ({
   description,
@@ -14,7 +14,7 @@ const DynamicExpenses = ({
   value
 }) => {
   const tempValue = value ? value.split(":")[0] : null;
-  const [selection, setSelection] = React.useState(
+  const [selection, setSelection] = react.useState(
     tempValue === "p" ? "percentuali" : tempValue === "f" ? "fisse" : "nessuna"
   );
   return /* @__PURE__ */ jsxRuntime.jsxs("div", { style: { fontSize: "12px" }, children: [

package/dist/admin/index.js

@@ -1,6 +1,6 @@
 "use strict";
-const React = require("react");
-const jsxRuntime = require("react/jsx-runtime");
+const react = require("react");
+require("react/jsx-runtime");
 const icons = require("@strapi/icons");
 const __variableDynamicImportRuntimeHelper = (glob, path, segs) => {
   const v = glob[path];
@@ -20,13 +20,12 @@ const __variableDynamicImportRuntimeHelper = (glob, path, segs) => {
 };
 const PLUGIN_ID = "strapi-custom-auth";
 const Initializer = ({ setPlugin }) => {
-  const ref = React.useRef(setPlugin);
-  React.useEffect(() => {
+  const ref = react.useRef(setPlugin);
+  react.useEffect(() => {
     ref.current(PLUGIN_ID);
   }, []);
   return null;
 };
-const PluginIcon = () => /* @__PURE__ */ jsxRuntime.jsx(icons.PuzzlePiece, {});
 const isTokenExpired = (token) => {
   if (!token) return true;
   try {
@@ -124,18 +123,6 @@ const fetchInterceptor = (storage) => {
 };
 const index = {
   register(app) {
-    app.addMenuLink({
-      to: `plugins/${PluginIcon}`,
-      icon: PluginIcon,
-      intlLabel: {
-        id: `${PLUGIN_ID}.plugin.name`,
-        defaultMessage: PLUGIN_ID
-      },
-      Component: async () => {
-        const { App } = await Promise.resolve().then(() => require("../_chunks/App-CdSJ6UQk.js"));
-        return App;
-      }
-    });
     app.registerPlugin({
       id: PLUGIN_ID,
       initializer: Initializer,
@@ -155,13 +142,14 @@ const index = {
         defaultMessage: "Create your Dynamic Expenses"
       },
       components: {
-        Input: async () => Promise.resolve().then(() => require("../_chunks/DynamicExpenses-ZL8hH1s8.js")).then((module2) => ({
+        Input: async () => Promise.resolve().then(() => require("../_chunks/DynamicExpenses-DS5zRFz3.js")).then((module2) => ({
           default: module2.DynamicExpenses
         }))
       }
     });
     const storage = localStorage.getItem("jwtToken") ? localStorage : sessionStorage;
     if (["microsoft"].includes(storage.getItem("provider"))) {
+      console.log("[STRAPI-CUSTOM-AUTH] storage", storage);
       app.addMenuLink({
         to: "/custom-logout",
         icon: icons.SignOut,

package/dist/admin/index.mjs

@@ -1,6 +1,6 @@
 import { useRef, useEffect } from "react";
-import { jsx } from "react/jsx-runtime";
-import { PuzzlePiece, SignOut } from "@strapi/icons";
+import "react/jsx-runtime";
+import { SignOut } from "@strapi/icons";
 const __variableDynamicImportRuntimeHelper = (glob, path, segs) => {
   const v = glob[path];
   if (v) {
@@ -25,7 +25,6 @@ const Initializer = ({ setPlugin }) => {
   }, []);
   return null;
 };
-const PluginIcon = () => /* @__PURE__ */ jsx(PuzzlePiece, {});
 const isTokenExpired = (token) => {
   if (!token) return true;
   try {
@@ -123,18 +122,6 @@ const fetchInterceptor = (storage) => {
 };
 const index = {
   register(app) {
-    app.addMenuLink({
-      to: `plugins/${PluginIcon}`,
-      icon: PluginIcon,
-      intlLabel: {
-        id: `${PLUGIN_ID}.plugin.name`,
-        defaultMessage: PLUGIN_ID
-      },
-      Component: async () => {
-        const { App } = await import("../_chunks/App-B-bQ656I.mjs");
-        return App;
-      }
-    });
     app.registerPlugin({
       id: PLUGIN_ID,
       initializer: Initializer,
@@ -161,6 +148,7 @@ const index = {
     });
     const storage = localStorage.getItem("jwtToken") ? localStorage : sessionStorage;
     if (["microsoft"].includes(storage.getItem("provider"))) {
+      console.log("[STRAPI-CUSTOM-AUTH] storage", storage);
       app.addMenuLink({
         to: "/custom-logout",
         icon: SignOut,

package/dist/server/index.js

@@ -3317,18 +3317,25 @@ async function microsoftSignInCallback(ctx) {
       }
     });
     const groupsList = groupResponse?.data.value;
+    console.log("[STRAPI-CUSTOM-AUTH] Microsoft Sign Callback USER groups", groupsList);
     const { mail, givenName, surname } = userResponse?.data;
-    const dbUser = await userService.findOneByEmail(mail);
+    const dbUser = await userService.findOneByEmail(mail, { roles: true });
     let activateUser;
     let jwtToken;
     console.log("[STRAPI-CUSTOM-AUTH] Microsoft Sign Callback: check user existence");
     if (dbUser) {
       console.log("[STRAPI-CUSTOM-AUTH] Microsoft Sign Callback: user exists generating token");
-      activateUser = dbUser;
+      const hasRoleMismatch = await roleService.checkMicrosoftUserRolesMismatch(dbUser, groupsList, config2);
+      if (hasRoleMismatch) {
+        console.log("[STRAPI-CUSTOM-AUTH] Microsoft Sign Callback: user exists but has role mismatch, fixing it.");
+        activateUser = await roleService.updateMicrosoftUserRoles(dbUser, groupsList, config2);
+      } else {
+        activateUser = dbUser;
+      }
       jwtToken = await tokenService.createJwtToken(activateUser);
     } else {
       console.log("[STRAPI-CUSTOM-AUTH] Microsoft Sign Callback: user does not exist, creating it");
-      const roles2 = await roleService.retrieveMicrosoftUserRole(groupsList, config2);
+      const roles2 = await roleService.retrieveMicrosoftUserRoles(groupsList, config2);
       const defaultLocale = oauthService.localeFindByHeader(ctx.request.headers);
       activateUser = await oauthService.createUser(mail, surname, givenName, defaultLocale, roles2);
       console.log("[STRAPI-CUSTOM-AUTH] Microsoft Sign Callback: user created, generating token");
@@ -39306,6 +39313,7 @@ var oauth = ({ strapi: strapi2 }) => ({
   renderSignUpSuccess(jwtToken, user, nonce, refreshToken, provider = "custom") {
     const config2 = strapi2.config.get("plugin::strapi-custom-auth");
     const REMEMBER_ME = config2["REMEMBER_ME"];
+    console.log("[STRAPI-CUSTOM-AUTH] Sign up success redirecting to: ", strapi2.config.admin.url);
     let storage = "sessionStorage";
     if (REMEMBER_ME) {
       storage = "localStorage";
@@ -39417,18 +39425,42 @@ var role = ({ strapi: strapi2 }) => ({
       })
     );
   },
-  async retrieveMicrosoftUserRole(groupList, config2) {
+  async retrieveMicrosoftUserRoles(groupList, config2) {
     const allowedGroups = /* @__PURE__ */ new Set([
       String(config2["ENTRA_ADMIN_GROUP_NAME"]),
       String(config2["ENTRA_EDITOR_GROUP_NAME"])
     ]);
     const filteredGroups = groupList.filter((group) => allowedGroups.has(group.displayName));
     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";
       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);
     return roles2;
+  },
+  async checkMicrosoftUserRolesMismatch(user, groupList, config2) {
+    console.log("[STRAPI-CUSTOM-AUTH] Microsoft Sign Callback checkMicrosoftUserRolesMismatch: START");
+    const entraMatchedRoles = await this.retrieveMicrosoftUserRoles(groupList, config2);
+    console.log("[STRAPI-CUSTOM-AUTH] Microsoft Sign Callback checkMicrosoftUserRolesMismatch: Roles matched with entra groups ->", entraMatchedRoles);
+    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));
+  },
+  async updateMicrosoftUserRoles(user, groupList, config2) {
+    console.log("[STRAPI-CUSTOM-AUTH] Microsoft Sign Callback updateMicrosoftUserRoles: START");
+    const userService = strapi2.service("admin::user");
+    const entraMatchedRoles = await this.retrieveMicrosoftUserRoles(groupList, config2);
+    const userCurrentRoles = user.roles.map((role2) => role2.id) || [];
+    const rolesToAdd = entraMatchedRoles.filter((roleId) => !userCurrentRoles.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: Updated user roles");
+    const updatedUser = await userService.findOne(user.id);
+    console.log("[STRAPI-CUSTOM-AUTH] Microsoft Sign Callback updateMicrosoftUserRoles: END");
+    return updatedUser;
   }
 });
 const role$1 = /* @__PURE__ */ getDefaultExportFromCjs(role);

package/dist/server/index.mjs

@@ -3302,18 +3302,25 @@ async function microsoftSignInCallback(ctx) {
       }
     });
     const groupsList = groupResponse?.data.value;
+    console.log("[STRAPI-CUSTOM-AUTH] Microsoft Sign Callback USER groups", groupsList);
     const { mail, givenName, surname } = userResponse?.data;
-    const dbUser = await userService.findOneByEmail(mail);
+    const dbUser = await userService.findOneByEmail(mail, { roles: true });
     let activateUser;
     let jwtToken;
     console.log("[STRAPI-CUSTOM-AUTH] Microsoft Sign Callback: check user existence");
     if (dbUser) {
       console.log("[STRAPI-CUSTOM-AUTH] Microsoft Sign Callback: user exists generating token");
-      activateUser = dbUser;
+      const hasRoleMismatch = await roleService.checkMicrosoftUserRolesMismatch(dbUser, groupsList, config2);
+      if (hasRoleMismatch) {
+        console.log("[STRAPI-CUSTOM-AUTH] Microsoft Sign Callback: user exists but has role mismatch, fixing it.");
+        activateUser = await roleService.updateMicrosoftUserRoles(dbUser, groupsList, config2);
+      } else {
+        activateUser = dbUser;
+      }
       jwtToken = await tokenService.createJwtToken(activateUser);
     } else {
       console.log("[STRAPI-CUSTOM-AUTH] Microsoft Sign Callback: user does not exist, creating it");
-      const roles2 = await roleService.retrieveMicrosoftUserRole(groupsList, config2);
+      const roles2 = await roleService.retrieveMicrosoftUserRoles(groupsList, config2);
       const defaultLocale = oauthService.localeFindByHeader(ctx.request.headers);
       activateUser = await oauthService.createUser(mail, surname, givenName, defaultLocale, roles2);
       console.log("[STRAPI-CUSTOM-AUTH] Microsoft Sign Callback: user created, generating token");
@@ -39291,6 +39298,7 @@ var oauth = ({ strapi: strapi2 }) => ({
   renderSignUpSuccess(jwtToken, user, nonce, refreshToken, provider = "custom") {
     const config2 = strapi2.config.get("plugin::strapi-custom-auth");
     const REMEMBER_ME = config2["REMEMBER_ME"];
+    console.log("[STRAPI-CUSTOM-AUTH] Sign up success redirecting to: ", strapi2.config.admin.url);
     let storage = "sessionStorage";
     if (REMEMBER_ME) {
       storage = "localStorage";
@@ -39402,18 +39410,42 @@ var role = ({ strapi: strapi2 }) => ({
       })
     );
   },
-  async retrieveMicrosoftUserRole(groupList, config2) {
+  async retrieveMicrosoftUserRoles(groupList, config2) {
     const allowedGroups = /* @__PURE__ */ new Set([
       String(config2["ENTRA_ADMIN_GROUP_NAME"]),
       String(config2["ENTRA_EDITOR_GROUP_NAME"])
     ]);
     const filteredGroups = groupList.filter((group) => allowedGroups.has(group.displayName));
     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";
       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);
     return roles2;
+  },
+  async checkMicrosoftUserRolesMismatch(user, groupList, config2) {
+    console.log("[STRAPI-CUSTOM-AUTH] Microsoft Sign Callback checkMicrosoftUserRolesMismatch: START");
+    const entraMatchedRoles = await this.retrieveMicrosoftUserRoles(groupList, config2);
+    console.log("[STRAPI-CUSTOM-AUTH] Microsoft Sign Callback checkMicrosoftUserRolesMismatch: Roles matched with entra groups ->", entraMatchedRoles);
+    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));
+  },
+  async updateMicrosoftUserRoles(user, groupList, config2) {
+    console.log("[STRAPI-CUSTOM-AUTH] Microsoft Sign Callback updateMicrosoftUserRoles: START");
+    const userService = strapi2.service("admin::user");
+    const entraMatchedRoles = await this.retrieveMicrosoftUserRoles(groupList, config2);
+    const userCurrentRoles = user.roles.map((role2) => role2.id) || [];
+    const rolesToAdd = entraMatchedRoles.filter((roleId) => !userCurrentRoles.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: Updated user roles");
+    const updatedUser = await userService.findOne(user.id);
+    console.log("[STRAPI-CUSTOM-AUTH] Microsoft Sign Callback updateMicrosoftUserRoles: END");
+    return updatedUser;
   }
 });
 const role$1 = /* @__PURE__ */ getDefaultExportFromCjs(role);

package/package.json

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