strapi-plugin-oidc 1.10.0 → 1.10.1

package/dist/admin/{index-CWvZ9OH0.js → index-BF9ZcATc.js}

@@ -212,7 +212,7 @@ const index = {
         id: "settings.configuration",
         defaultMessage: "Configuration"
       },
-      Component: () => Promise.resolve().then(() => require("./index-8VB7hT1F.js")),
+      Component: () => Promise.resolve().then(() => require("./index-iTiehRZW.js")),
       permissions: [{ action: PERMISSIONS.READ, subject: null }]
     };
     app.addSettingsLink(
@@ -232,11 +232,16 @@ const index = {
     });
   },
   bootstrap() {
+    const isAuthRoute = (path) => /\/auth\/(login|register|forgot-password|reset-password)/.test(path);
+    const hasSkipCookie = document.cookie.split(";").some((c) => c.trim() === "oidc_skip_login_page=1");
+    if (hasSkipCookie && isAuthRoute(window.location.pathname)) {
+      window.location.replace(OIDC_SIGN_IN_PATH);
+      return;
+    }
     const overlayContainer = document.createElement("div");
     document.body.appendChild(overlayContainer);
     client.createRoot(overlayContainer).render(React__default.default.createElement(LogoutOverlay));
     const defaultButtonText = t("login.sso");
-    const isAuthRoute = (path) => /\/auth\/(login|register|forgot-password|reset-password)/.test(path);
     let ssoButtonInjected = false;
     let domObserver = null;
     const injectSSOButton = (buttonText) => {

package/dist/admin/{index-CbB2ZVt6.mjs → index-CpOrxYA4.mjs}

@@ -209,7 +209,7 @@ const index = {
         id: "settings.configuration",
         defaultMessage: "Configuration"
       },
-      Component: () => import("./index-DMJjpSUm.mjs"),
+      Component: () => import("./index-DH-_mRbC.mjs"),
       permissions: [{ action: PERMISSIONS.READ, subject: null }]
     };
     app.addSettingsLink(
@@ -229,11 +229,16 @@ const index = {
     });
   },
   bootstrap() {
+    const isAuthRoute = (path) => /\/auth\/(login|register|forgot-password|reset-password)/.test(path);
+    const hasSkipCookie = document.cookie.split(";").some((c) => c.trim() === "oidc_skip_login_page=1");
+    if (hasSkipCookie && isAuthRoute(window.location.pathname)) {
+      window.location.replace(OIDC_SIGN_IN_PATH);
+      return;
+    }
     const overlayContainer = document.createElement("div");
     document.body.appendChild(overlayContainer);
     createRoot(overlayContainer).render(React.createElement(LogoutOverlay));
     const defaultButtonText = t("login.sso");
-    const isAuthRoute = (path) => /\/auth\/(login|register|forgot-password|reset-password)/.test(path);
     let ssoButtonInjected = false;
     let domObserver = null;
     const injectSSOButton = (buttonText) => {

package/dist/admin/{index-DMJjpSUm.mjs → index-DH-_mRbC.mjs}

@@ -5,7 +5,7 @@ import { useState, useRef, useId, useEffect, useCallback, useReducer, useMemo, m
 import { Typography, Flex, Box, MultiSelect, MultiSelectOption, Button, Dialog, Table, Pagination, PreviousLink, NextLink, PageLink, Field, Divider, Thead, Tr, Th, Tbody, Td, IconButton, Loader, Tooltip, Alert } from "@strapi/design-system";
 import { Cross, WarningCircle, Plus, Download, Upload, Trash, Calendar, Mail, Information } from "@strapi/icons";
 import { useIntl } from "react-intl";
-import { g as getTrad, E as EMAIL_REGEX, e as en, A as AUDIT_LOG_DEFAULTS, U as UI_DEFAULTS } from "./index-CbB2ZVt6.mjs";
+import { g as getTrad, E as EMAIL_REGEX, e as en, A as AUDIT_LOG_DEFAULTS, U as UI_DEFAULTS } from "./index-CpOrxYA4.mjs";
 import styled from "styled-components";
 import { Filter, ClipboardList, Server } from "lucide-react";
 function Role({ oidcRoles, roles, onChangeRole }) {

package/dist/admin/{index-8VB7hT1F.js → index-iTiehRZW.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-CWvZ9OH0.js");
+const index = require("./index-BF9ZcATc.js");
 const styled = require("styled-components");
 const lucideReact = require("lucide-react");
 const _interopDefault = (e) => e && e.__esModule ? e : { default: e };

package/dist/admin/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperties(exports, { __esModule: { value: true }, [Symbol.toStringTag]: { value: "Module" } });
-const index = require("./index-CWvZ9OH0.js");
+const index = require("./index-BF9ZcATc.js");
 require("react");
 require("react-dom/client");
 exports.default = index.index;

package/dist/admin/index.mjs

@@ -1,4 +1,4 @@
-import { i } from "./index-CbB2ZVt6.mjs";
+import { i } from "./index-CpOrxYA4.mjs";
 import "react";
 import "react-dom/client";
 export {

package/dist/server/index.js

@@ -254,7 +254,8 @@ const COOKIE_NAMES = {
   accessToken: "oidc_access_token",
   userEmail: "oidc_user_email",
   adminRefresh: "strapi_admin_refresh",
-  authenticated: "oidc_authenticated"
+  authenticated: "oidc_authenticated",
+  skipLoginPage: "oidc_skip_login_page"
 };
 function shouldMarkSecure(strapi2, ctx) {
   const isProduction = strapi2.config.get("environment") === "production";
@@ -307,7 +308,17 @@ async function bootstrap({ strapi: strapi2 }) {
     const isAuthRoute = AUTH_ROUTES.some((r) => path.includes(r));
     const isTokenRefresh = path === tokenRefreshPath;
     const config2 = getPluginConfig();
-    if (config2.OIDC_SKIP_LOGIN_PAGE && ctx.request.method === "GET" && (path === adminUrl || path.startsWith(`${adminUrl}/`)) && !EXCLUDED_ADMIN_PATHS.includes(path) && !STATIC_EXTENSIONS.some((ext) => path.endsWith(ext)) && !ctx.cookies.get(COOKIE_NAMES.adminRefresh)) {
+    const isAdminPage = ctx.request.method === "GET" && (path === adminUrl || path.startsWith(`${adminUrl}/`)) && !STATIC_EXTENSIONS.some((ext) => path.endsWith(ext));
+    if (isAdminPage) {
+      ctx.cookies.set(COOKIE_NAMES.skipLoginPage, config2.OIDC_SKIP_LOGIN_PAGE ? "1" : "0", {
+        httpOnly: false,
+        signed: false,
+        sameSite: "lax",
+        path: adminUrl,
+        secure: false
+      });
+    }
+    if (config2.OIDC_SKIP_LOGIN_PAGE && isAdminPage && !EXCLUDED_ADMIN_PATHS.includes(path) && !ctx.cookies.get(COOKIE_NAMES.adminRefresh)) {
       ctx.redirect(OIDC_SIGN_IN_PATH);
       return;
     }

package/dist/server/index.mjs

@@ -248,7 +248,8 @@ const COOKIE_NAMES = {
   accessToken: "oidc_access_token",
   userEmail: "oidc_user_email",
   adminRefresh: "strapi_admin_refresh",
-  authenticated: "oidc_authenticated"
+  authenticated: "oidc_authenticated",
+  skipLoginPage: "oidc_skip_login_page"
 };
 function shouldMarkSecure(strapi2, ctx) {
   const isProduction = strapi2.config.get("environment") === "production";
@@ -301,7 +302,17 @@ async function bootstrap({ strapi: strapi2 }) {
     const isAuthRoute = AUTH_ROUTES.some((r) => path.includes(r));
     const isTokenRefresh = path === tokenRefreshPath;
     const config2 = getPluginConfig();
-    if (config2.OIDC_SKIP_LOGIN_PAGE && ctx.request.method === "GET" && (path === adminUrl || path.startsWith(`${adminUrl}/`)) && !EXCLUDED_ADMIN_PATHS.includes(path) && !STATIC_EXTENSIONS.some((ext) => path.endsWith(ext)) && !ctx.cookies.get(COOKIE_NAMES.adminRefresh)) {
+    const isAdminPage = ctx.request.method === "GET" && (path === adminUrl || path.startsWith(`${adminUrl}/`)) && !STATIC_EXTENSIONS.some((ext) => path.endsWith(ext));
+    if (isAdminPage) {
+      ctx.cookies.set(COOKIE_NAMES.skipLoginPage, config2.OIDC_SKIP_LOGIN_PAGE ? "1" : "0", {
+        httpOnly: false,
+        signed: false,
+        sameSite: "lax",
+        path: adminUrl,
+        secure: false
+      });
+    }
+    if (config2.OIDC_SKIP_LOGIN_PAGE && isAdminPage && !EXCLUDED_ADMIN_PATHS.includes(path) && !ctx.cookies.get(COOKIE_NAMES.adminRefresh)) {
       ctx.redirect(OIDC_SIGN_IN_PATH);
       return;
     }

package/package.json

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