strapi-identity 0.5.0 → 0.6.0

package/dist/admin/{AdminReset-D4NNnBDS.mjs → AdminReset-DzpiB_dK.mjs}

@@ -2,7 +2,7 @@ import { jsxs, Fragment, jsx } from "react/jsx-runtime";
 import { useState, useEffect } from "react";
 import { W as WarningAlert } from "./WarningAlert-VU011LVF.mjs";
 import { Box, Flex, Typography, Grid, Button } from "@strapi/design-system";
-import { g as getToken, a as getTranslation } from "./index-CKG2ZxYT.mjs";
+import { g as getToken, a as getTranslation } from "./index-D1Rr9LMh.mjs";
 import { useIntl } from "react-intl";
 const AdminReset = ({ id }) => {
   const { formatMessage } = useIntl();

package/dist/admin/{AdminReset-BoWx0F06.js → AdminReset-LoJC7kqo.js}

@@ -4,7 +4,7 @@ const jsxRuntime = require("react/jsx-runtime");
 const React = require("react");
 const WarningAlert = require("./WarningAlert-DFE5euMk.js");
 const designSystem = require("@strapi/design-system");
-const index = require("./index-BeqHh5Gz.js");
+const index = require("./index-CHIUAjKH.js");
 const reactIntl = require("react-intl");
 const AdminReset = ({ id }) => {
   const { formatMessage } = reactIntl.useIntl();

package/dist/admin/{ProfileToggle-NJZgrDT_.mjs → ProfileToggle-C5glSkS5.mjs}

@@ -1,7 +1,7 @@
 import { jsx, jsxs, Fragment } from "react/jsx-runtime";
 import { useState, useEffect } from "react";
 import { Modal, Flex, Typography, TextInput, Button, Box, Grid, Field, Toggle } from "@strapi/design-system";
-import { a as getTranslation, I as InputOTP, b as InputOTPGroup, c as InputOTPSlot, d as InputOTPSeparator, g as getToken, C as ConfirmModal, E as EmailOTPModal } from "./index-CKG2ZxYT.mjs";
+import { a as getTranslation, I as InputOTP, b as InputOTPGroup, c as InputOTPSlot, d as InputOTPSeparator, g as getToken, C as ConfirmModal, E as EmailOTPModal } from "./index-D1Rr9LMh.mjs";
 import { useIntl } from "react-intl";
 function RemoveModal({ open, onOpenChange, onSubmit }) {
   const { formatMessage } = useIntl();

package/dist/admin/{ProfileToggle-DtjyJRWN.js → ProfileToggle-DqOHS9Xv.js}

@@ -3,7 +3,7 @@ Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const jsxRuntime = require("react/jsx-runtime");
 const React = require("react");
 const designSystem = require("@strapi/design-system");
-const index = require("./index-BeqHh5Gz.js");
+const index = require("./index-CHIUAjKH.js");
 const reactIntl = require("react-intl");
 function RemoveModal({ open, onOpenChange, onSubmit }) {
   const { formatMessage } = reactIntl.useIntl();

package/dist/admin/{SettingsPage-CZuOMYvG.mjs → SettingsPage-DWuVgPPr.mjs}

@@ -4,7 +4,7 @@ import { W as WarningAlert } from "./WarningAlert-VU011LVF.mjs";
 import { useNotification, Page, Layouts } from "@strapi/strapi/admin";
 import { Button, Flex, Typography, Grid, Field, Toggle, TextInput, Textarea } from "@strapi/design-system";
 import { Check } from "@strapi/icons";
-import { g as getToken, a as getTranslation } from "./index-CKG2ZxYT.mjs";
+import { g as getToken, a as getTranslation } from "./index-D1Rr9LMh.mjs";
 import { useIntl } from "react-intl";
 var commonjsGlobal = typeof globalThis !== "undefined" ? globalThis : typeof window !== "undefined" ? window : typeof global !== "undefined" ? global : typeof self !== "undefined" ? self : {};
 var lodash$1 = { exports: {} };

package/dist/admin/{SettingsPage-BXl7gVGV.js → SettingsPage-ehAdX5ev.js}

@@ -6,7 +6,7 @@ const WarningAlert = require("./WarningAlert-DFE5euMk.js");
 const admin = require("@strapi/strapi/admin");
 const designSystem = require("@strapi/design-system");
 const icons = require("@strapi/icons");
-const index = require("./index-BeqHh5Gz.js");
+const index = require("./index-CHIUAjKH.js");
 const reactIntl = require("react-intl");
 var commonjsGlobal = typeof globalThis !== "undefined" ? globalThis : typeof window !== "undefined" ? window : typeof global !== "undefined" ? global : typeof self !== "undefined" ? self : {};
 var lodash$1 = { exports: {} };

package/dist/admin/{index-BeqHh5Gz.js → index-CHIUAjKH.js}

@@ -1348,6 +1348,7 @@ const Logo = ({ fallbackIcon }) => {
 };
 const VerifyPage = ({ fallbackIcon }) => {
   const auth = admin.useAuth("MFA", (auth2) => auth2);
+  const dispatch = useDispatch();
   const { formatMessage } = reactIntl.useIntl();
   const [error, setError] = React.useState(null);
   const [useRecoveryCode, setUseRecoveryCode] = React.useState(false);
@@ -1370,9 +1371,8 @@ const VerifyPage = ({ fallbackIcon }) => {
           `${response.status} ${response.statusText}: ${data.error || "Unknown error"}`
         );
       }
-      const rawTarget = new URLSearchParams(window.location.search).get("redirectTo") || "/admin";
-      const target = rawTarget.startsWith("/") ? rawTarget : "/admin";
-      window.location.replace(target);
+      const { token, rememberMe } = data.data;
+      dispatch({ type: "admin/login", payload: { token, persist: rememberMe } });
     } catch (error2) {
       setError(
         formatMessage({
@@ -1789,6 +1789,10 @@ const EnforcedPage = () => {
             signal: ac.signal
           })
         ]);
+        if (meRes.status === 401) {
+          window.location.replace("/admin/auth/login");
+          return;
+        }
         if (statusRes.ok) {
           const statusBody = await statusRes.json();
           if (statusBody.data?.status === "full") {
@@ -1804,10 +1808,10 @@ const EnforcedPage = () => {
           const meBody = await meRes.json();
           setUserEmail(meBody.data?.email || "");
         }
+        setLoading(false);
       } catch (error) {
         if (error.name === "AbortError") return;
         console.error("Failed to check MFA status:", error);
-      } finally {
         setLoading(false);
       }
     })();
@@ -1965,7 +1969,7 @@ const plugin = {
       },
       id: "strapi-identity-settings",
       to: `/${PLUGIN_ID}`,
-      Component: () => Promise.resolve().then(() => require("./SettingsPage-BXl7gVGV.js")),
+      Component: () => Promise.resolve().then(() => require("./SettingsPage-ehAdX5ev.js")),
       permissions: [{ action: "plugin::strapi-identity.settings.update" }]
     });
     app.addMiddlewares([mfaRedirect]);
@@ -1974,14 +1978,14 @@ const plugin = {
       id: "profile-toggle",
       route: "/admin/me",
       selector: '#main-content form[method="put"] > :nth-child(2) > div > div > div:nth-child(2)',
-      Component: () => Promise.resolve().then(() => require("./ProfileToggle-DtjyJRWN.js"))
+      Component: () => Promise.resolve().then(() => require("./ProfileToggle-DqOHS9Xv.js"))
     });
     injections.registerRoute({
       id: "admin-reset",
       route: "/admin/settings/users/:id",
       selector: '#main-content form[method="put"] > :nth-child(2) > div > div:nth-child(2)',
       permissions: [{ action: "plugin::strapi-identity.settings.update" }],
-      Component: () => Promise.resolve().then(() => require("./AdminReset-BoWx0F06.js"))
+      Component: () => Promise.resolve().then(() => require("./AdminReset-LoJC7kqo.js"))
     });
     InjectVerify(app);
     InjectEnforced(app);
@@ -2005,10 +2009,20 @@ const plugin = {
   }
 };
 const mfaRedirect = () => {
-  return () => (next) => (action) => {
-    if (action && action.type === "admin/login" && (action.payload || {}).hasOwnProperty("token") && action.payload.token === void 0) {
-      window.location.replace("/admin/strapi-identity/verify");
-      return;
+  return () => (next) => async (action) => {
+    if (action && action.type === "admin/login" && (action.payload || {}).hasOwnProperty("token")) {
+      if (action.payload.token === void 0) {
+        window.location.replace("/admin/strapi-identity/verify");
+        return;
+      }
+      const config = await fetch("/strapi-identity/config", {
+        headers: { authorization: `Bearer ${action.payload.token}` }
+      }).then((res) => res.json());
+      if (config.data?.enabled && config.data?.enforce) {
+        await next(action);
+        window.location.replace("/admin/strapi-identity/enforced");
+        return;
+      }
     }
     return next(action);
   };

package/dist/admin/{index-CKG2ZxYT.mjs → index-D1Rr9LMh.mjs}

@@ -1328,6 +1328,7 @@ const Logo = ({ fallbackIcon }) => {
 };
 const VerifyPage = ({ fallbackIcon }) => {
   const auth = useAuth("MFA", (auth2) => auth2);
+  const dispatch = useDispatch();
   const { formatMessage } = useIntl();
   const [error, setError] = useState(null);
   const [useRecoveryCode, setUseRecoveryCode] = useState(false);
@@ -1350,9 +1351,8 @@ const VerifyPage = ({ fallbackIcon }) => {
           `${response.status} ${response.statusText}: ${data.error || "Unknown error"}`
         );
       }
-      const rawTarget = new URLSearchParams(window.location.search).get("redirectTo") || "/admin";
-      const target = rawTarget.startsWith("/") ? rawTarget : "/admin";
-      window.location.replace(target);
+      const { token, rememberMe } = data.data;
+      dispatch({ type: "admin/login", payload: { token, persist: rememberMe } });
     } catch (error2) {
       setError(
         formatMessage({
@@ -1769,6 +1769,10 @@ const EnforcedPage = () => {
             signal: ac.signal
           })
         ]);
+        if (meRes.status === 401) {
+          window.location.replace("/admin/auth/login");
+          return;
+        }
         if (statusRes.ok) {
           const statusBody = await statusRes.json();
           if (statusBody.data?.status === "full") {
@@ -1784,10 +1788,10 @@ const EnforcedPage = () => {
           const meBody = await meRes.json();
           setUserEmail(meBody.data?.email || "");
         }
+        setLoading(false);
       } catch (error) {
         if (error.name === "AbortError") return;
         console.error("Failed to check MFA status:", error);
-      } finally {
         setLoading(false);
       }
     })();
@@ -1945,7 +1949,7 @@ const plugin = {
       },
       id: "strapi-identity-settings",
       to: `/${PLUGIN_ID}`,
-      Component: () => import("./SettingsPage-CZuOMYvG.mjs"),
+      Component: () => import("./SettingsPage-DWuVgPPr.mjs"),
       permissions: [{ action: "plugin::strapi-identity.settings.update" }]
     });
     app.addMiddlewares([mfaRedirect]);
@@ -1954,14 +1958,14 @@ const plugin = {
       id: "profile-toggle",
       route: "/admin/me",
       selector: '#main-content form[method="put"] > :nth-child(2) > div > div > div:nth-child(2)',
-      Component: () => import("./ProfileToggle-NJZgrDT_.mjs")
+      Component: () => import("./ProfileToggle-C5glSkS5.mjs")
     });
     injections.registerRoute({
       id: "admin-reset",
       route: "/admin/settings/users/:id",
       selector: '#main-content form[method="put"] > :nth-child(2) > div > div:nth-child(2)',
       permissions: [{ action: "plugin::strapi-identity.settings.update" }],
-      Component: () => import("./AdminReset-D4NNnBDS.mjs")
+      Component: () => import("./AdminReset-DzpiB_dK.mjs")
     });
     InjectVerify(app);
     InjectEnforced(app);
@@ -1985,10 +1989,20 @@ const plugin = {
   }
 };
 const mfaRedirect = () => {
-  return () => (next) => (action) => {
-    if (action && action.type === "admin/login" && (action.payload || {}).hasOwnProperty("token") && action.payload.token === void 0) {
-      window.location.replace("/admin/strapi-identity/verify");
-      return;
+  return () => (next) => async (action) => {
+    if (action && action.type === "admin/login" && (action.payload || {}).hasOwnProperty("token")) {
+      if (action.payload.token === void 0) {
+        window.location.replace("/admin/strapi-identity/verify");
+        return;
+      }
+      const config = await fetch("/strapi-identity/config", {
+        headers: { authorization: `Bearer ${action.payload.token}` }
+      }).then((res) => res.json());
+      if (config.data?.enabled && config.data?.enforce) {
+        await next(action);
+        window.location.replace("/admin/strapi-identity/enforced");
+        return;
+      }
     }
     return next(action);
   };

package/dist/admin/index.js

@@ -1,5 +1,5 @@
 "use strict";
 Object.defineProperties(exports, { __esModule: { value: true }, [Symbol.toStringTag]: { value: "Module" } });
-const index = require("./index-BeqHh5Gz.js");
+const index = require("./index-CHIUAjKH.js");
 require("strapi-admin-portal");
 exports.default = index.plugin;

package/dist/admin/index.mjs

@@ -1,4 +1,4 @@
-import { p } from "./index-CKG2ZxYT.mjs";
+import { p } from "./index-D1Rr9LMh.mjs";
 import "strapi-admin-portal";
 export {
   p as default

package/dist/admin/src/components/ConfirmModal/ConfirmModal.d.ts

@@ -6,4 +6,4 @@ export interface ConfirmModalProps {
     secret?: string | null;
     passcodes?: string[] | null;
 }
-export default function ConfirmModal({ open, onOpenChange, onSubmit, qrCodeUri, secret, passcodes, }: ConfirmModalProps): import("react/jsx-runtime").JSX.Element;
+export default function ConfirmModal({ open, onOpenChange, onSubmit, qrCodeUri, secret, passcodes, }: ConfirmModalProps): import("react").JSX.Element;

package/dist/admin/src/components/EmailOTPModal/EmailOTPModal.d.ts

@@ -5,4 +5,4 @@ export interface EmailOTPModalProps {
     onOpenChange: (open: boolean) => void;
     onSuccess: () => void;
 }
-export default function EmailOTPModal({ mode, open, email, onOpenChange, onSuccess, }: EmailOTPModalProps): import("react/jsx-runtime").JSX.Element;
+export default function EmailOTPModal({ mode, open, email, onOpenChange, onSuccess, }: EmailOTPModalProps): import("react").JSX.Element;

package/dist/admin/src/components/InputOTP.d.ts

@@ -2,10 +2,10 @@ import { OTPInput } from 'input-otp';
 import * as React from 'react';
 declare function InputOTP({ className, containerClassName, ...props }: React.ComponentPropsWithoutRef<typeof OTPInput> & {
     containerClassName?: string;
-}): import("react/jsx-runtime").JSX.Element;
-declare function InputOTPGroup({ className, ...props }: React.ComponentProps<'div'>): import("react/jsx-runtime").JSX.Element;
+}): React.JSX.Element;
+declare function InputOTPGroup({ className, ...props }: React.ComponentProps<'div'>): React.JSX.Element;
 declare function InputOTPSlot({ index, className, ...props }: React.ComponentProps<'div'> & {
     index: number;
-}): import("react/jsx-runtime").JSX.Element;
-declare function InputOTPSeparator({ ...props }: React.ComponentProps<'div'>): import("react/jsx-runtime").JSX.Element;
+}): React.JSX.Element;
+declare function InputOTPSeparator({ ...props }: React.ComponentProps<'div'>): React.JSX.Element;
 export { InputOTP, InputOTPGroup, InputOTPSlot, InputOTPSeparator };

package/dist/admin/src/components/RemoveModal/RemoveModal.d.ts

@@ -3,4 +3,4 @@ export interface RemoveModalProps {
     onOpenChange: (open: boolean) => void;
     onSubmit: React.FormEventHandler<HTMLFormElement>;
 }
-export default function RemoveModal({ open, onOpenChange, onSubmit }: RemoveModalProps): import("react/jsx-runtime").JSX.Element;
+export default function RemoveModal({ open, onOpenChange, onSubmit }: RemoveModalProps): import("react").JSX.Element;

package/dist/admin/src/components/WarningAlert/WarningAlert.d.ts

@@ -7,4 +7,4 @@ export interface WarningAlertProps {
     onConfirm: () => void;
     onCancel: () => void;
 }
-export default function WarningAlert({ open, title, children, confirmText, loading, onConfirm, onCancel, }: WarningAlertProps): import("react/jsx-runtime").JSX.Element;
+export default function WarningAlert({ open, title, children, confirmText, loading, onConfirm, onCancel, }: WarningAlertProps): import("react").JSX.Element;

package/dist/admin/src/injection/AdminReset.d.ts

@@ -1,4 +1,4 @@
 declare const AdminReset: ({ id }: {
     id?: string;
-}) => import("react/jsx-runtime").JSX.Element;
+}) => import("react").JSX.Element;
 export default AdminReset;

package/dist/admin/src/injection/ProfileToggle.d.ts

@@ -1,2 +1,2 @@
-declare const ProfileToggle: () => import("react/jsx-runtime").JSX.Element | null;
+declare const ProfileToggle: () => import("react").JSX.Element | null;
 export default ProfileToggle;

package/dist/admin/src/pages/EnforcedPage.d.ts

@@ -9,5 +9,5 @@ export interface InjectPublicRouter extends Omit<StrapiApp['router'], 'router'>
  * Inject the enforced MFA page route into the Strapi admin router
  */
 export declare const InjectEnforced: (app: StrapiApp) => Promise<void>;
-declare const EnforcedPage: () => import("react/jsx-runtime").JSX.Element | null;
+declare const EnforcedPage: () => import("react").JSX.Element | null;
 export { EnforcedPage };

package/dist/admin/src/settings/SettingsPage.d.ts

@@ -1 +1 @@
-export default function SettingsPage(): import("react/jsx-runtime").JSX.Element;
+export default function SettingsPage(): import("react").JSX.Element;

package/dist/server/index.js

@@ -9966,13 +9966,10 @@ const controller = ({ strapi: strapi2 }) => ({
       );
       const accessResult = await sessionManager("admin").generateAccessToken(refreshToken);
       const { token: accessToken } = accessResult;
-      const domain = strapi2.config.get("admin.auth.domain");
-      const opt = { httpOnly: false, secure, overwrite: true, domain };
-      ctx.cookies.set("jwtToken", accessToken, opt);
       ctx.cookies.set("strapi_admin_mfa", null, { expires: /* @__PURE__ */ new Date(0) });
       ctx.status = 200;
       ctx.body = {
-        data: { token: accessToken, accessToken },
+        data: { token: accessToken, accessToken, rememberMe: payload.rememberMe || false },
         error: null
       };
     } catch (error) {
@@ -10382,7 +10379,9 @@ const mfa = [
       policies: [
         "has-mfa"
       ],
-      middlewares: []
+      middlewares: [
+        "admin::rateLimit"
+      ]
     }
   },
   {

package/dist/server/index.mjs

@@ -9959,13 +9959,10 @@ const controller = ({ strapi: strapi2 }) => ({
       );
       const accessResult = await sessionManager("admin").generateAccessToken(refreshToken);
       const { token: accessToken } = accessResult;
-      const domain = strapi2.config.get("admin.auth.domain");
-      const opt = { httpOnly: false, secure, overwrite: true, domain };
-      ctx.cookies.set("jwtToken", accessToken, opt);
       ctx.cookies.set("strapi_admin_mfa", null, { expires: /* @__PURE__ */ new Date(0) });
       ctx.status = 200;
       ctx.body = {
-        data: { token: accessToken, accessToken },
+        data: { token: accessToken, accessToken, rememberMe: payload.rememberMe || false },
         error: null
       };
     } catch (error) {
@@ -10375,7 +10372,9 @@ const mfa = [
       policies: [
         "has-mfa"
       ],
-      middlewares: []
+      middlewares: [
+        "admin::rateLimit"
+      ]
     }
   },
   {

package/dist/server/src/routes/admin/mfa.json.d.ts

@@ -60,7 +60,7 @@ declare const _default: [
     "config": {
       "auth": false,
       "policies": ["has-mfa"],
-      "middlewares": []
+      "middlewares": ["admin::rateLimit"]
     }
   },
   {

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "0.5.0",
+  "version": "0.6.0",
   "keywords": [
     "strapi",
     "plugin",
@@ -34,19 +34,20 @@
     "watch:link": "strapi-plugin watch:link",
     "verify": "strapi-plugin verify",
     "test:ts:front": "run -T tsc -p admin/tsconfig.json",
-    "test:ts:back": "run -T tsc -p server/tsconfig.json"
+    "test:ts:back": "run -T tsc -p server/tsconfig.json",
+    "postversion": "git push && git push --tags"
   },
   "dependencies": {
     "input-otp": "^1.4.2",
-    "otpauth": "^9.5.0",
+    "otpauth": "^9.5.1",
     "qrcode.react": "^4.2.0",
     "strapi-admin-portal": "^0.3.0"
   },
   "devDependencies": {
-    "@strapi/sdk-plugin": "^6.1.0",
-    "@strapi/typescript-utils": "^5.43.0",
+    "@strapi/sdk-plugin": "^6.1.1",
+    "@strapi/typescript-utils": "^5.47.1",
     "@types/bcryptjs": "^2.4.6",
-    "@types/react": "^18.3.28",
+    "@types/react": "^18.3.30",
     "@types/react-dom": "^18.3.7",
     "prettier": "^3.8.3",
     "typescript": "^5.9.3"