strapi-plugin-oidc 1.10.2 → 1.10.4

package/README.md

@@ -35,10 +35,10 @@ module.exports = ({ env }) => ({
     enabled: true,
     config: {
       // Required
+      OIDC_PUBLIC_URL: env('PUBLIC_URL', 'https://strapi.example.com'), // origin only — we append /strapi-plugin-oidc/oidc/callback
       OIDC_ISSUER: env('OIDC_ISSUER'), // https://your-provider or https://your-provider/realms/your-realm
       OIDC_CLIENT_ID: env('OIDC_CLIENT_ID'),
       OIDC_CLIENT_SECRET: env('OIDC_CLIENT_SECRET'),
-      OIDC_REDIRECT_URI: env('OIDC_REDIRECT_URI'), // https://your-strapi.com/strapi-plugin-oidc/oidc/callback
 
       // Optional — defaults shown
       OIDC_SCOPE: 'openid profile email', // space-separated scopes
@@ -59,6 +59,8 @@ module.exports = ({ env }) => ({
 });
 ```
 
+`OIDC_PUBLIC_URL` is your Strapi instance's origin (e.g. `https://myapp.com`). The plugin appends `/strapi-plugin-oidc/oidc/callback` to form the full OIDC redirect URI. If unset, falls back to the `PUBLIC_URL` environment variable. Only provide the scheme + host + port — no trailing slash or path.
+
 `OIDC_ISSUER` is your provider's issuer URL (e.g. `https://auth.example.com` or `https://auth.example.com/realms/myrealm`). The plugin appends `/.well-known/openid-configuration` automatically if not present, and fetches the discovery document at startup to configure all endpoints, JWKS URI, and canonical issuer.
 
 ### Security features
@@ -98,17 +100,6 @@ Only headers that CDN/proxy vendors guarantee to strip from inbound client reque
 
 Navigate to `/strapi-plugin-oidc/oidc` to start the OIDC flow, or click the **Login via SSO** button injected into the Strapi login page.
 
-## Skip Login Page
-
-Set `OIDC_SKIP_LOGIN_PAGE: true` to prevent users from ever seeing the Strapi admin login page. Unauthenticated requests are redirected directly to the OIDC provider. This is typically used alongside `OIDC_ENFORCE: true`.
-
-Two independent mechanisms cover both entry points:
-
-- **Server-side** — A Koa middleware intercepts unauthenticated GET requests to `/admin` and redirects to `/strapi-plugin-oidc/oidc` before the SPA is served. Excluded from this redirect: API routes (`/admin/login`, `/admin/logout`, `/admin/init`, etc.), static assets (`.js`, `.css`, `.png`, etc.), and POST requests.
-- **Client-side** — A DOM `MutationObserver` watches for React Router navigations to `/auth/login` (triggered by session expiry or 401 responses) and redirects before the login form renders.
-
-After logout without a provider `end_session_endpoint`, the fallback URL becomes `/strapi-plugin-oidc/oidc` instead of `/admin/auth/login`, ensuring the user lands on the provider's own page.
-
 ## Logout
 
 When the discovery document includes an `end_session_endpoint`, clicking logout redirects to the provider's end-session URL (RP-initiated logout). If the provider session has already expired, Strapi skips the redirect and goes straight to the login page.
@@ -212,30 +203,30 @@ Duplicate emails within the payload and emails already in the whitelist are sile
 ```bash
 # List
 curl -H "Authorization: Bearer <token>" \
-  http://localhost:1337/api/strapi-plugin-oidc/whitelist
+  https://strapi.example.com/api/strapi-plugin-oidc/whitelist
 
 # Export
 curl -H "Authorization: Bearer <token>" \
-  http://localhost:1337/api/strapi-plugin-oidc/whitelist/export \
+  https://strapi.example.com/api/strapi-plugin-oidc/whitelist/export \
   -o whitelist.json
 
 # Add
 curl -X POST -H "Authorization: Bearer <token>" -H "Content-Type: application/json" \
   -d '{"email": "user@example.com"}' \
-  http://localhost:1337/api/strapi-plugin-oidc/whitelist
+  https://strapi.example.com/api/strapi-plugin-oidc/whitelist
 
 # Bulk import
 curl -X POST -H "Authorization: Bearer <token>" -H "Content-Type: application/json" \
   -d '{"users": [{"email": "a@example.com"}, {"email": "b@example.com"}]}' \
-  http://localhost:1337/api/strapi-plugin-oidc/whitelist/import
+  https://strapi.example.com/api/strapi-plugin-oidc/whitelist/import
 
 # Delete one (by email)
 curl -X DELETE -H "Authorization: Bearer <token>" \
-  "http://localhost:1337/api/strapi-plugin-oidc/whitelist/user%40example.com"
+  "https://strapi.example.com/api/strapi-plugin-oidc/whitelist/user%40example.com"
 
 # Delete all
 curl -X DELETE -H "Authorization: Bearer <token>" \
-  http://localhost:1337/api/strapi-plugin-oidc/whitelist
+  https://strapi.example.com/api/strapi-plugin-oidc/whitelist
 ```
 
 ## Audit Log API
@@ -303,7 +294,7 @@ curl -H "Authorization: Bearer <token>" -G \
   --data-urlencode 'filters[action][$eq]=login_failure' \
   --data-urlencode 'filters[createdAt][$gte]=2026-04-08T00:00:00.000Z' \
   --data-urlencode 'filters[createdAt][$lt]=2026-04-09T00:00:00.000Z' \
-  http://localhost:1337/api/strapi-plugin-oidc/audit-logs
+  https://strapi.example.com/api/strapi-plugin-oidc/audit-logs
 ```
 
 ### Recorded actions
@@ -330,11 +321,11 @@ Each event is also emitted on Strapi's internal eventHub as `strapi-plugin-oidc:
 ```bash
 # Paginated list
 curl -H "Authorization: Bearer <token>" \
-  "http://localhost:1337/api/strapi-plugin-oidc/audit-logs?page=1&pageSize=50"
+  "https://strapi.example.com/api/strapi-plugin-oidc/audit-logs?page=1&pageSize=50"
 
 # NDJSON export
 curl -H "Authorization: Bearer <token>" \
-  http://localhost:1337/api/strapi-plugin-oidc/audit-logs/export \
+  https://strapi.example.com/api/strapi-plugin-oidc/audit-logs/export \
   -o oidc-audit-log.ndjson
 ```
 

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

@@ -198,10 +198,25 @@ const AUDIT_LOG_DEFAULTS = {
   ADMIN_PAGE_SIZE: 10
 };
 const OIDC_SIGN_IN_PATH = "/strapi-plugin-oidc/oidc";
+const AUTH_ROUTES = [
+  "login",
+  "register",
+  "register-admin",
+  "forgot-password",
+  "reset-password"
+];
+const JWT_TOKEN_KEY = "jwtToken";
 const UI_DEFAULTS = {
   MIN_SPINNER_MS: 400
 };
 const EMAIL_REGEX = /^[^\s@]+@[^\s@]+\.[^\s@]+$/;
+function shouldRedirectToOidc(params) {
+  const isServerBounce = params.search.includes("oidc_redirect=1");
+  if (isServerBounce) return false;
+  const hasToken = params.localStorage.getItem(JWT_TOKEN_KEY) || params.cookies.split(";").some((c) => c.trim().startsWith(`${JWT_TOKEN_KEY}=`));
+  if (hasToken) return false;
+  return true;
+}
 const name = pluginPkg.strapi.displayName;
 const index = {
   register(app) {
@@ -212,7 +227,7 @@ const index = {
         id: "settings.configuration",
         defaultMessage: "Configuration"
       },
-      Component: () => Promise.resolve().then(() => require("./index-DN2ccKqO.js")),
+      Component: () => Promise.resolve().then(() => require("./index-DgrNKY9Y.js")),
       permissions: [{ action: PERMISSIONS.READ, subject: null }]
     };
     app.addSettingsLink(
@@ -232,10 +247,19 @@ const index = {
     });
   },
   bootstrap() {
-    const isAuthRoute = (path) => /\/auth\/(login|register|forgot-password|reset-password)/.test(path);
-    const isServerBounce = window.location.search.includes("oidc_redirect=1");
-    if (!isServerBounce && isAuthRoute(window.location.pathname)) {
+    const authRouteNames = AUTH_ROUTES.filter((r) => r !== "register-admin");
+    const authRoutePattern = new RegExp(`/auth/(${authRouteNames.join("|")})`);
+    const isAuthRoute = (path) => authRoutePattern.test(path);
+    if (shouldRedirectToOidc({
+      search: window.location.search,
+      localStorage: window.localStorage,
+      cookies: document.cookie
+    })) {
+      document.documentElement.innerHTML = "";
       window.location.replace(OIDC_SIGN_IN_PATH);
+      setTimeout(() => {
+        window.location.href = OIDC_SIGN_IN_PATH;
+      }, 2e3);
       return;
     }
     const overlayContainer = document.createElement("div");
@@ -317,16 +341,16 @@ const index = {
     const applySettings = async () => {
       try {
         const response = await window.fetch("/strapi-plugin-oidc/settings/public");
-        if (response.ok) {
-          const data = await response.json();
-          if (data.skipLoginPage) {
-            startSkipLoginRedirect();
-            return;
-          }
-          startLoginObserver(data.ssoButtonText || defaultButtonText, !!data.enforceOIDC);
-        } else {
+        if (!response.ok) {
           startLoginObserver(defaultButtonText, false);
+          return;
+        }
+        const data = await response.json();
+        if (data.skipLoginPage) {
+          startSkipLoginRedirect();
+          return;
         }
+        startLoginObserver(data.ssoButtonText || defaultButtonText, !!data.enforceOIDC);
       } catch (error) {
         startLoginObserver(defaultButtonText, false);
         console.error("Failed to fetch OIDC settings:", error);
@@ -341,12 +365,12 @@ const index = {
       const isLogout = url?.endsWith("/admin/logout") && args[1]?.method?.toUpperCase() === "POST";
       if (isLogout) {
         window.dispatchEvent(new CustomEvent(LOGOUT_EVENT));
-        window.localStorage.removeItem("jwtToken");
+        window.localStorage.removeItem(JWT_TOKEN_KEY);
         window.localStorage.removeItem("isLoggedIn");
-        window.sessionStorage.removeItem("jwtToken");
+        window.sessionStorage.removeItem(JWT_TOKEN_KEY);
         window.sessionStorage.removeItem("isLoggedIn");
-        document.cookie = "jwtToken=;expires=Thu, 01 Jan 1970 00:00:00 GMT;path=/";
-        document.cookie = "jwtToken=;expires=Thu, 01 Jan 1970 00:00:00 GMT;path=/admin";
+        document.cookie = `${JWT_TOKEN_KEY}=;expires=Thu, 01 Jan 1970 00:00:00 GMT;path=/`;
+        document.cookie = `${JWT_TOKEN_KEY}=;expires=Thu, 01 Jan 1970 00:00:00 GMT;path=/admin`;
         originalFetch(...args).catch(() => {
         });
         window.location.href = "/strapi-plugin-oidc/logout";

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

@@ -195,10 +195,25 @@ const AUDIT_LOG_DEFAULTS = {
   ADMIN_PAGE_SIZE: 10
 };
 const OIDC_SIGN_IN_PATH = "/strapi-plugin-oidc/oidc";
+const AUTH_ROUTES = [
+  "login",
+  "register",
+  "register-admin",
+  "forgot-password",
+  "reset-password"
+];
+const JWT_TOKEN_KEY = "jwtToken";
 const UI_DEFAULTS = {
   MIN_SPINNER_MS: 400
 };
 const EMAIL_REGEX = /^[^\s@]+@[^\s@]+\.[^\s@]+$/;
+function shouldRedirectToOidc(params) {
+  const isServerBounce = params.search.includes("oidc_redirect=1");
+  if (isServerBounce) return false;
+  const hasToken = params.localStorage.getItem(JWT_TOKEN_KEY) || params.cookies.split(";").some((c) => c.trim().startsWith(`${JWT_TOKEN_KEY}=`));
+  if (hasToken) return false;
+  return true;
+}
 const name = pluginPkg.strapi.displayName;
 const index = {
   register(app) {
@@ -209,7 +224,7 @@ const index = {
         id: "settings.configuration",
         defaultMessage: "Configuration"
       },
-      Component: () => import("./index-Dn8QUbkK.mjs"),
+      Component: () => import("./index-SjMPr_u2.mjs"),
       permissions: [{ action: PERMISSIONS.READ, subject: null }]
     };
     app.addSettingsLink(
@@ -229,10 +244,19 @@ const index = {
     });
   },
   bootstrap() {
-    const isAuthRoute = (path) => /\/auth\/(login|register|forgot-password|reset-password)/.test(path);
-    const isServerBounce = window.location.search.includes("oidc_redirect=1");
-    if (!isServerBounce && isAuthRoute(window.location.pathname)) {
+    const authRouteNames = AUTH_ROUTES.filter((r) => r !== "register-admin");
+    const authRoutePattern = new RegExp(`/auth/(${authRouteNames.join("|")})`);
+    const isAuthRoute = (path) => authRoutePattern.test(path);
+    if (shouldRedirectToOidc({
+      search: window.location.search,
+      localStorage: window.localStorage,
+      cookies: document.cookie
+    })) {
+      document.documentElement.innerHTML = "";
       window.location.replace(OIDC_SIGN_IN_PATH);
+      setTimeout(() => {
+        window.location.href = OIDC_SIGN_IN_PATH;
+      }, 2e3);
       return;
     }
     const overlayContainer = document.createElement("div");
@@ -314,16 +338,16 @@ const index = {
     const applySettings = async () => {
       try {
         const response = await window.fetch("/strapi-plugin-oidc/settings/public");
-        if (response.ok) {
-          const data = await response.json();
-          if (data.skipLoginPage) {
-            startSkipLoginRedirect();
-            return;
-          }
-          startLoginObserver(data.ssoButtonText || defaultButtonText, !!data.enforceOIDC);
-        } else {
+        if (!response.ok) {
           startLoginObserver(defaultButtonText, false);
+          return;
+        }
+        const data = await response.json();
+        if (data.skipLoginPage) {
+          startSkipLoginRedirect();
+          return;
         }
+        startLoginObserver(data.ssoButtonText || defaultButtonText, !!data.enforceOIDC);
       } catch (error) {
         startLoginObserver(defaultButtonText, false);
         console.error("Failed to fetch OIDC settings:", error);
@@ -338,12 +362,12 @@ const index = {
       const isLogout = url?.endsWith("/admin/logout") && args[1]?.method?.toUpperCase() === "POST";
       if (isLogout) {
         window.dispatchEvent(new CustomEvent(LOGOUT_EVENT));
-        window.localStorage.removeItem("jwtToken");
+        window.localStorage.removeItem(JWT_TOKEN_KEY);
         window.localStorage.removeItem("isLoggedIn");
-        window.sessionStorage.removeItem("jwtToken");
+        window.sessionStorage.removeItem(JWT_TOKEN_KEY);
         window.sessionStorage.removeItem("isLoggedIn");
-        document.cookie = "jwtToken=;expires=Thu, 01 Jan 1970 00:00:00 GMT;path=/";
-        document.cookie = "jwtToken=;expires=Thu, 01 Jan 1970 00:00:00 GMT;path=/admin";
+        document.cookie = `${JWT_TOKEN_KEY}=;expires=Thu, 01 Jan 1970 00:00:00 GMT;path=/`;
+        document.cookie = `${JWT_TOKEN_KEY}=;expires=Thu, 01 Jan 1970 00:00:00 GMT;path=/admin`;
         originalFetch(...args).catch(() => {
         });
         window.location.href = "/strapi-plugin-oidc/logout";

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

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

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

package/dist/admin/index.mjs

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

package/dist/server/index.js

@@ -103,7 +103,7 @@ const coerceBoolNullable = zod.z.preprocess(
 );
 const pluginConfigSchema = zod.z.object({
   REMEMBER_ME: coerceBool(false),
-  OIDC_REDIRECT_URI: zod.z.string().default(""),
+  OIDC_PUBLIC_URL: zod.z.string().default(""),
   OIDC_CLIENT_ID: zod.z.string().default(""),
   OIDC_CLIENT_SECRET: zod.z.string().default(""),
   OIDC_SCOPE: zod.z.string().default("openid profile email"),
@@ -175,6 +175,14 @@ const DAY_MS = 864e5;
 const DISCOVERY_TIMEOUT_MS = 5e3;
 const OIDC_DISCOVERY_PATH = "/.well-known/openid-configuration";
 const OIDC_SIGN_IN_PATH = "/strapi-plugin-oidc/oidc";
+const OIDC_CALLBACK_PATH = "/strapi-plugin-oidc/oidc/callback";
+const AUTH_ROUTES = [
+  "login",
+  "register",
+  "register-admin",
+  "forgot-password",
+  "reset-password"
+];
 const EMAIL_REGEX = /^[^\s@]+@[^\s@]+\.[^\s@]+$/;
 function getPluginConfig() {
   return pluginConfigSchema.parse(strapi.config.get("plugin::strapi-plugin-oidc") ?? {});
@@ -285,11 +293,11 @@ function clearAuthCookies(strapi2, ctx) {
   ctx.cookies.set(COOKIE_NAMES.accessToken, "", rootPathOptions);
   ctx.cookies.set(COOKIE_NAMES.userEmail, "", rootPathOptions);
 }
-const AUTH_ROUTES = ["login", "register", "register-admin", "forgot-password", "reset-password"];
 const STATIC_EXTENSIONS = [".js", ".css", ".png", ".svg", ".ico", ".woff2", ".json", ".map"];
 async function bootstrap({ strapi: strapi2 }) {
   await applyDiscovery(strapi2);
-  const adminUrl = strapi2.config.get("admin.url", "/admin");
+  const rawAdminUrl = strapi2.config.get("admin.url");
+  const adminUrl = typeof rawAdminUrl === "string" && rawAdminUrl.length > 0 ? rawAdminUrl : "/admin";
   const tokenRefreshPath = `${adminUrl}/token/refresh`;
   const EXCLUDED_ADMIN_PATHS = [
     `${adminUrl}/login`,
@@ -415,7 +423,6 @@ function destroy() {
 const config = {
   default: {
     REMEMBER_ME: false,
-    OIDC_REDIRECT_URI: "http://localhost:1337/strapi-plugin-oidc/oidc/callback",
     OIDC_CLIENT_ID: "",
     OIDC_CLIENT_SECRET: "",
     OIDC_SCOPE: "openid profile email",
@@ -555,7 +562,6 @@ const REQUIRED_CONFIG_KEYS = [
   "OIDC_ISSUER",
   "OIDC_CLIENT_ID",
   "OIDC_CLIENT_SECRET",
-  "OIDC_REDIRECT_URI",
   "OIDC_SCOPE",
   "OIDC_FAMILY_NAME_FIELD",
   "OIDC_GIVEN_NAME_FIELD",
@@ -564,6 +570,15 @@ const REQUIRED_CONFIG_KEYS = [
   "OIDC_USERINFO_ENDPOINT",
   "OIDC_AUTHORIZATION_ENDPOINT"
 ];
+function resolveRedirectUri(config2) {
+  const publicUrl = config2.OIDC_PUBLIC_URL || process.env.PUBLIC_URL || (process.env.NODE_ENV !== "production" ? "http://localhost:1337" : "");
+  if (!publicUrl) {
+    throw new Error(
+      "OIDC_PUBLIC_URL or PUBLIC_URL must be set in production. Provide your Strapi origin (e.g. https://myapp.com)."
+    );
+  }
+  return `${publicUrl}${OIDC_CALLBACK_PATH}`;
+}
 const jwksCache = /* @__PURE__ */ new Map();
 let jwksDisabledWarned = false;
 function getJwks(uri) {
@@ -3609,11 +3624,12 @@ async function oidcSignIn(ctx) {
   try {
     const config2 = configValidation();
     if (!config2.OIDC_SKIP_LOGIN_PAGE) {
-      const adminUrl = strapi.config.get("admin.url", "/admin");
+      const raw = strapi.config.get("admin.url");
+      const adminUrl = typeof raw === "string" && raw.length > 0 ? raw : "/admin";
       ctx.redirect(`${adminUrl}/auth/login?oidc_redirect=1`);
       return;
     }
-    const { OIDC_CLIENT_ID, OIDC_REDIRECT_URI, OIDC_SCOPE, OIDC_AUTHORIZATION_ENDPOINT } = config2;
+    const { OIDC_CLIENT_ID, 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");
@@ -3626,10 +3642,11 @@ async function oidcSignIn(ctx) {
     ctx.cookies.set(COOKIE_NAMES.codeVerifier, codeVerifier, cookieOptions);
     ctx.cookies.set(COOKIE_NAMES.state, state, cookieOptions);
     ctx.cookies.set(COOKIE_NAMES.nonce, nonce, cookieOptions);
+    const redirectUri = resolveRedirectUri(config2);
     const params = new URLSearchParams({
       response_type: "code",
       client_id: OIDC_CLIENT_ID,
-      redirect_uri: OIDC_REDIRECT_URI,
+      redirect_uri: redirectUri,
       scope: OIDC_SCOPE,
       code_challenge: codeChallenge,
       code_challenge_method: "S256",
@@ -3974,7 +3991,7 @@ async function oidcSignInCallback(ctx) {
     code: String(ctx.query.code),
     client_id: config2.OIDC_CLIENT_ID,
     client_secret: config2.OIDC_CLIENT_SECRET,
-    redirect_uri: config2.OIDC_REDIRECT_URI,
+    redirect_uri: resolveRedirectUri(config2),
     grant_type: "authorization_code",
     code_verifier: codeVerifier ?? ""
   });

package/dist/server/index.mjs

@@ -97,7 +97,7 @@ const coerceBoolNullable = z.preprocess(
 );
 const pluginConfigSchema = z.object({
   REMEMBER_ME: coerceBool(false),
-  OIDC_REDIRECT_URI: z.string().default(""),
+  OIDC_PUBLIC_URL: z.string().default(""),
   OIDC_CLIENT_ID: z.string().default(""),
   OIDC_CLIENT_SECRET: z.string().default(""),
   OIDC_SCOPE: z.string().default("openid profile email"),
@@ -169,6 +169,14 @@ const DAY_MS = 864e5;
 const DISCOVERY_TIMEOUT_MS = 5e3;
 const OIDC_DISCOVERY_PATH = "/.well-known/openid-configuration";
 const OIDC_SIGN_IN_PATH = "/strapi-plugin-oidc/oidc";
+const OIDC_CALLBACK_PATH = "/strapi-plugin-oidc/oidc/callback";
+const AUTH_ROUTES = [
+  "login",
+  "register",
+  "register-admin",
+  "forgot-password",
+  "reset-password"
+];
 const EMAIL_REGEX = /^[^\s@]+@[^\s@]+\.[^\s@]+$/;
 function getPluginConfig() {
   return pluginConfigSchema.parse(strapi.config.get("plugin::strapi-plugin-oidc") ?? {});
@@ -279,11 +287,11 @@ function clearAuthCookies(strapi2, ctx) {
   ctx.cookies.set(COOKIE_NAMES.accessToken, "", rootPathOptions);
   ctx.cookies.set(COOKIE_NAMES.userEmail, "", rootPathOptions);
 }
-const AUTH_ROUTES = ["login", "register", "register-admin", "forgot-password", "reset-password"];
 const STATIC_EXTENSIONS = [".js", ".css", ".png", ".svg", ".ico", ".woff2", ".json", ".map"];
 async function bootstrap({ strapi: strapi2 }) {
   await applyDiscovery(strapi2);
-  const adminUrl = strapi2.config.get("admin.url", "/admin");
+  const rawAdminUrl = strapi2.config.get("admin.url");
+  const adminUrl = typeof rawAdminUrl === "string" && rawAdminUrl.length > 0 ? rawAdminUrl : "/admin";
   const tokenRefreshPath = `${adminUrl}/token/refresh`;
   const EXCLUDED_ADMIN_PATHS = [
     `${adminUrl}/login`,
@@ -409,7 +417,6 @@ function destroy() {
 const config = {
   default: {
     REMEMBER_ME: false,
-    OIDC_REDIRECT_URI: "http://localhost:1337/strapi-plugin-oidc/oidc/callback",
     OIDC_CLIENT_ID: "",
     OIDC_CLIENT_SECRET: "",
     OIDC_SCOPE: "openid profile email",
@@ -549,7 +556,6 @@ const REQUIRED_CONFIG_KEYS = [
   "OIDC_ISSUER",
   "OIDC_CLIENT_ID",
   "OIDC_CLIENT_SECRET",
-  "OIDC_REDIRECT_URI",
   "OIDC_SCOPE",
   "OIDC_FAMILY_NAME_FIELD",
   "OIDC_GIVEN_NAME_FIELD",
@@ -558,6 +564,15 @@ const REQUIRED_CONFIG_KEYS = [
   "OIDC_USERINFO_ENDPOINT",
   "OIDC_AUTHORIZATION_ENDPOINT"
 ];
+function resolveRedirectUri(config2) {
+  const publicUrl = config2.OIDC_PUBLIC_URL || process.env.PUBLIC_URL || (process.env.NODE_ENV !== "production" ? "http://localhost:1337" : "");
+  if (!publicUrl) {
+    throw new Error(
+      "OIDC_PUBLIC_URL or PUBLIC_URL must be set in production. Provide your Strapi origin (e.g. https://myapp.com)."
+    );
+  }
+  return `${publicUrl}${OIDC_CALLBACK_PATH}`;
+}
 const jwksCache = /* @__PURE__ */ new Map();
 let jwksDisabledWarned = false;
 function getJwks(uri) {
@@ -3603,11 +3618,12 @@ async function oidcSignIn(ctx) {
   try {
     const config2 = configValidation();
     if (!config2.OIDC_SKIP_LOGIN_PAGE) {
-      const adminUrl = strapi.config.get("admin.url", "/admin");
+      const raw = strapi.config.get("admin.url");
+      const adminUrl = typeof raw === "string" && raw.length > 0 ? raw : "/admin";
       ctx.redirect(`${adminUrl}/auth/login?oidc_redirect=1`);
       return;
     }
-    const { OIDC_CLIENT_ID, OIDC_REDIRECT_URI, OIDC_SCOPE, OIDC_AUTHORIZATION_ENDPOINT } = config2;
+    const { OIDC_CLIENT_ID, 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");
@@ -3620,10 +3636,11 @@ async function oidcSignIn(ctx) {
     ctx.cookies.set(COOKIE_NAMES.codeVerifier, codeVerifier, cookieOptions);
     ctx.cookies.set(COOKIE_NAMES.state, state, cookieOptions);
     ctx.cookies.set(COOKIE_NAMES.nonce, nonce, cookieOptions);
+    const redirectUri = resolveRedirectUri(config2);
     const params = new URLSearchParams({
       response_type: "code",
       client_id: OIDC_CLIENT_ID,
-      redirect_uri: OIDC_REDIRECT_URI,
+      redirect_uri: redirectUri,
       scope: OIDC_SCOPE,
       code_challenge: codeChallenge,
       code_challenge_method: "S256",
@@ -3968,7 +3985,7 @@ async function oidcSignInCallback(ctx) {
     code: String(ctx.query.code),
     client_id: config2.OIDC_CLIENT_ID,
     client_secret: config2.OIDC_CLIENT_SECRET,
-    redirect_uri: config2.OIDC_REDIRECT_URI,
+    redirect_uri: resolveRedirectUri(config2),
     grant_type: "authorization_code",
     code_verifier: codeVerifier ?? ""
   });

package/package.json

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