strapi-plugin-oidc 1.10.1 → 1.10.2

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

@@ -212,7 +212,7 @@ const index = {
         id: "settings.configuration",
         defaultMessage: "Configuration"
       },
-      Component: () => Promise.resolve().then(() => require("./index-iTiehRZW.js")),
+      Component: () => Promise.resolve().then(() => require("./index-DN2ccKqO.js")),
       permissions: [{ action: PERMISSIONS.READ, subject: null }]
     };
     app.addSettingsLink(
@@ -233,8 +233,8 @@ 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)) {
+    const isServerBounce = window.location.search.includes("oidc_redirect=1");
+    if (!isServerBounce && isAuthRoute(window.location.pathname)) {
       window.location.replace(OIDC_SIGN_IN_PATH);
       return;
     }

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

package/dist/admin/{index-DH-_mRbC.mjs → index-Dn8QUbkK.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-CpOrxYA4.mjs";
+import { g as getTrad, E as EMAIL_REGEX, e as en, A as AUDIT_LOG_DEFAULTS, U as UI_DEFAULTS } from "./index-DnhzQm30.mjs";
 import styled from "styled-components";
 import { Filter, ClipboardList, Server } from "lucide-react";
 function Role({ oidcRoles, roles, onChangeRole }) {

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

@@ -209,7 +209,7 @@ const index = {
         id: "settings.configuration",
         defaultMessage: "Configuration"
       },
-      Component: () => import("./index-DH-_mRbC.mjs"),
+      Component: () => import("./index-Dn8QUbkK.mjs"),
       permissions: [{ action: PERMISSIONS.READ, subject: null }]
     };
     app.addSettingsLink(
@@ -230,8 +230,8 @@ 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)) {
+    const isServerBounce = window.location.search.includes("oidc_redirect=1");
+    if (!isServerBounce && isAuthRoute(window.location.pathname)) {
       window.location.replace(OIDC_SIGN_IN_PATH);
       return;
     }

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-BF9ZcATc.js");
+const index = require("./index-B-sTTO3a.js");
 require("react");
 require("react-dom/client");
 exports.default = index.index;

package/dist/admin/index.mjs

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

package/dist/server/index.js

@@ -254,8 +254,7 @@ const COOKIE_NAMES = {
   accessToken: "oidc_access_token",
   userEmail: "oidc_user_email",
   adminRefresh: "strapi_admin_refresh",
-  authenticated: "oidc_authenticated",
-  skipLoginPage: "oidc_skip_login_page"
+  authenticated: "oidc_authenticated"
 };
 function shouldMarkSecure(strapi2, ctx) {
   const isProduction = strapi2.config.get("environment") === "production";
@@ -308,17 +307,7 @@ async function bootstrap({ strapi: strapi2 }) {
     const isAuthRoute = AUTH_ROUTES.some((r) => path.includes(r));
     const isTokenRefresh = path === tokenRefreshPath;
     const config2 = getPluginConfig();
-    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)) {
+    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)) {
       ctx.redirect(OIDC_SIGN_IN_PATH);
       return;
     }
@@ -3618,7 +3607,13 @@ function t(locale, key, fallback) {
 }
 async function oidcSignIn(ctx) {
   try {
-    const { OIDC_CLIENT_ID, OIDC_REDIRECT_URI, OIDC_SCOPE, OIDC_AUTHORIZATION_ENDPOINT } = configValidation();
+    const config2 = configValidation();
+    if (!config2.OIDC_SKIP_LOGIN_PAGE) {
+      const adminUrl = strapi.config.get("admin.url", "/admin");
+      ctx.redirect(`${adminUrl}/auth/login?oidc_redirect=1`);
+      return;
+    }
+    const { OIDC_CLIENT_ID, OIDC_REDIRECT_URI, OIDC_SCOPE, OIDC_AUTHORIZATION_ENDPOINT } = config2;
     const { code_verifier: codeVerifier, code_challenge: codeChallenge } = await pkceChallenge__default.default();
     const state = node_crypto.randomBytes(32).toString("base64url");
     const nonce = node_crypto.randomBytes(32).toString("base64url");

package/dist/server/index.mjs

@@ -248,8 +248,7 @@ const COOKIE_NAMES = {
   accessToken: "oidc_access_token",
   userEmail: "oidc_user_email",
   adminRefresh: "strapi_admin_refresh",
-  authenticated: "oidc_authenticated",
-  skipLoginPage: "oidc_skip_login_page"
+  authenticated: "oidc_authenticated"
 };
 function shouldMarkSecure(strapi2, ctx) {
   const isProduction = strapi2.config.get("environment") === "production";
@@ -302,17 +301,7 @@ async function bootstrap({ strapi: strapi2 }) {
     const isAuthRoute = AUTH_ROUTES.some((r) => path.includes(r));
     const isTokenRefresh = path === tokenRefreshPath;
     const config2 = getPluginConfig();
-    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)) {
+    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)) {
       ctx.redirect(OIDC_SIGN_IN_PATH);
       return;
     }
@@ -3612,7 +3601,13 @@ function t(locale, key, fallback) {
 }
 async function oidcSignIn(ctx) {
   try {
-    const { OIDC_CLIENT_ID, OIDC_REDIRECT_URI, OIDC_SCOPE, OIDC_AUTHORIZATION_ENDPOINT } = configValidation();
+    const config2 = configValidation();
+    if (!config2.OIDC_SKIP_LOGIN_PAGE) {
+      const adminUrl = strapi.config.get("admin.url", "/admin");
+      ctx.redirect(`${adminUrl}/auth/login?oidc_redirect=1`);
+      return;
+    }
+    const { OIDC_CLIENT_ID, OIDC_REDIRECT_URI, OIDC_SCOPE, OIDC_AUTHORIZATION_ENDPOINT } = config2;
     const { code_verifier: codeVerifier, code_challenge: codeChallenge } = await pkceChallenge();
     const state = randomBytes(32).toString("base64url");
     const nonce = randomBytes(32).toString("base64url");

package/package.json

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