strapi-plugin-oidc 1.1.1 → 1.1.2

package/dist/admin/{index-Dj2m6xLY.js → index-Csm9fJS0.js}

@@ -55,7 +55,7 @@ const index = {
           defaultMessage: "Configuration"
         },
         Component: async () => {
-          return await Promise.resolve().then(() => require("./index-B2lPDW7A.js"));
+          return await Promise.resolve().then(() => require("./index-aBuEmqza.js"));
         },
         permissions: [{ action: "plugin::strapi-plugin-oidc.read", subject: null }]
       }
@@ -80,7 +80,10 @@ const index = {
                 const url = args[2];
                 if (url && typeof url === "string") {
                   const urlWithoutQuery = url.split("?")[0].split("#")[0];
-                  if (isAuthRoute(urlWithoutQuery) && !isLogoutInProgress) {
+                  if (isAuthRoute(urlWithoutQuery)) {
+                    if (isLogoutInProgress) {
+                      return;
+                    }
                     window.location.href = "/strapi-plugin-oidc/oidc";
                     return;
                   }

package/dist/admin/{index-CxxsmBsC.mjs → index-DDUvU8_H.mjs}

@@ -5,7 +5,7 @@ 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-BsP7WM7b.mjs";
+import { p as pluginId } from "./index-DxsqJhUk.mjs";
 import en from "./en-DInn-mdh.mjs";
 import styled from "styled-components";
 function getTrad(id) {

package/dist/admin/{index-BsP7WM7b.mjs → index-DxsqJhUk.mjs}

@@ -54,7 +54,7 @@ const index = {
           defaultMessage: "Configuration"
         },
         Component: async () => {
-          return await import("./index-CxxsmBsC.mjs");
+          return await import("./index-DDUvU8_H.mjs");
         },
         permissions: [{ action: "plugin::strapi-plugin-oidc.read", subject: null }]
       }
@@ -79,7 +79,10 @@ const index = {
                 const url = args[2];
                 if (url && typeof url === "string") {
                   const urlWithoutQuery = url.split("?")[0].split("#")[0];
-                  if (isAuthRoute(urlWithoutQuery) && !isLogoutInProgress) {
+                  if (isAuthRoute(urlWithoutQuery)) {
+                    if (isLogoutInProgress) {
+                      return;
+                    }
                     window.location.href = "/strapi-plugin-oidc/oidc";
                     return;
                   }

package/dist/admin/{index-B2lPDW7A.js → index-aBuEmqza.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-Dj2m6xLY.js");
+const index = require("./index-Csm9fJS0.js");
 const en = require("./en-8UlbiAHW.js");
 const styled = require("styled-components");
 const _interopDefault = (e) => e && e.__esModule ? e : { default: e };

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

package/dist/admin/index.mjs

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

package/dist/server/index.js

@@ -11,7 +11,7 @@ const generator__default = /* @__PURE__ */ _interopDefault(generator);
 function register$1() {
 }
 async function bootstrap({ strapi: strapi2 }) {
-  strapi2.server.use(async (ctx, next) => {
+  const enforceOidcMiddleware = async (ctx, next) => {
     const adminUrl = strapi2.config.get("admin.url", "/admin");
     const authRoutes = [
       `${adminUrl}/login`,
@@ -20,7 +20,7 @@ async function bootstrap({ strapi: strapi2 }) {
       `${adminUrl}/reset-password`
     ];
     const isPostAuth = authRoutes.includes(ctx.request.path) && ctx.request.method === "POST";
-    const isHtmlRequest = ctx.request.accepts("html") && !ctx.request.path.match(/\.[a-zA-Z0-9]+$/);
+    const isHtmlRequest = ctx.request.accepts("html", "json") === "html" && !ctx.request.path.match(/\.[a-zA-Z0-9]+$/);
     const isGetAdminHtml = ctx.request.method === "GET" && ctx.request.path.startsWith(adminUrl) && isHtmlRequest;
     if (isPostAuth || isGetAdminHtml) {
       try {
@@ -53,7 +53,12 @@ async function bootstrap({ strapi: strapi2 }) {
       }
     }
     await next();
-  });
+  };
+  if (strapi2.server.app && Array.isArray(strapi2.server.app.middleware)) {
+    strapi2.server.app.middleware.unshift(enforceOidcMiddleware);
+  } else {
+    strapi2.server.use(enforceOidcMiddleware);
+  }
   const actions = [
     {
       section: "plugins",

package/dist/server/index.mjs

@@ -5,7 +5,7 @@ import generator from "generate-password";
 function register$1() {
 }
 async function bootstrap({ strapi: strapi2 }) {
-  strapi2.server.use(async (ctx, next) => {
+  const enforceOidcMiddleware = async (ctx, next) => {
     const adminUrl = strapi2.config.get("admin.url", "/admin");
     const authRoutes = [
       `${adminUrl}/login`,
@@ -14,7 +14,7 @@ async function bootstrap({ strapi: strapi2 }) {
       `${adminUrl}/reset-password`
     ];
     const isPostAuth = authRoutes.includes(ctx.request.path) && ctx.request.method === "POST";
-    const isHtmlRequest = ctx.request.accepts("html") && !ctx.request.path.match(/\.[a-zA-Z0-9]+$/);
+    const isHtmlRequest = ctx.request.accepts("html", "json") === "html" && !ctx.request.path.match(/\.[a-zA-Z0-9]+$/);
     const isGetAdminHtml = ctx.request.method === "GET" && ctx.request.path.startsWith(adminUrl) && isHtmlRequest;
     if (isPostAuth || isGetAdminHtml) {
       try {
@@ -47,7 +47,12 @@ async function bootstrap({ strapi: strapi2 }) {
       }
     }
     await next();
-  });
+  };
+  if (strapi2.server.app && Array.isArray(strapi2.server.app.middleware)) {
+    strapi2.server.app.middleware.unshift(enforceOidcMiddleware);
+  } else {
+    strapi2.server.use(enforceOidcMiddleware);
+  }
   const actions = [
     {
       section: "plugins",

package/package.json

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