strapi-plugin-oidc 1.6.5 → 1.6.6

package/dist/admin/{index-pWwCtdNu.js → index-DUFtPEHD.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-C2BnnDzh.js");
+const index = require("./index-DVjS4hOr.js");
 const styled = require("styled-components");
 const _interopDefault = (e) => e && e.__esModule ? e : { default: e };
 const styled__default = /* @__PURE__ */ _interopDefault(styled);
@@ -371,8 +371,7 @@ function AuditLog() {
         });
         return;
       }
-      const text = await response.text();
-      const blob = new Blob([text], { type: "application/x-ndjson" });
+      const blob = await response.blob();
       const url = URL.createObjectURL(blob);
       const a = document.createElement("a");
       a.href = url;
@@ -575,75 +574,201 @@ function formatDatetimeForFilename(date) {
   const seconds = String(date.getSeconds()).padStart(2, "0");
   return `${year}${month}${day}_${hours}${minutes}${seconds}`;
 }
-function deepClone(value) {
-  return JSON.parse(JSON.stringify(value));
+function downloadJson(basename, data) {
+  const datetime = formatDatetimeForFilename(/* @__PURE__ */ new Date());
+  const blob = new Blob([JSON.stringify(data, null, 2)], { type: "application/json" });
+  const url = URL.createObjectURL(blob);
+  const a = document.createElement("a");
+  a.href = url;
+  a.download = `${basename}-${datetime}.json`;
+  a.click();
+  URL.revokeObjectURL(url);
+}
+const initialState = {
+  current: {
+    oidcRoles: [],
+    users: [],
+    useWhitelist: false,
+    enforceOIDC: false
+  },
+  initial: {
+    oidcRoles: [],
+    users: [],
+    useWhitelist: false,
+    enforceOIDC: false
+  },
+  roles: [],
+  enforceOIDCConfig: null,
+  auditLogEnabled: true,
+  loading: false,
+  showSuccess: false,
+  showError: false
+};
+function reducer(state, action) {
+  switch (action.type) {
+    case "hydrate/roles":
+      return { ...state, roles: action.roles };
+    case "hydrate/oidcRoles": {
+      const snapshot = { oidcRoles: action.oidcRoles };
+      return {
+        ...state,
+        current: { ...state.current, ...snapshot },
+        initial: { ...state.initial, ...snapshot }
+      };
+    }
+    case "hydrate/whitelist": {
+      const snapshot = {
+        oidcRoles: action.snapshot.oidcRoles ?? state.current.oidcRoles,
+        users: action.snapshot.users ?? state.current.users,
+        useWhitelist: action.snapshot.useWhitelist ?? state.current.useWhitelist,
+        enforceOIDC: action.snapshot.enforceOIDC ?? state.current.enforceOIDC
+      };
+      return {
+        ...state,
+        current: snapshot,
+        initial: structuredClone(snapshot),
+        enforceOIDCConfig: action.enforceOIDCConfig,
+        auditLogEnabled: action.auditLogEnabled
+      };
+    }
+    case "patch/oidcRole":
+      return {
+        ...state,
+        current: {
+          ...state.current,
+          oidcRoles: state.current.oidcRoles.map(
+            (role) => role.oauth_type === action.oidcId ? { ...role, role: action.values } : role
+          )
+        }
+      };
+    case "user/add":
+      return {
+        ...state,
+        current: {
+          ...state.current,
+          users: [
+            ...state.current.users,
+            { email: action.email, createdAt: (/* @__PURE__ */ new Date()).toISOString() }
+          ]
+        }
+      };
+    case "user/delete": {
+      const updatedUsers = state.current.users.filter((u) => u.email !== action.email);
+      const updated = { users: updatedUsers };
+      let enforceOIDC = state.current.enforceOIDC;
+      if (state.current.useWhitelist && updatedUsers.length === 0) {
+        enforceOIDC = false;
+      }
+      return {
+        ...state,
+        current: { ...state.current, ...updated, enforceOIDC }
+      };
+    }
+    case "users/clear": {
+      const updated = { users: [] };
+      let enforceOIDC = state.current.enforceOIDC;
+      if (state.current.useWhitelist) {
+        enforceOIDC = false;
+      }
+      return {
+        ...state,
+        current: { ...state.current, ...updated, enforceOIDC }
+      };
+    }
+    case "users/replace":
+      return {
+        ...state,
+        current: { ...state.current, users: action.users }
+      };
+    case "toggle/useWhitelist": {
+      const useWhitelist = action.value;
+      let enforceOIDC = state.current.enforceOIDC;
+      if (useWhitelist && state.current.users.length === 0) {
+        enforceOIDC = false;
+      }
+      return {
+        ...state,
+        current: { ...state.current, useWhitelist, enforceOIDC }
+      };
+    }
+    case "toggle/enforceOIDC":
+      return {
+        ...state,
+        current: { ...state.current, enforceOIDC: action.value }
+      };
+    case "commit":
+      return {
+        ...state,
+        initial: structuredClone(
+          action.snapshot ? { ...state.current, ...action.snapshot } : state.current
+        )
+      };
+    case "loading":
+      return { ...state, loading: action.value };
+    case "flash/success":
+      return { ...state, showSuccess: true };
+    case "flash/error":
+      return { ...state, showError: true };
+    case "flash/clear":
+      return {
+        ...state,
+        showSuccess: action.kind === "success" ? false : state.showSuccess,
+        showError: action.kind === "error" ? false : state.showError
+      };
+    default:
+      return state;
+  }
+}
+function isDirtyPrimitive(a, b) {
+  return a !== b;
+}
+function isDirtyArray(a, b) {
+  return JSON.stringify(a) !== JSON.stringify(b);
 }
 function useOidcSettings() {
   const { get, put, post } = admin.useFetchClient();
-  const [loading, setLoading] = react.useState(false);
-  const [showSuccess, setSuccess] = react.useState(false);
-  const [showError, setError] = react.useState(false);
-  const [initialOidcRoles, setInitialOIDCRoles] = react.useState([]);
-  const [oidcRoles, setOIDCRoles] = react.useState([]);
-  const [roles, setRoles] = react.useState([]);
-  const [initialUseWhitelist, setInitialUseWhitelist] = react.useState(false);
-  const [useWhitelist, setUseWhitelist] = react.useState(false);
-  const [initialEnforceOIDC, setInitialEnforceOIDC] = react.useState(false);
-  const [enforceOIDC, setEnforceOIDC] = react.useState(false);
-  const [enforceOIDCConfig, setEnforceOIDCConfig] = react.useState(null);
-  const [initialUsers, setInitialUsers] = react.useState([]);
-  const [users, setUsers] = react.useState([]);
-  const [whitelistResponse, setWhitelistResponse] = react.useState({});
+  const [state, dispatch] = react.useReducer(reducer, initialState);
   react.useEffect(() => {
     get(`/strapi-plugin-oidc/oidc-roles`).then((response) => {
-      setOIDCRoles(response.data);
-      setInitialOIDCRoles(deepClone(response.data));
+      dispatch({ type: "hydrate/oidcRoles", oidcRoles: response.data });
     });
     get(`/admin/roles`).then((response) => {
-      setRoles(response.data.data);
+      dispatch({ type: "hydrate/roles", roles: response.data.data });
     });
     get("/strapi-plugin-oidc/whitelist").then((response) => {
       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);
+      dispatch({
+        type: "hydrate/whitelist",
+        snapshot: {
+          users: data.whitelistUsers,
+          useWhitelist: data.useWhitelist,
+          enforceOIDC: data.enforceOIDC
+        },
+        enforceOIDCConfig: data.enforceOIDCConfig ?? null,
+        auditLogEnabled: data.auditLogEnabled ?? true
+      });
     });
   }, [get]);
   const onChangeRole = react.useCallback((values, oidcId) => {
-    setOIDCRoles(
-      (prev) => prev.map((role) => role.oauth_type === oidcId ? { ...role, role: values } : role)
-    );
+    dispatch({ type: "patch/oidcRole", oidcId, values });
   }, []);
   const onRegisterWhitelist = react.useCallback((email) => {
-    setUsers((prev) => [...prev, { email, createdAt: (/* @__PURE__ */ new Date()).toISOString() }]);
+    dispatch({ type: "user/add", email });
+  }, []);
+  const onDeleteWhitelist = react.useCallback((email) => {
+    dispatch({ type: "user/delete", email });
   }, []);
-  const onDeleteWhitelist = react.useCallback(
-    (email) => {
-      setUsers((prev) => {
-        const updated = prev.filter((u) => u.email !== email);
-        if (useWhitelist && updated.length === 0) setEnforceOIDC(false);
-        return updated;
-      });
-    },
-    [useWhitelist]
-  );
   const onDeleteAll = react.useCallback(() => {
-    setUsers([]);
-    if (useWhitelist) setEnforceOIDC(false);
-  }, [useWhitelist]);
+    dispatch({ type: "users/clear" });
+  }, []);
   const onImport = react.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));
+      dispatch({ type: "users/replace", users: refreshed.data.whitelistUsers });
+      dispatch({ type: "commit" });
       return response.data.importedCount;
     },
     [post, get]
@@ -651,74 +776,77 @@ function useOidcSettings() {
   const onExport = react.useCallback(async () => {
     const response = await get("/strapi-plugin-oidc/whitelist/export");
     const data = response.data;
-    const datetime = formatDatetimeForFilename(/* @__PURE__ */ new Date());
-    const blob = new Blob([JSON.stringify(data, null, 2)], { type: "application/json" });
-    const url = URL.createObjectURL(blob);
-    const a = document.createElement("a");
-    a.href = url;
-    a.download = `strapi-oidc-whitelist-${datetime}.json`;
-    a.click();
-    URL.revokeObjectURL(url);
+    downloadJson("strapi-oidc-whitelist", data);
   }, [get]);
-  const onToggleWhitelist = react.useCallback(
-    (e) => {
-      const checked = e.target.checked;
-      setUseWhitelist(checked);
-      if (checked && users.length === 0) setEnforceOIDC(false);
-    },
-    [users.length]
-  );
+  const onToggleWhitelist = react.useCallback((e) => {
+    dispatch({ type: "toggle/useWhitelist", value: e.target.checked });
+  }, []);
   const onToggleEnforce = react.useCallback((e) => {
-    setEnforceOIDC(e.target.checked);
+    dispatch({ type: "toggle/enforceOIDC", value: e.target.checked });
   }, []);
-  const isDirty = useWhitelist !== initialUseWhitelist || enforceOIDC !== initialEnforceOIDC || JSON.stringify(oidcRoles) !== JSON.stringify(initialOidcRoles) || JSON.stringify(users) !== JSON.stringify(initialUsers);
+  const isDirty = react.useMemo(
+    () => isDirtyPrimitive(state.current.useWhitelist, state.initial.useWhitelist) || isDirtyPrimitive(state.current.enforceOIDC, state.initial.enforceOIDC) || isDirtyArray(state.current.oidcRoles, state.initial.oidcRoles) || isDirtyArray(state.current.users, state.initial.users),
+    [state.current, state.initial]
+  );
   const onSaveAll = react.useCallback(async () => {
-    setLoading(true);
+    dispatch({ type: "loading", value: true });
     try {
-      await put("/strapi-plugin-oidc/oidc-roles", {
-        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 });
-      setInitialOIDCRoles(deepClone(oidcRoles));
-      setInitialUseWhitelist(useWhitelist);
-      setInitialEnforceOIDC(enforceOIDC);
-      get("/strapi-plugin-oidc/whitelist").then((getResponse) => {
-        const data = getResponse.data;
-        setWhitelistResponse(data);
-        setUsers(data.whitelistUsers);
-        setInitialUsers(deepClone(data.whitelistUsers));
+      await Promise.all([
+        put("/strapi-plugin-oidc/oidc-roles", {
+          roles: state.current.oidcRoles.map((role) => ({
+            oauth_type: role.oauth_type,
+            role: role.role
+          }))
+        }),
+        put("/strapi-plugin-oidc/whitelist/sync", {
+          users: state.current.users.map((u) => ({ email: u.email }))
+        }),
+        put("/strapi-plugin-oidc/whitelist/settings", {
+          useWhitelist: state.current.useWhitelist,
+          enforceOIDC: state.current.enforceOIDC
+        })
+      ]);
+      dispatch({ type: "commit" });
+      const getResponse = await get("/strapi-plugin-oidc/whitelist");
+      const data = getResponse.data;
+      dispatch({
+        type: "hydrate/whitelist",
+        snapshot: {
+          users: data.whitelistUsers,
+          useWhitelist: data.useWhitelist,
+          enforceOIDC: data.enforceOIDC
+        },
+        enforceOIDCConfig: data.enforceOIDCConfig ?? null,
+        auditLogEnabled: data.auditLogEnabled ?? true
       });
-      setSuccess(true);
-      setTimeout(() => setSuccess(false), 3e3);
+      dispatch({ type: "flash/success" });
+      setTimeout(() => dispatch({ type: "flash/clear", kind: "success" }), 3e3);
     } catch (e) {
       console.error(e);
-      setError(true);
-      setTimeout(() => setError(false), 3e3);
+      dispatch({ type: "flash/error" });
+      setTimeout(() => dispatch({ type: "flash/clear", kind: "error" }), 3e3);
     } finally {
-      setLoading(false);
+      dispatch({ type: "loading", value: false });
     }
-  }, [put, get, oidcRoles, users, useWhitelist, enforceOIDC]);
+  }, [put, get, state.current]);
   return {
     state: {
-      loading,
-      showSuccess,
-      showError,
-      oidcRoles,
-      roles,
-      useWhitelist,
-      enforceOIDC,
-      enforceOIDCConfig,
-      initialEnforceOIDC,
-      users,
+      loading: state.loading,
+      showSuccess: state.showSuccess,
+      showError: state.showError,
+      oidcRoles: state.current.oidcRoles,
+      roles: state.roles,
+      useWhitelist: state.current.useWhitelist,
+      enforceOIDC: state.current.enforceOIDC,
+      enforceOIDCConfig: state.enforceOIDCConfig,
+      initialEnforceOIDC: state.initial.enforceOIDC,
+      users: state.current.users,
       isDirty,
-      auditLogEnabled: whitelistResponse.auditLogEnabled ?? true
+      auditLogEnabled: state.auditLogEnabled
     },
     actions: {
-      setSuccess,
-      setError,
+      setSuccess: (val) => dispatch({ type: val ? "flash/success" : "flash/clear", kind: "success" }),
+      setError: (val) => dispatch({ type: val ? "flash/error" : "flash/clear", kind: "error" }),
       onChangeRole,
       onRegisterWhitelist,
       onDeleteWhitelist,

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

@@ -23,9 +23,6 @@ const pluginPkg = {
   strapi
 };
 const pluginId = pluginPkg.name.replace(/^@strapi\/plugin-/i, "");
-function getTranslation(id) {
-  return `${pluginId}.${id}`;
-}
 function Initializer({ setPlugin }) {
   const ref = react.useRef();
   ref.current = setPlugin;
@@ -149,7 +146,7 @@ const index = {
           defaultMessage: "Configuration"
         },
         Component: async () => {
-          return await Promise.resolve().then(() => require("./index-pWwCtdNu.js"));
+          return await Promise.resolve().then(() => require("./index-DUFtPEHD.js"));
         },
         permissions: [{ action: "plugin::strapi-plugin-oidc.read", subject: null }]
       }
@@ -262,7 +259,7 @@ const index = {
   async registerTrads({ locales }) {
     const transformKeys = (data) => Object.fromEntries(
       Object.entries(data).map(([key, value]) => [
-        key.startsWith("global.") ? key : getTranslation(key),
+        key.startsWith("global.") ? key : `${pluginId}.${key}`,
         value
       ])
     );

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

package/dist/admin/index.mjs

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