strapi-plugin-oidc 1.0.4 → 1.0.6

package/dist/admin/{index-DwpTg1-J.mjs → index-p9ncVp1G.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 { useState, useCallback, memo, useEffect } from "react";
+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-BuuCScSN.mjs";
+import { p as pluginId } from "./index-YOG9buUz.mjs";
 import en from "./en-f0TxVfx7.mjs";
 import styled from "styled-components";
 function getTrad(id) {
@@ -24,19 +24,22 @@ function Role({ oidcRoles, roles, onChangeRole }) {
       {
         withTags: true,
         placeholder: formatMessage(getTrad("roles.placeholder")),
-        value: oidcRole["role"] ? oidcRole["role"].map((r) => r.toString()) : [],
+        value: oidcRole.role ? oidcRole.role.map((r) => String(r)) : [],
         onChange: (value) => {
           if (value && value.length > 0) {
-            onChangeRole(value, oidcRole["oauth_type"]);
+            onChangeRole(value, oidcRole.oauth_type);
           }
         },
-        children: roles.map((role) => /* @__PURE__ */ jsx(MultiSelectOption, { value: role.id.toString(), children: role.name }, role.id))
+        children: roles.map((role) => /* @__PURE__ */ jsx(MultiSelectOption, { value: String(role.id), children: role.name }, role.id))
       }
-    ) }, oidcRole["oauth_type"])) })
+    ) }, oidcRole.oauth_type)) })
   ] });
 }
 const CustomTable = styled(Table)`
-  th, td, th span, td span {
+  th,
+  td,
+  th span,
+  td span {
     font-size: 1.3rem !important;
   }
 `;
@@ -50,7 +53,15 @@ const LocalizedDate = ({ date }) => {
     minute: "2-digit"
   }).format(new Date(date));
 };
-function Whitelist({ users, roles, oidcRoles = [], useWhitelist, loading, onSave, onDelete }) {
+function Whitelist({
+  users,
+  roles,
+  oidcRoles = [],
+  useWhitelist,
+  loading,
+  onSave,
+  onDelete
+}) {
   const [email, setEmail] = useState("");
   const [selectedRoles, setSelectedRoles] = useState([]);
   const [page, setPage] = useState(1);
@@ -61,9 +72,7 @@ function Whitelist({ users, roles, oidcRoles = [], useWhitelist, loading, onSave
   const onSaveEmail = useCallback(async () => {
     const emailText = email.trim();
     if (users.some((user) => user.email === emailText)) {
-      alert(
-        formatMessage(getTrad("whitelist.error.unique"))
-      );
+      alert(formatMessage(getTrad("whitelist.error.unique")));
     } else {
       await onSave(emailText, selectedRoles);
       setEmail("");
@@ -122,61 +131,103 @@ function Whitelist({ users, roles, oidcRoles = [], useWhitelist, loading, onSave
         /* @__PURE__ */ jsx(Th, { style: { paddingRight: 0 }, children: " " })
       ] }) }),
       /* @__PURE__ */ jsx(Tbody, { children: users.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("whitelist.table.empty")) }) }) }) }) : paginatedUsers.map((user, index) => {
-        let userRolesNames = (user.roles || []).map((roleId) => {
-          const r = roles.find((ro) => ro.id.toString() === roleId.toString());
+        const getRoleNames = (roleIds) => roleIds.map((roleId) => {
+          const r = roles.find((ro) => String(ro.id) === String(roleId));
           return r ? r.name : roleId;
         }).join(", ");
+        let userRolesNames = getRoleNames(user.roles || []);
         if (!userRolesNames) {
           const defaultRolesIds = oidcRoles.reduce((acc, oidc) => {
-            if (oidc.role) {
-              acc.push(...oidc.role);
-            }
+            if (oidc.role) acc.push(...oidc.role);
             return acc;
           }, []);
-          userRolesNames = defaultRolesIds.map((roleId) => {
-            const r = roles.find((ro) => ro.id.toString() === roleId.toString());
-            return r ? r.name : roleId;
-          }).join(", ");
+          userRolesNames = getRoleNames(defaultRolesIds);
         }
         return /* @__PURE__ */ jsxs(Tr, { children: [
           /* @__PURE__ */ jsx(Td, { children: index + 1 + (page - 1) * PAGE_SIZE }),
           /* @__PURE__ */ jsx(Td, { children: user.email }),
           /* @__PURE__ */ jsx(Td, { children: userRolesNames || "-" }),
           /* @__PURE__ */ jsx(Td, { children: /* @__PURE__ */ jsx(LocalizedDate, { date: user.createdAt }) }),
-          /* @__PURE__ */ jsx(Td, { style: { paddingRight: 0 }, children: /* @__PURE__ */ jsx(Flex, { justifyContent: "flex-end", onClick: (e) => e.stopPropagation(), style: { width: "100%" }, children: /* @__PURE__ */ jsxs(Dialog.Root, { children: [
-            /* @__PURE__ */ jsx(Dialog.Trigger, { children: /* @__PURE__ */ jsx(IconButton, { label: formatMessage(getTrad("whitelist.delete.label")), withTooltip: false, children: /* @__PURE__ */ jsx(Trash, {}) }) }),
-            /* @__PURE__ */ jsxs(Dialog.Content, { children: [
-              /* @__PURE__ */ jsx(Dialog.Header, { children: formatMessage(getTrad("whitelist.delete.title")) }),
-              /* @__PURE__ */ jsx(Dialog.Body, { icon: /* @__PURE__ */ jsx(WarningCircle, { fill: "danger600" }), children: /* @__PURE__ */ jsxs(Flex, { direction: "column", alignItems: "center", gap: 2, children: [
-                /* @__PURE__ */ jsx(Flex, { justifyContent: "center", children: /* @__PURE__ */ jsx(Typography, { id: "confirm-description", children: formatMessage(getTrad("whitelist.delete.description")) }) }),
-                /* @__PURE__ */ jsx(Flex, { justifyContent: "center", children: /* @__PURE__ */ jsx(Typography, { variant: "omega", fontWeight: "bold", children: user.email }) }),
-                /* @__PURE__ */ jsx(Flex, { justifyContent: "center", marginTop: 2, children: /* @__PURE__ */ jsx(Typography, { variant: "pi", textColor: "neutral600", children: formatMessage(getTrad("whitelist.delete.note")) }) })
-              ] }) }),
-              /* @__PURE__ */ jsxs(Dialog.Footer, { children: [
-                /* @__PURE__ */ jsx(Dialog.Cancel, { children: /* @__PURE__ */ jsx(Button, { fullWidth: true, variant: "tertiary", children: formatMessage(getTrad("page.cancel")) }) }),
-                /* @__PURE__ */ jsx(Dialog.Action, { children: /* @__PURE__ */ jsx(Button, { fullWidth: true, variant: "danger-light", onClick: () => onDelete(user.email), children: formatMessage(getTrad("page.ok")) }) })
+          /* @__PURE__ */ jsx(Td, { style: { paddingRight: 0 }, children: /* @__PURE__ */ jsx(
+            Flex,
+            {
+              justifyContent: "flex-end",
+              onClick: (e) => e.stopPropagation(),
+              style: { width: "100%" },
+              children: /* @__PURE__ */ jsxs(Dialog.Root, { children: [
+                /* @__PURE__ */ jsx(Dialog.Trigger, { children: /* @__PURE__ */ jsx(
+                  IconButton,
+                  {
+                    label: formatMessage(getTrad("whitelist.delete.label")),
+                    withTooltip: false,
+                    children: /* @__PURE__ */ jsx(Trash, {})
+                  }
+                ) }),
+                /* @__PURE__ */ jsxs(Dialog.Content, { children: [
+                  /* @__PURE__ */ jsx(Dialog.Header, { children: formatMessage(getTrad("whitelist.delete.title")) }),
+                  /* @__PURE__ */ jsx(Dialog.Body, { icon: /* @__PURE__ */ jsx(WarningCircle, { fill: "danger600" }), children: /* @__PURE__ */ jsxs(Flex, { direction: "column", alignItems: "center", gap: 2, children: [
+                    /* @__PURE__ */ jsx(Flex, { justifyContent: "center", children: /* @__PURE__ */ jsx(Typography, { id: "confirm-description", children: formatMessage(getTrad("whitelist.delete.description")) }) }),
+                    /* @__PURE__ */ jsx(Flex, { justifyContent: "center", children: /* @__PURE__ */ jsx(Typography, { variant: "omega", fontWeight: "bold", children: user.email }) }),
+                    /* @__PURE__ */ jsx(Flex, { justifyContent: "center", marginTop: 2, children: /* @__PURE__ */ jsx(Typography, { variant: "pi", textColor: "neutral600", children: formatMessage(getTrad("whitelist.delete.note")) }) })
+                  ] }) }),
+                  /* @__PURE__ */ jsxs(Dialog.Footer, { children: [
+                    /* @__PURE__ */ jsx(Dialog.Cancel, { children: /* @__PURE__ */ jsx(Button, { fullWidth: true, variant: "tertiary", children: formatMessage(getTrad("page.cancel")) }) }),
+                    /* @__PURE__ */ jsx(Dialog.Action, { children: /* @__PURE__ */ jsx(
+                      Button,
+                      {
+                        fullWidth: true,
+                        variant: "danger-light",
+                        onClick: () => onDelete(user.email),
+                        children: formatMessage(getTrad("page.ok"))
+                      }
+                    ) })
+                  ] })
+                ] })
               ] })
-            ] })
-          ] }) }) })
+            }
+          ) })
         ] }, user.email);
       }) })
     ] }),
     pageCount > 1 && /* @__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();
-        setPage((p) => Math.max(1, p - 1));
-      }, children: "Go to previous page" }),
-      Array.from({ length: pageCount }).map((_, i) => /* @__PURE__ */ jsxs(PageLink, { number: i + 1, href: "#", onClick: (e) => {
-        e.preventDefault();
-        setPage(i + 1);
-      }, children: [
-        "Go to page ",
+      /* @__PURE__ */ jsx(
+        PreviousLink,
+        {
+          href: "#",
+          onClick: (e) => {
+            e.preventDefault();
+            setPage((p) => Math.max(1, p - 1));
+          },
+          children: "Go to previous page"
+        }
+      ),
+      Array.from({ length: pageCount }).map((_, i) => /* @__PURE__ */ jsxs(
+        PageLink,
+        {
+          number: i + 1,
+          href: "#",
+          onClick: (e) => {
+            e.preventDefault();
+            setPage(i + 1);
+          },
+          children: [
+            "Go to page ",
+            i + 1
+          ]
+        },
         i + 1
-      ] }, i + 1)),
-      /* @__PURE__ */ jsx(NextLink, { href: "#", onClick: (e) => {
-        e.preventDefault();
-        setPage((p) => Math.min(pageCount, p + 1));
-      }, children: "Go to next page" })
+      )),
+      /* @__PURE__ */ jsx(
+        NextLink,
+        {
+          href: "#",
+          onClick: (e) => {
+            e.preventDefault();
+            setPage((p) => Math.min(pageCount, p + 1));
+          },
+          children: "Go to next page"
+        }
+      )
     ] }) }) })
   ] }) });
 }
@@ -297,9 +348,12 @@ function CustomSwitch({ checked, onChange, label, disabled }) {
     label && /* @__PURE__ */ jsx(Typography, { variant: "pi", fontWeight: "bold", textColor: disabled ? "neutral500" : "neutral800", children: label })
   ] });
 }
-function HomePage() {
-  const { formatMessage } = useIntl();
+function useOidcSettings() {
+  const { get, put } = useFetchClient();
   const [loading, setLoading] = useState(false);
+  const [showSuccess, setSuccess] = useState(false);
+  const [showError, setError] = useState(false);
+  const [showMatched, setMatched] = useState(0);
   const [initialOidcRoles, setInitialOIDCRoles] = useState([]);
   const [oidcRoles, setOIDCRoles] = useState([]);
   const [roles, setRoles] = useState([]);
@@ -309,10 +363,6 @@ function HomePage() {
   const [enforceOIDC, setEnforceOIDC] = useState(false);
   const [initialUsers, setInitialUsers] = useState([]);
   const [users, setUsers] = useState([]);
-  const [showSuccess, setSuccess] = useState(false);
-  const [showError, setError] = useState(false);
-  const [showMatched, setMatched] = useState(0);
-  const { get, put, post, del } = useFetchClient();
   useEffect(() => {
     get(`/strapi-plugin-oidc/oidc-roles`).then((response) => {
       setOIDCRoles(response.data);
@@ -329,31 +379,51 @@ function HomePage() {
       setEnforceOIDC(response.data.enforceOIDC);
       setInitialEnforceOIDC(response.data.enforceOIDC);
     });
-  }, [setOIDCRoles, setRoles]);
+  }, [get]);
   const onChangeRole = (values, oidcId) => {
-    for (const oidcRole of oidcRoles) {
-      if (oidcRole["oauth_type"] === oidcId) {
-        oidcRole["role"] = values;
-      }
+    const updatedRoles = oidcRoles.map(
+      (role) => role.oauth_type === oidcId ? { ...role, role: values } : role
+    );
+    setOIDCRoles(updatedRoles);
+  };
+  const onRegisterWhitelist = async (email, selectedRoles) => {
+    const newUser = { email, roles: selectedRoles, createdAt: (/* @__PURE__ */ new Date()).toISOString() };
+    setUsers([...users, newUser]);
+  };
+  const onDeleteWhitelist = async (email) => {
+    const updatedUsers = users.filter((u) => u.email !== email);
+    setUsers(updatedUsers);
+    if (useWhitelist && updatedUsers.length === 0) {
+      setEnforceOIDC(false);
+    }
+  };
+  const onToggleWhitelist = (e) => {
+    const checked = e.target.checked;
+    setUseWhitelist(checked);
+    if (checked && users.length === 0) {
+      setEnforceOIDC(false);
     }
-    setOIDCRoles(oidcRoles.slice());
   };
+  const onToggleEnforce = (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 () => {
     setLoading(true);
     try {
       await put("/strapi-plugin-oidc/oidc-roles", {
         roles: oidcRoles.map((role) => ({
-          "oauth_type": role["oauth_type"],
-          role: role["role"]
+          oauth_type: role.oauth_type,
+          role: role.role
         }))
       });
+      const syncResponse = await put("/strapi-plugin-oidc/whitelist/sync", {
+        users: users.map((u) => ({ email: u.email, roles: u.roles }))
+      });
       await put("/strapi-plugin-oidc/whitelist/settings", {
         useWhitelist,
         enforceOIDC
       });
-      const syncResponse = await put("/strapi-plugin-oidc/whitelist/sync", {
-        users: users.map((u) => ({ email: u.email, roles: u.roles }))
-      });
       setInitialOIDCRoles(JSON.parse(JSON.stringify(oidcRoles)));
       setInitialUseWhitelist(useWhitelist);
       setInitialEnforceOIDC(enforceOIDC);
@@ -361,43 +431,51 @@ function HomePage() {
         setUsers(getResponse.data.whitelistUsers);
         setInitialUsers(JSON.parse(JSON.stringify(getResponse.data.whitelistUsers)));
       });
-      if (syncResponse.data && syncResponse.data.matchedExistingUsersCount > 0) {
+      if (syncResponse.data?.matchedExistingUsersCount > 0) {
         setMatched(syncResponse.data.matchedExistingUsersCount);
-        setTimeout(() => {
-          setMatched(0);
-        }, 3e3);
+        setTimeout(() => setMatched(0), 3e3);
       } else {
         setSuccess(true);
-        setTimeout(() => {
-          setSuccess(false);
-        }, 3e3);
+        setTimeout(() => setSuccess(false), 3e3);
       }
     } catch (e) {
       console.error(e);
       setError(true);
-      setTimeout(() => {
-        setError(false);
-      }, 3e3);
+      setTimeout(() => setError(false), 3e3);
     } finally {
       setLoading(false);
     }
   };
-  const onRegisterWhitelist = async (email, selectedRoles) => {
-    const newUser = { email, roles: selectedRoles, createdAt: (/* @__PURE__ */ new Date()).toISOString() };
-    setUsers([...users, newUser]);
-  };
-  const onDeleteWhitelist = async (email) => {
-    setUsers(users.filter((u) => u.email !== email));
-  };
-  const onToggleWhitelist = (e) => {
-    const newValue = e.target.checked;
-    setUseWhitelist(newValue);
-  };
-  const onToggleEnforce = (e) => {
-    const newValue = e.target.checked;
-    setEnforceOIDC(newValue);
+  return {
+    state: {
+      loading,
+      showSuccess,
+      showError,
+      showMatched,
+      oidcRoles,
+      roles,
+      useWhitelist,
+      enforceOIDC,
+      initialEnforceOIDC,
+      users,
+      isDirty
+    },
+    actions: {
+      setSuccess,
+      setError,
+      setMatched,
+      onChangeRole,
+      onRegisterWhitelist,
+      onDeleteWhitelist,
+      onToggleWhitelist,
+      onToggleEnforce,
+      onSaveAll
+    }
   };
-  const isDirty = useWhitelist !== initialUseWhitelist || enforceOIDC !== initialEnforceOIDC || JSON.stringify(oidcRoles) !== JSON.stringify(initialOidcRoles) || JSON.stringify(users) !== JSON.stringify(initialUsers);
+}
+function HomePage() {
+  const { formatMessage } = useIntl();
+  const { state, actions } = useOidcSettings();
   return /* @__PURE__ */ jsxs(Page.Protect, { permissions: [{ action: "plugin::strapi-plugin-oidc.read", subject: null }], children: [
     /* @__PURE__ */ jsx(
       Layouts.Header,
@@ -406,18 +484,18 @@ function HomePage() {
         subtitle: formatMessage(getTrad("page.title"))
       }
     ),
-    showSuccess && /* @__PURE__ */ jsx(SuccessAlertMessage, { onClose: () => setSuccess(false) }),
-    showError && /* @__PURE__ */ jsx(ErrorAlertMessage, { onClose: () => setError(false) }),
-    showMatched > 0 && /* @__PURE__ */ jsx(MatchedUserAlertMessage, { count: showMatched, onClose: () => setMatched(0) }),
+    state.showSuccess && /* @__PURE__ */ jsx(SuccessAlertMessage, { onClose: () => actions.setSuccess(false) }),
+    state.showError && /* @__PURE__ */ jsx(ErrorAlertMessage, { onClose: () => actions.setError(false) }),
+    state.showMatched > 0 && /* @__PURE__ */ jsx(MatchedUserAlertMessage, { count: state.showMatched, onClose: () => actions.setMatched(0) }),
     /* @__PURE__ */ jsx(Layouts.Content, { children: /* @__PURE__ */ jsxs(Flex, { direction: "column", alignItems: "stretch", gap: 6, children: [
       /* @__PURE__ */ jsxs(Box, { background: "neutral0", hasRadius: true, shadow: "filterShadow", padding: 6, children: [
         /* @__PURE__ */ jsx(Box, { paddingBottom: 4, children: /* @__PURE__ */ jsx(Typography, { variant: "beta", tag: "h2", children: formatMessage(getTrad("roles.title")) }) }),
         /* @__PURE__ */ jsx(
           Role,
           {
-            roles,
-            oidcRoles,
-            onChangeRole
+            roles: state.roles,
+            oidcRoles: state.oidcRoles,
+            onChangeRole: actions.onChangeRole
           }
         )
       ] }),
@@ -427,22 +505,22 @@ function HomePage() {
           /* @__PURE__ */ jsx(
             CustomSwitch,
             {
-              checked: useWhitelist,
-              onChange: onToggleWhitelist,
-              label: useWhitelist ? formatMessage(getTrad("whitelist.toggle.enabled")) : formatMessage(getTrad("whitelist.toggle.disabled"))
+              checked: state.useWhitelist,
+              onChange: actions.onToggleWhitelist,
+              label: state.useWhitelist ? formatMessage(getTrad("whitelist.toggle.enabled")) : formatMessage(getTrad("whitelist.toggle.disabled"))
             }
           )
         ] }),
         /* @__PURE__ */ jsx(
           Whitelist,
           {
-            loading,
-            users,
-            roles,
-            oidcRoles,
-            useWhitelist,
-            onSave: onRegisterWhitelist,
-            onDelete: onDeleteWhitelist
+            loading: state.loading,
+            users: state.users,
+            roles: state.roles,
+            oidcRoles: state.oidcRoles,
+            useWhitelist: state.useWhitelist,
+            onSave: actions.onRegisterWhitelist,
+            onDelete: actions.onDeleteWhitelist
           }
         )
       ] }),
@@ -452,14 +530,14 @@ function HomePage() {
           /* @__PURE__ */ jsx(
             CustomSwitch,
             {
-              checked: enforceOIDC,
-              onChange: onToggleEnforce,
-              disabled: useWhitelist && users.length === 0,
-              label: enforceOIDC ? formatMessage(getTrad("enforce.toggle.enabled")) : formatMessage(getTrad("enforce.toggle.disabled"))
+              checked: state.enforceOIDC,
+              onChange: actions.onToggleEnforce,
+              disabled: state.useWhitelist && state.users.length === 0,
+              label: state.enforceOIDC ? formatMessage(getTrad("enforce.toggle.enabled")) : formatMessage(getTrad("enforce.toggle.disabled"))
             }
           )
         ] }),
-        enforceOIDC && enforceOIDC !== initialEnforceOIDC && /* @__PURE__ */ jsx(Box, { background: "danger100", padding: 3, hasRadius: true, children: /* @__PURE__ */ jsxs(Flex, { gap: 3, alignItems: "center", children: [
+        state.enforceOIDC && state.enforceOIDC !== state.initialEnforceOIDC && /* @__PURE__ */ jsx(Box, { background: "danger100", padding: 3, hasRadius: true, children: /* @__PURE__ */ jsxs(Flex, { gap: 3, alignItems: "center", children: [
           /* @__PURE__ */ jsx(WarningCircle, { fill: "danger600" }),
           /* @__PURE__ */ jsx(Typography, { textColor: "danger600", children: formatMessage(getTrad("enforce.warning")) })
         ] }) })
@@ -468,9 +546,9 @@ function HomePage() {
         Button,
         {
           size: "L",
-          onClick: onSaveAll,
-          disabled: !isDirty || loading,
-          loading,
+          onClick: actions.onSaveAll,
+          disabled: !state.isDirty || state.loading,
+          loading: state.loading,
           children: formatMessage(getTrad("page.save"))
         }
       ) })

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-C0GkDnGG.js");
+const index = require("./index-BITZIRCD.js");
 exports.default = index.index;

package/dist/admin/index.mjs

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