strapi-plugin-oidc 1.6.3 → 1.6.5

package/dist/admin/{index-f3cmU_tE.js → index-C2BnnDzh.js}

@@ -66,8 +66,6 @@ const en = {
   "whitelist.toggle.enabled": "Enabled",
   "whitelist.toggle.disabled": "Disabled",
   "whitelist.email.placeholder": "Email address",
-  "whitelist.roles.placeholder": "Select specific role(s)",
-  "whitelist.table.roles": "Role(s)",
   "whitelist.table.empty": "No email addresses",
   "whitelist.delete.label": "Delete",
   "page.title.oidc": "OIDC",
@@ -91,7 +89,6 @@ const en = {
   "unsaved.description": "You have unsaved changes that will be lost if you leave. Do you want to continue?",
   "unsaved.confirm": "Leave",
   "unsaved.cancel": "Stay",
-  "whitelist.table.roles.default": "(Default)",
   "auditlog.title": "Audit Logs",
   "auditlog.export": "Download",
   "auditlog.table.timestamp": "Timestamp",
@@ -100,6 +97,7 @@ const en = {
   "auditlog.table.ip": "IP",
   "auditlog.table.details": "Details",
   "auditlog.table.empty": "No audit log entries",
+  "auditlog.loading": "Loading…",
   "auditlog.clear": "Clear Logs",
   "auditlog.clear.title": "Clear All Logs",
   "auditlog.clear.description": "This will permanently delete all {count, plural, one {# audit log entry} other {# audit log entries}}. This action cannot be undone.",
@@ -118,7 +116,9 @@ const en = {
   "auditlog.action.whitelist_rejected": "The user's email address is not on the whitelist. Access was denied.",
   "user.missing_code": "Authorisation code was not received from the OIDC provider.",
   "user.invalid_state": "State parameter mismatch. Please restart the login flow.",
-  "user.signInError": "Authentication failed. Please try again."
+  "user.signInError": "Authentication failed. Please try again.",
+  "settings.section": "OIDC",
+  "settings.configuration": "Configuration"
 };
 function getTrad(id) {
   const pluginIdWithId = `${pluginId}.${id}`;
@@ -137,7 +137,7 @@ const index = {
       {
         id: "oidc",
         intlLabel: {
-          id: `${pluginId}.settings.section`,
+          id: "settings.section",
           defaultMessage: "OIDC"
         }
       },
@@ -145,11 +145,11 @@ const index = {
         id: "configuration",
         to: `/settings/${pluginId}`,
         intlLabel: {
-          id: `${pluginId}.settings.configuration`,
+          id: "settings.configuration",
           defaultMessage: "Configuration"
         },
         Component: async () => {
-          return await Promise.resolve().then(() => require("./index-DTOcUHZi.js"));
+          return await Promise.resolve().then(() => require("./index-pWwCtdNu.js"));
         },
         permissions: [{ action: "plugin::strapi-plugin-oidc.read", subject: null }]
       }
@@ -243,7 +243,7 @@ const index = {
     const originalFetch = window.fetch;
     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";
+      const isLogout = url?.endsWith("/admin/logout") && args[1]?.method?.toUpperCase() === "POST";
       const response = await originalFetch(...args);
       if (isLogout && response.ok) {
         window.localStorage.removeItem("jwtToken");

package/dist/admin/{index-P9HriRms.mjs → index-DgUClS5s.mjs}

@@ -65,8 +65,6 @@ const en = {
   "whitelist.toggle.enabled": "Enabled",
   "whitelist.toggle.disabled": "Disabled",
   "whitelist.email.placeholder": "Email address",
-  "whitelist.roles.placeholder": "Select specific role(s)",
-  "whitelist.table.roles": "Role(s)",
   "whitelist.table.empty": "No email addresses",
   "whitelist.delete.label": "Delete",
   "page.title.oidc": "OIDC",
@@ -90,7 +88,6 @@ const en = {
   "unsaved.description": "You have unsaved changes that will be lost if you leave. Do you want to continue?",
   "unsaved.confirm": "Leave",
   "unsaved.cancel": "Stay",
-  "whitelist.table.roles.default": "(Default)",
   "auditlog.title": "Audit Logs",
   "auditlog.export": "Download",
   "auditlog.table.timestamp": "Timestamp",
@@ -99,6 +96,7 @@ const en = {
   "auditlog.table.ip": "IP",
   "auditlog.table.details": "Details",
   "auditlog.table.empty": "No audit log entries",
+  "auditlog.loading": "Loading…",
   "auditlog.clear": "Clear Logs",
   "auditlog.clear.title": "Clear All Logs",
   "auditlog.clear.description": "This will permanently delete all {count, plural, one {# audit log entry} other {# audit log entries}}. This action cannot be undone.",
@@ -117,7 +115,9 @@ const en = {
   "auditlog.action.whitelist_rejected": "The user's email address is not on the whitelist. Access was denied.",
   "user.missing_code": "Authorisation code was not received from the OIDC provider.",
   "user.invalid_state": "State parameter mismatch. Please restart the login flow.",
-  "user.signInError": "Authentication failed. Please try again."
+  "user.signInError": "Authentication failed. Please try again.",
+  "settings.section": "OIDC",
+  "settings.configuration": "Configuration"
 };
 function getTrad(id) {
   const pluginIdWithId = `${pluginId}.${id}`;
@@ -136,7 +136,7 @@ const index = {
       {
         id: "oidc",
         intlLabel: {
-          id: `${pluginId}.settings.section`,
+          id: "settings.section",
           defaultMessage: "OIDC"
         }
       },
@@ -144,11 +144,11 @@ const index = {
         id: "configuration",
         to: `/settings/${pluginId}`,
         intlLabel: {
-          id: `${pluginId}.settings.configuration`,
+          id: "settings.configuration",
           defaultMessage: "Configuration"
         },
         Component: async () => {
-          return await import("./index-DmJadA2p.mjs");
+          return await import("./index-HQ2uuypE.mjs");
         },
         permissions: [{ action: "plugin::strapi-plugin-oidc.read", subject: null }]
       }
@@ -242,7 +242,7 @@ const index = {
     const originalFetch = window.fetch;
     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";
+      const isLogout = url?.endsWith("/admin/logout") && args[1]?.method?.toUpperCase() === "POST";
       const response = await originalFetch(...args);
       if (isLogout && response.ok) {
         window.localStorage.removeItem("jwtToken");

package/dist/admin/{index-DmJadA2p.mjs → index-HQ2uuypE.mjs}

@@ -5,7 +5,7 @@ import { useState, useRef, useCallback, useEffect, memo } from "react";
 import { Typography, Flex, Box, MultiSelect, MultiSelectOption, Dialog, Button, Table, Pagination, PreviousLink, NextLink, PageLink, Field, Divider, Thead, Tr, Th, Tbody, Td, IconButton, Tooltip, Alert } from "@strapi/design-system";
 import { WarningCircle, Download, Upload, Trash, Plus, Information } from "@strapi/icons";
 import { useIntl } from "react-intl";
-import { g as getTrad } from "./index-P9HriRms.mjs";
+import { g as getTrad } from "./index-DgUClS5s.mjs";
 import styled from "styled-components";
 function Role({ oidcRoles, roles, onChangeRole }) {
   const { formatMessage } = useIntl();
@@ -18,9 +18,7 @@ function Role({ oidcRoles, roles, onChangeRole }) {
         placeholder: formatMessage(getTrad("roles.placeholder")),
         value: oidcRole.role ? oidcRole.role.map((r) => String(r)) : [],
         onChange: (value) => {
-          if (value && value.length > 0) {
-            onChangeRole(value, oidcRole.oauth_type);
-          }
+          if (value && value.length > 0) onChangeRole(value, oidcRole.oauth_type);
         },
         children: roles.map((role) => /* @__PURE__ */ jsx(MultiSelectOption, { value: String(role.id), children: role.name }, role.id))
       }
@@ -73,19 +71,11 @@ function ConfirmDialog({
 function TablePagination({ page, pageCount, onPageChange }) {
   const { formatMessage } = useIntl();
   if (pageCount <= 1) return null;
-  const pageLink = (num) => /* @__PURE__ */ jsx(
-    PageLink,
-    {
-      number: num,
-      href: "#",
-      onClick: (e) => {
-        e.preventDefault();
-        onPageChange(num);
-      },
-      children: formatMessage(getTrad("pagination.page"), { page: num })
-    },
-    num
-  );
+  const handleClick = (e, num) => {
+    e.preventDefault();
+    onPageChange(num);
+  };
+  const pageLink = (num) => /* @__PURE__ */ jsx(PageLink, { number: num, href: "#", onClick: (e) => handleClick(e, num), children: formatMessage(getTrad("pagination.page"), { page: num }) }, num);
   const Ellipsis = () => /* @__PURE__ */ jsx(Typography, { textColor: "neutral600", paddingLeft: 2, paddingRight: 2, children: "…" });
   let pages;
   if (pageCount <= 10) {
@@ -112,31 +102,13 @@ function TablePagination({ page, pageCount, onPageChange }) {
     ] });
   }
   return /* @__PURE__ */ jsx(Box, { paddingTop: 4, children: /* @__PURE__ */ jsx(Flex, { justifyContent: "flex-end", children: /* @__PURE__ */ jsxs(Pagination, { activePage: page, pageCount, children: [
-    /* @__PURE__ */ jsx(
-      PreviousLink,
-      {
-        href: "#",
-        onClick: (e) => {
-          e.preventDefault();
-          onPageChange(Math.max(1, page - 1));
-        },
-        children: formatMessage(getTrad("pagination.previous"))
-      }
-    ),
+    /* @__PURE__ */ jsx(PreviousLink, { href: "#", onClick: (e) => handleClick(e, Math.max(1, page - 1)), children: formatMessage(getTrad("pagination.previous")) }),
     pages,
-    /* @__PURE__ */ jsx(
-      NextLink,
-      {
-        href: "#",
-        onClick: (e) => {
-          e.preventDefault();
-          onPageChange(Math.min(pageCount, page + 1));
-        },
-        children: formatMessage(getTrad("pagination.next"))
-      }
-    )
+    /* @__PURE__ */ jsx(NextLink, { href: "#", onClick: (e) => handleClick(e, Math.min(pageCount, page + 1)), children: formatMessage(getTrad("pagination.next")) })
   ] }) }) });
 }
+const PAGE_SIZE$1 = 10;
+const EMAIL_REGEX = /^[^\s@]+@[^\s@]+\.[^\s@]+$/;
 function Whitelist({
   users,
   useWhitelist,
@@ -152,11 +124,8 @@ function Whitelist({
   const { formatMessage } = useIntl();
   const { toggleNotification } = useNotification();
   const fileInputRef = useRef(null);
-  const PAGE_SIZE2 = 10;
-  const pageCount = Math.ceil(users.length / PAGE_SIZE2) || 1;
-  const paginatedUsers = users.slice((page - 1) * PAGE_SIZE2, page * PAGE_SIZE2);
-  const emailRegex = /^[^\s@]+@[^\s@]+\.[^\s@]+$/;
-  const isValidEmail = emailRegex.test(email);
+  const pageCount = Math.ceil(users.length / PAGE_SIZE$1) || 1;
+  const paginatedUsers = users.slice((page - 1) * PAGE_SIZE$1, page * PAGE_SIZE$1);
   const onSaveEmail = useCallback(() => {
     const emailText = email.trim();
     if (users.some((user) => user.email === emailText)) {
@@ -172,14 +141,15 @@ function Whitelist({
   const handleImport = useCallback(
     async (e) => {
       const file = e.target.files?.[0];
-      if (!fileInputRef.current) return;
+      if (!fileInputRef.current || !file) return;
       fileInputRef.current.value = "";
-      if (!file) return;
       try {
         const text = await file.text();
         const parsed = JSON.parse(text);
         if (!Array.isArray(parsed)) throw new Error();
-        const emails = parsed.filter((item) => item?.email).map((item) => String(item.email).trim().toLowerCase()).filter((email2) => emailRegex.test(email2));
+        const emails = parsed.filter((item) => item?.email).map(
+          (item) => String(item.email).trim().toLowerCase()
+        ).filter((email2) => EMAIL_REGEX.test(email2));
         const count = await onImport(emails);
         if (count === 0) {
           toggleNotification({
@@ -259,7 +229,7 @@ function Whitelist({
             type: "text",
             disabled: loading,
             value: email,
-            hasError: Boolean(email && !isValidEmail),
+            hasError: Boolean(email && !EMAIL_REGEX.test(email)),
             onChange: (e) => setEmail(e.currentTarget.value),
             placeholder: formatMessage(getTrad("whitelist.email.placeholder"))
           }
@@ -269,7 +239,7 @@ function Whitelist({
           {
             size: "L",
             startIcon: /* @__PURE__ */ jsx(Plus, {}),
-            disabled: loading || email.trim() === "" || !isValidEmail,
+            disabled: loading || email.trim() === "" || !EMAIL_REGEX.test(email),
             loading,
             onClick: onSaveEmail,
             children: formatMessage(getTrad("page.add"))
@@ -285,7 +255,7 @@ function Whitelist({
           /* @__PURE__ */ jsx(Th, { style: { paddingRight: 0 }, children: " " })
         ] }) }),
         /* @__PURE__ */ jsx(Tbody, { children: users.length === 0 ? /* @__PURE__ */ jsx(Tr, { children: /* @__PURE__ */ jsx(Td, { colSpan: 4, children: /* @__PURE__ */ jsx(Flex, { justifyContent: "center", padding: 4, children: /* @__PURE__ */ jsx(Typography, { textColor: "neutral600", children: formatMessage(getTrad("whitelist.table.empty")) }) }) }) }) : paginatedUsers.map((user, index) => /* @__PURE__ */ jsxs(Tr, { children: [
-          /* @__PURE__ */ jsx(Td, { children: index + 1 + (page - 1) * PAGE_SIZE2 }),
+          /* @__PURE__ */ jsx(Td, { children: index + 1 + (page - 1) * PAGE_SIZE$1 }),
           /* @__PURE__ */ jsx(Td, { children: user.email }),
           /* @__PURE__ */ jsx(Td, { children: /* @__PURE__ */ jsx(LocalizedDate, { date: user.createdAt, options: { month: "long" } }) }),
           /* @__PURE__ */ jsx(Td, { style: { paddingRight: 0 }, children: /* @__PURE__ */ jsx(
@@ -463,7 +433,7 @@ function AuditLog() {
         /* @__PURE__ */ jsx(Th, { children: formatMessage(getTrad("auditlog.table.details")) })
       ] }) }),
       /* @__PURE__ */ jsxs(Tbody, { children: [
-        loading && /* @__PURE__ */ jsx(Tr, { children: /* @__PURE__ */ jsx(Td, { colSpan: 5, children: /* @__PURE__ */ jsx(Flex, { justifyContent: "center", padding: 4, children: /* @__PURE__ */ jsx(Typography, { textColor: "neutral600", children: "Loading…" }) }) }) }),
+        loading && /* @__PURE__ */ jsx(Tr, { children: /* @__PURE__ */ jsx(Td, { colSpan: 5, children: /* @__PURE__ */ jsx(Flex, { justifyContent: "center", padding: 4, children: /* @__PURE__ */ jsx(Typography, { textColor: "neutral600", children: formatMessage(getTrad("auditlog.loading")) }) }) }) }),
         !loading && records.length === 0 && /* @__PURE__ */ jsx(Tr, { children: /* @__PURE__ */ jsx(Td, { colSpan: 5, children: /* @__PURE__ */ jsx(Flex, { justifyContent: "center", padding: 4, children: /* @__PURE__ */ jsx(Typography, { textColor: "neutral600", children: formatMessage(getTrad("auditlog.table.empty")) }) }) }) }),
         !loading && records.map((record) => /* @__PURE__ */ jsxs(Tr, { children: [
           /* @__PURE__ */ jsx(Td, { children: /* @__PURE__ */ jsx(Typography, { variant: "omega", children: /* @__PURE__ */ jsx(LocalizedDate, { date: record.createdAt, options: { second: "2-digit" } }) }) }),
@@ -629,47 +599,52 @@ function useOidcSettings() {
       setRoles(response.data.data);
     });
     get("/strapi-plugin-oidc/whitelist").then((response) => {
-      setWhitelistResponse(response.data);
-      setUsers(response.data.whitelistUsers);
-      setInitialUsers(deepClone(response.data.whitelistUsers));
-      setUseWhitelist(response.data.useWhitelist);
-      setInitialUseWhitelist(response.data.useWhitelist);
-      setEnforceOIDC(response.data.enforceOIDC);
-      setInitialEnforceOIDC(response.data.enforceOIDC);
-      setEnforceOIDCConfig(response.data.enforceOIDCConfig ?? null);
+      const data = response.data;
+      setWhitelistResponse(data);
+      setUsers(data.whitelistUsers);
+      setInitialUsers(deepClone(data.whitelistUsers));
+      setUseWhitelist(data.useWhitelist);
+      setInitialUseWhitelist(data.useWhitelist);
+      setEnforceOIDC(data.enforceOIDC);
+      setInitialEnforceOIDC(data.enforceOIDC);
+      setEnforceOIDCConfig(data.enforceOIDCConfig ?? null);
     });
   }, [get]);
-  const onChangeRole = (values, oidcId) => {
-    const updatedRoles = oidcRoles.map(
-      (role) => role.oauth_type === oidcId ? { ...role, role: values } : role
+  const onChangeRole = useCallback((values, oidcId) => {
+    setOIDCRoles(
+      (prev) => prev.map((role) => role.oauth_type === oidcId ? { ...role, role: values } : role)
     );
-    setOIDCRoles(updatedRoles);
-  };
-  const onRegisterWhitelist = (email) => {
-    const newUser = { email, createdAt: (/* @__PURE__ */ new Date()).toISOString() };
-    setUsers([...users, newUser]);
-  };
-  const onDeleteWhitelist = (email) => {
-    const updatedUsers = users.filter((u) => u.email !== email);
-    setUsers(updatedUsers);
-    if (useWhitelist && updatedUsers.length === 0) {
-      setEnforceOIDC(false);
-    }
-  };
-  const onDeleteAll = () => {
+  }, []);
+  const onRegisterWhitelist = useCallback((email) => {
+    setUsers((prev) => [...prev, { email, createdAt: (/* @__PURE__ */ new Date()).toISOString() }]);
+  }, []);
+  const onDeleteWhitelist = useCallback(
+    (email) => {
+      setUsers((prev) => {
+        const updated = prev.filter((u) => u.email !== email);
+        if (useWhitelist && updated.length === 0) setEnforceOIDC(false);
+        return updated;
+      });
+    },
+    [useWhitelist]
+  );
+  const onDeleteAll = useCallback(() => {
     setUsers([]);
     if (useWhitelist) setEnforceOIDC(false);
-  };
-  const onImport = async (emails) => {
-    const response = await post("/strapi-plugin-oidc/whitelist/import", {
-      users: emails.map((e) => ({ email: e }))
-    });
-    const refreshed = await get("/strapi-plugin-oidc/whitelist");
-    setUsers(refreshed.data.whitelistUsers);
-    setInitialUsers(deepClone(refreshed.data.whitelistUsers));
-    return response.data.importedCount;
-  };
-  const onExport = async () => {
+  }, [useWhitelist]);
+  const onImport = useCallback(
+    async (emails) => {
+      const response = await post("/strapi-plugin-oidc/whitelist/import", {
+        users: emails.map((e) => ({ email: e }))
+      });
+      const refreshed = await get("/strapi-plugin-oidc/whitelist");
+      setUsers(refreshed.data.whitelistUsers);
+      setInitialUsers(deepClone(refreshed.data.whitelistUsers));
+      return response.data.importedCount;
+    },
+    [post, get]
+  );
+  const onExport = useCallback(async () => {
     const response = await get("/strapi-plugin-oidc/whitelist/export");
     const data = response.data;
     const datetime = formatDatetimeForFilename(/* @__PURE__ */ new Date());
@@ -680,41 +655,37 @@ function useOidcSettings() {
     a.download = `strapi-oidc-whitelist-${datetime}.json`;
     a.click();
     URL.revokeObjectURL(url);
-  };
-  const onToggleWhitelist = (e) => {
-    const checked = e.target.checked;
-    setUseWhitelist(checked);
-    if (checked && users.length === 0) {
-      setEnforceOIDC(false);
-    }
-  };
-  const onToggleEnforce = (e) => {
+  }, [get]);
+  const onToggleWhitelist = useCallback(
+    (e) => {
+      const checked = e.target.checked;
+      setUseWhitelist(checked);
+      if (checked && users.length === 0) setEnforceOIDC(false);
+    },
+    [users.length]
+  );
+  const onToggleEnforce = useCallback((e) => {
     setEnforceOIDC(e.target.checked);
-  };
+  }, []);
   const isDirty = useWhitelist !== initialUseWhitelist || enforceOIDC !== initialEnforceOIDC || JSON.stringify(oidcRoles) !== JSON.stringify(initialOidcRoles) || JSON.stringify(users) !== JSON.stringify(initialUsers);
-  const onSaveAll = async () => {
+  const onSaveAll = useCallback(async () => {
     setLoading(true);
     try {
       await put("/strapi-plugin-oidc/oidc-roles", {
-        roles: oidcRoles.map((role) => ({
-          oauth_type: role.oauth_type,
-          role: role.role
-        }))
+        roles: oidcRoles.map((role) => ({ oauth_type: role.oauth_type, role: role.role }))
       });
       await put("/strapi-plugin-oidc/whitelist/sync", {
         users: users.map((u) => ({ email: u.email }))
       });
-      await put("/strapi-plugin-oidc/whitelist/settings", {
-        useWhitelist,
-        enforceOIDC
-      });
+      await put("/strapi-plugin-oidc/whitelist/settings", { useWhitelist, enforceOIDC });
       setInitialOIDCRoles(deepClone(oidcRoles));
       setInitialUseWhitelist(useWhitelist);
       setInitialEnforceOIDC(enforceOIDC);
       get("/strapi-plugin-oidc/whitelist").then((getResponse) => {
-        setWhitelistResponse(getResponse.data);
-        setUsers(getResponse.data.whitelistUsers);
-        setInitialUsers(deepClone(getResponse.data.whitelistUsers));
+        const data = getResponse.data;
+        setWhitelistResponse(data);
+        setUsers(data.whitelistUsers);
+        setInitialUsers(deepClone(data.whitelistUsers));
       });
       setSuccess(true);
       setTimeout(() => setSuccess(false), 3e3);
@@ -725,7 +696,7 @@ function useOidcSettings() {
     } finally {
       setLoading(false);
     }
-  };
+  }, [put, get, oidcRoles, users, useWhitelist, enforceOIDC]);
   return {
     state: {
       loading,