strapi-custom-auth 1.2.5 → 1.2.7

package/dist/admin/index.js

@@ -69,7 +69,7 @@ const originalFetch = window.fetch;
 const fetchInterceptor = (storage) => {
   window.fetch = async (input, init = {}) => {
     const url = input instanceof Request ? input.url : input;
-    if (url.includes("/admin/renew-token") || url.includes("/auth/login") || url.includes("repos/strapi/strapi/releases/latest")) {
+    if (url.includes("/admin/renew-token") || url.includes("/auth/login") || url.includes("repos/strapi/strapi/releases/latest") || url.includes("/admin/init")) {
       return originalFetch(input, init);
     }
     let token = storage.getItem("jwtToken").replace(/"/g, "");
@@ -160,20 +160,22 @@ const index = {
         }))
       }
     });
-    app.addMenuLink({
-      to: "/custom-logout",
-      icon: icons.SignOut,
-      intlLabel: {
-        id: "custom-logout.label",
-        defaultMessage: "Logout"
-      },
-      Component: async () => {
-        const component = await Promise.resolve().then(() => require("../_chunks/CustomLogoutPage-CuntyG5p.js"));
-        return component.default;
-      }
-    });
     const storage = localStorage.getItem("jwtToken") ? localStorage : sessionStorage;
-    fetchInterceptor(storage);
+    if (["microsoft"].includes(storage.getItem("provider"))) {
+      app.addMenuLink({
+        to: "/custom-logout",
+        icon: icons.SignOut,
+        intlLabel: {
+          id: "custom-logout.label",
+          defaultMessage: "Logout"
+        },
+        Component: async () => {
+          const component = await Promise.resolve().then(() => require("../_chunks/CustomLogoutPage-CuntyG5p.js"));
+          return component.default;
+        }
+      });
+      fetchInterceptor(storage);
+    }
   },
   async registerTrads({ locales }) {
     return Promise.all(

package/dist/admin/index.mjs

@@ -68,7 +68,7 @@ const originalFetch = window.fetch;
 const fetchInterceptor = (storage) => {
   window.fetch = async (input, init = {}) => {
     const url = input instanceof Request ? input.url : input;
-    if (url.includes("/admin/renew-token") || url.includes("/auth/login") || url.includes("repos/strapi/strapi/releases/latest")) {
+    if (url.includes("/admin/renew-token") || url.includes("/auth/login") || url.includes("repos/strapi/strapi/releases/latest") || url.includes("/admin/init")) {
       return originalFetch(input, init);
     }
     let token = storage.getItem("jwtToken").replace(/"/g, "");
@@ -159,20 +159,22 @@ const index = {
         }))
       }
     });
-    app.addMenuLink({
-      to: "/custom-logout",
-      icon: SignOut,
-      intlLabel: {
-        id: "custom-logout.label",
-        defaultMessage: "Logout"
-      },
-      Component: async () => {
-        const component = await import("../_chunks/CustomLogoutPage-Be-GcZA3.mjs");
-        return component.default;
-      }
-    });
     const storage = localStorage.getItem("jwtToken") ? localStorage : sessionStorage;
-    fetchInterceptor(storage);
+    if (["microsoft"].includes(storage.getItem("provider"))) {
+      app.addMenuLink({
+        to: "/custom-logout",
+        icon: SignOut,
+        intlLabel: {
+          id: "custom-logout.label",
+          defaultMessage: "Logout"
+        },
+        Component: async () => {
+          const component = await import("../_chunks/CustomLogoutPage-Be-GcZA3.mjs");
+          return component.default;
+        }
+      });
+      fetchInterceptor(storage);
+    }
   },
   async registerTrads({ locales }) {
     return Promise.all(

package/dist/server/index.js

@@ -3084,7 +3084,7 @@ const configValidation$1 = () => {
   if (config2["SMTP_HOST"] && config2["SMTP_PORT"] && config2["SMTP_USER"] && config2["MAIL_FROM"] && config2["SMTP_PASSWORD"]) {
     return config2;
   }
-  throw new Error("SMTP_HOST, SMTP_PORT, SMTP_USER, SMTP_PASSWORD, MAIL_FROM are required");
+  console.warn("SMTP_HOST, SMTP_PORT, SMTP_USER, SMTP_PASSWORD, MAIL_FROM are required");
 };
 async function customSignIn(ctx) {
   const oauthService = strapi.plugin("strapi-custom-auth").service("oauth");
@@ -39406,6 +39406,19 @@ var role = ({ strapi: strapi2 }) => ({
         });
       })
     );
+  },
+  async retrieveMicrosoftUserRole(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();
+    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);
+    return roles2;
   }
 });
 const role$1 = /* @__PURE__ */ getDefaultExportFromCjs(role);

package/dist/server/index.mjs

@@ -3069,7 +3069,7 @@ const configValidation$1 = () => {
   if (config2["SMTP_HOST"] && config2["SMTP_PORT"] && config2["SMTP_USER"] && config2["MAIL_FROM"] && config2["SMTP_PASSWORD"]) {
     return config2;
   }
-  throw new Error("SMTP_HOST, SMTP_PORT, SMTP_USER, SMTP_PASSWORD, MAIL_FROM are required");
+  console.warn("SMTP_HOST, SMTP_PORT, SMTP_USER, SMTP_PASSWORD, MAIL_FROM are required");
 };
 async function customSignIn(ctx) {
   const oauthService = strapi.plugin("strapi-custom-auth").service("oauth");
@@ -39391,6 +39391,19 @@ var role = ({ strapi: strapi2 }) => ({
         });
       })
     );
+  },
+  async retrieveMicrosoftUserRole(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();
+    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);
+    return roles2;
   }
 });
 const role$1 = /* @__PURE__ */ getDefaultExportFromCjs(role);

package/package.json

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