strapi-plugin-oidc 1.0.16 → 1.0.18

package/dist/admin/{index-BADTLgSt.mjs → index-BBRKt8XS.mjs}

@@ -54,7 +54,7 @@ const index = {
           defaultMessage: "Configuration"
         },
         Component: async () => {
-          return await import("./index-CINLwPy3.mjs");
+          return await import("./index-BpfwqZXc.mjs");
         },
         permissions: [{ action: "plugin::strapi-plugin-oidc.read", subject: null }]
       }
@@ -66,6 +66,19 @@ const index = {
     });
   },
   bootstrap() {
+    let isLogoutInProgress = false;
+    const isAuthRoute = (path) => {
+      const match = path.match(/\/auth\/(login|register|forgot-password|reset-password)/);
+      return match !== null;
+    };
+    const initialPath = window.location.pathname;
+    let styleElem = null;
+    if (isAuthRoute(initialPath) && !isLogoutInProgress) {
+      styleElem = document.createElement("style");
+      styleElem.innerHTML = "body { display: none !important; }";
+      document.head.appendChild(styleElem);
+    }
+    let willRedirect = false;
     const checkEnforceOIDC = async () => {
       try {
         const response = await window.fetch("/strapi-plugin-oidc/settings/public");
@@ -73,15 +86,17 @@ const index = {
           const data = await response.json();
           if (data.enforceOIDC) {
             const currentPath = window.location.pathname;
-            if (currentPath.endsWith("/auth/login")) {
+            if (isAuthRoute(currentPath) && !isLogoutInProgress) {
+              willRedirect = true;
               window.location.href = "/strapi-plugin-oidc/oidc";
+              return;
             }
             const interceptHistory = (originalMethod) => {
               return function(...args) {
                 const url = args[2];
                 if (url && typeof url === "string") {
                   const urlWithoutQuery = url.split("?")[0].split("#")[0];
-                  if (urlWithoutQuery.endsWith("/auth/login")) {
+                  if (isAuthRoute(urlWithoutQuery) && !isLogoutInProgress) {
                     window.location.href = "/strapi-plugin-oidc/oidc";
                     return;
                   }
@@ -95,6 +110,10 @@ const index = {
         }
       } catch (error) {
         console.error("Failed to check OIDC enforcement setting:", error);
+      } finally {
+        if (!willRedirect && styleElem && styleElem.parentNode) {
+          styleElem.parentNode.removeChild(styleElem);
+        }
       }
     };
     checkEnforceOIDC();
@@ -102,9 +121,14 @@ const index = {
     window.fetch = async (...args) => {
       const url = typeof args[0] === "string" ? args[0] : args[0].url;
       const isLogout = url && url.endsWith("/admin/logout") && args[1]?.method?.toUpperCase() === "POST";
+      if (isLogout) {
+        isLogoutInProgress = true;
+      }
       const response = await originalFetch(...args);
       if (isLogout && response.ok) {
         window.location.href = "/strapi-plugin-oidc/logout";
+      } else if (isLogout) {
+        isLogoutInProgress = false;
       }
       return response;
     };

package/dist/admin/{index-CINLwPy3.mjs → index-BpfwqZXc.mjs}

@@ -1,11 +1,11 @@
 import { jsxs, Fragment, jsx } from "react/jsx-runtime";
 import { Routes, Route } from "react-router-dom";
-import { useFetchClient, Page, Layouts } from "@strapi/strapi/admin";
+import { useNotification, useFetchClient, Page, Layouts } from "@strapi/strapi/admin";
 import { useState, useCallback, useEffect, memo } from "react";
 import { Typography, Flex, Box, MultiSelect, MultiSelectOption, Field, Button, Divider, Thead, Tr, Th, Tbody, Td, Dialog, IconButton, Pagination, PreviousLink, PageLink, NextLink, Table, Alert } from "@strapi/design-system";
 import { Plus, Trash, WarningCircle } from "@strapi/icons";
 import { useIntl } from "react-intl";
-import { p as pluginId } from "./index-BADTLgSt.mjs";
+import { p as pluginId } from "./index-BBRKt8XS.mjs";
 import en from "./en-DInn-mdh.mjs";
 import styled from "styled-components";
 function getTrad(id) {
@@ -66,19 +66,23 @@ function Whitelist({
   const [selectedRoles, setSelectedRoles] = useState([]);
   const [page, setPage] = useState(1);
   const { formatMessage } = useIntl();
+  const { toggleNotification } = useNotification();
   const PAGE_SIZE = 10;
   const pageCount = Math.ceil(users.length / PAGE_SIZE) || 1;
   const paginatedUsers = users.slice((page - 1) * PAGE_SIZE, page * PAGE_SIZE);
   const onSaveEmail = useCallback(async () => {
     const emailText = email.trim();
     if (users.some((user) => user.email === emailText)) {
-      alert(formatMessage(getTrad("whitelist.error.unique")));
+      toggleNotification({
+        type: "warning",
+        message: formatMessage(getTrad("whitelist.error.unique"))
+      });
     } else {
       await onSave(emailText, selectedRoles);
       setEmail("");
       setSelectedRoles([]);
     }
-  }, [email, selectedRoles, users, onSave, formatMessage]);
+  }, [email, selectedRoles, users, onSave, formatMessage, toggleNotification]);
   const isValidEmail = useCallback(() => {
     const emailRegex = /^[^\s@]+@[^\s@]+\.[^\s@]+$/;
     return emailRegex.test(email);

package/dist/admin/{index-Cq1ERJUV.js → index-D-EIdjjQ.js}

@@ -55,7 +55,7 @@ const index = {
           defaultMessage: "Configuration"
         },
         Component: async () => {
-          return await Promise.resolve().then(() => require("./index-C762D8BZ.js"));
+          return await Promise.resolve().then(() => require("./index-Dw-jQQYI.js"));
         },
         permissions: [{ action: "plugin::strapi-plugin-oidc.read", subject: null }]
       }
@@ -67,6 +67,19 @@ const index = {
     });
   },
   bootstrap() {
+    let isLogoutInProgress = false;
+    const isAuthRoute = (path) => {
+      const match = path.match(/\/auth\/(login|register|forgot-password|reset-password)/);
+      return match !== null;
+    };
+    const initialPath = window.location.pathname;
+    let styleElem = null;
+    if (isAuthRoute(initialPath) && !isLogoutInProgress) {
+      styleElem = document.createElement("style");
+      styleElem.innerHTML = "body { display: none !important; }";
+      document.head.appendChild(styleElem);
+    }
+    let willRedirect = false;
     const checkEnforceOIDC = async () => {
       try {
         const response = await window.fetch("/strapi-plugin-oidc/settings/public");
@@ -74,15 +87,17 @@ const index = {
           const data = await response.json();
           if (data.enforceOIDC) {
             const currentPath = window.location.pathname;
-            if (currentPath.endsWith("/auth/login")) {
+            if (isAuthRoute(currentPath) && !isLogoutInProgress) {
+              willRedirect = true;
               window.location.href = "/strapi-plugin-oidc/oidc";
+              return;
             }
             const interceptHistory = (originalMethod) => {
               return function(...args) {
                 const url = args[2];
                 if (url && typeof url === "string") {
                   const urlWithoutQuery = url.split("?")[0].split("#")[0];
-                  if (urlWithoutQuery.endsWith("/auth/login")) {
+                  if (isAuthRoute(urlWithoutQuery) && !isLogoutInProgress) {
                     window.location.href = "/strapi-plugin-oidc/oidc";
                     return;
                   }
@@ -96,6 +111,10 @@ const index = {
         }
       } catch (error) {
         console.error("Failed to check OIDC enforcement setting:", error);
+      } finally {
+        if (!willRedirect && styleElem && styleElem.parentNode) {
+          styleElem.parentNode.removeChild(styleElem);
+        }
       }
     };
     checkEnforceOIDC();
@@ -103,9 +122,14 @@ const index = {
     window.fetch = async (...args) => {
       const url = typeof args[0] === "string" ? args[0] : args[0].url;
       const isLogout = url && url.endsWith("/admin/logout") && args[1]?.method?.toUpperCase() === "POST";
+      if (isLogout) {
+        isLogoutInProgress = true;
+      }
       const response = await originalFetch(...args);
       if (isLogout && response.ok) {
         window.location.href = "/strapi-plugin-oidc/logout";
+      } else if (isLogout) {
+        isLogoutInProgress = false;
       }
       return response;
     };

package/dist/admin/{index-C762D8BZ.js → index-Dw-jQQYI.js}

@@ -7,7 +7,7 @@ const react = require("react");
 const designSystem = require("@strapi/design-system");
 const icons = require("@strapi/icons");
 const reactIntl = require("react-intl");
-const index = require("./index-Cq1ERJUV.js");
+const index = require("./index-D-EIdjjQ.js");
 const en = require("./en-8UlbiAHW.js");
 const styled = require("styled-components");
 const _interopDefault = (e) => e && e.__esModule ? e : { default: e };
@@ -70,19 +70,23 @@ function Whitelist({
   const [selectedRoles, setSelectedRoles] = react.useState([]);
   const [page, setPage] = react.useState(1);
   const { formatMessage } = reactIntl.useIntl();
+  const { toggleNotification } = admin.useNotification();
   const PAGE_SIZE = 10;
   const pageCount = Math.ceil(users.length / PAGE_SIZE) || 1;
   const paginatedUsers = users.slice((page - 1) * PAGE_SIZE, page * PAGE_SIZE);
   const onSaveEmail = react.useCallback(async () => {
     const emailText = email.trim();
     if (users.some((user) => user.email === emailText)) {
-      alert(formatMessage(getTrad("whitelist.error.unique")));
+      toggleNotification({
+        type: "warning",
+        message: formatMessage(getTrad("whitelist.error.unique"))
+      });
     } else {
       await onSave(emailText, selectedRoles);
       setEmail("");
       setSelectedRoles([]);
     }
-  }, [email, selectedRoles, users, onSave, formatMessage]);
+  }, [email, selectedRoles, users, onSave, formatMessage, toggleNotification]);
   const isValidEmail = react.useCallback(() => {
     const emailRegex = /^[^\s@]+@[^\s@]+\.[^\s@]+$/;
     return emailRegex.test(email);

package/dist/admin/index.js

@@ -1,4 +1,4 @@
 "use strict";
 Object.defineProperties(exports, { __esModule: { value: true }, [Symbol.toStringTag]: { value: "Module" } });
-const index = require("./index-Cq1ERJUV.js");
+const index = require("./index-D-EIdjjQ.js");
 exports.default = index.index;

package/dist/admin/index.mjs

@@ -1,4 +1,4 @@
-import { i } from "./index-BADTLgSt.mjs";
+import { i } from "./index-BBRKt8XS.mjs";
 export {
   i as default
 };

package/dist/server/index.js

@@ -12,7 +12,8 @@ function register$1() {
 }
 async function bootstrap({ strapi: strapi2 }) {
   strapi2.server.use(async (ctx, next) => {
-    if (ctx.request.path === "/admin/login" && ctx.request.method === "POST") {
+    const adminUrl = strapi2.config.get("admin.url", "/admin");
+    if (ctx.request.path === `${adminUrl}/login` && ctx.request.method === "POST") {
       try {
         const whitelistService2 = strapi2.plugin("strapi-plugin-oidc").service("whitelist");
         const settings = await whitelistService2.getSettings();
@@ -33,6 +34,18 @@ async function bootstrap({ strapi: strapi2 }) {
         strapi2.log.error("Error checking OIDC enforcement in middleware:", err);
       }
     }
+    if (ctx.request.method === "GET" && (ctx.request.path.startsWith(`${adminUrl}/auth/login`) || ctx.request.path.startsWith(`${adminUrl}/auth/register`) || ctx.request.path.startsWith(`${adminUrl}/auth/forgot-password`) || ctx.request.path.startsWith(`${adminUrl}/auth/reset-password`))) {
+      try {
+        const whitelistService2 = strapi2.plugin("strapi-plugin-oidc").service("whitelist");
+        const settings = await whitelistService2.getSettings();
+        if (settings && settings.enforceOIDC) {
+          ctx.redirect("/strapi-plugin-oidc/oidc");
+          return;
+        }
+      } catch (err) {
+        strapi2.log.error("Error checking OIDC enforcement in GET middleware:", err);
+      }
+    }
     await next();
   });
   const actions = [

package/dist/server/index.mjs

@@ -6,7 +6,8 @@ function register$1() {
 }
 async function bootstrap({ strapi: strapi2 }) {
   strapi2.server.use(async (ctx, next) => {
-    if (ctx.request.path === "/admin/login" && ctx.request.method === "POST") {
+    const adminUrl = strapi2.config.get("admin.url", "/admin");
+    if (ctx.request.path === `${adminUrl}/login` && ctx.request.method === "POST") {
       try {
         const whitelistService2 = strapi2.plugin("strapi-plugin-oidc").service("whitelist");
         const settings = await whitelistService2.getSettings();
@@ -27,6 +28,18 @@ async function bootstrap({ strapi: strapi2 }) {
         strapi2.log.error("Error checking OIDC enforcement in middleware:", err);
       }
     }
+    if (ctx.request.method === "GET" && (ctx.request.path.startsWith(`${adminUrl}/auth/login`) || ctx.request.path.startsWith(`${adminUrl}/auth/register`) || ctx.request.path.startsWith(`${adminUrl}/auth/forgot-password`) || ctx.request.path.startsWith(`${adminUrl}/auth/reset-password`))) {
+      try {
+        const whitelistService2 = strapi2.plugin("strapi-plugin-oidc").service("whitelist");
+        const settings = await whitelistService2.getSettings();
+        if (settings && settings.enforceOIDC) {
+          ctx.redirect("/strapi-plugin-oidc/oidc");
+          return;
+        }
+      } catch (err) {
+        strapi2.log.error("Error checking OIDC enforcement in GET middleware:", err);
+      }
+    }
     await next();
   });
   const actions = [

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "strapi-plugin-oidc",
-  "version": "1.0.16",
+  "version": "1.0.18",
   "description": "A Strapi plugin that provides OpenID Connect (OIDC) authentication functionality for the Strapi Admin Panel.",
   "strapi": {
     "displayName": "OIDC Plugin",