strapi-plugin-oidc 1.2.3 → 1.2.4

package/dist/admin/{index-CZ_FdaEz.mjs → index-B2dKk7YS.mjs}

@@ -73,7 +73,10 @@ const en = {
   "enforce.toggle.enabled": "Enabled",
   "enforce.toggle.disabled": "Disabled",
   "enforce.warning": "Make sure OIDC is setup correctly before saving changes, you won't be able to login normally.",
-  "login.sso": "Login via SSO"
+  "login.settings.title": "Login Settings",
+  "login.sso": "Login via SSO",
+  "login.sso.show": "Add button for OIDC on login screen",
+  "login.sso.button.text.label": "Login button text"
 };
 const en$1 = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,
@@ -98,7 +101,7 @@ const index = {
           defaultMessage: "Configuration"
         },
         Component: async () => {
-          return await import("./index-DuJfeoFu.mjs");
+          return await import("./index-BD7cK7Hf.mjs");
         },
         permissions: [{ action: "plugin::strapi-plugin-oidc.read", subject: null }]
       }
@@ -126,6 +129,10 @@ const index = {
               if (isLogoutInProgress) {
                 return;
               }
+              if (sessionStorage.getItem("oidc_logout")) {
+                sessionStorage.removeItem("oidc_logout");
+                return originalMethod.apply(window.history, args);
+              }
               document.documentElement.style.visibility = "hidden";
               window.location.href = "/strapi-plugin-oidc/oidc";
               return;
@@ -137,8 +144,13 @@ const index = {
       window.history.pushState = interceptHistory(window.history.pushState);
       window.history.replaceState = interceptHistory(window.history.replaceState);
       if (isAuthRoute(window.location.pathname)) {
-        document.documentElement.style.visibility = "hidden";
-        window.location.replace("/strapi-plugin-oidc/oidc");
+        if (sessionStorage.getItem("oidc_logout")) {
+          sessionStorage.removeItem("oidc_logout");
+          document.documentElement.style.visibility = "";
+        } else {
+          document.documentElement.style.visibility = "hidden";
+          window.location.replace("/strapi-plugin-oidc/oidc");
+        }
       }
     };
     let ssoButtonInjected = false;
@@ -180,6 +192,9 @@ const index = {
       document.getElementById("strapi-oidc-sso-btn")?.remove();
       ssoButtonInjected = false;
     };
+    if (!localStorage.getItem("jwtToken") && !sessionStorage.getItem("oidc_logout")) {
+      document.documentElement.style.visibility = "hidden";
+    }
     if (localStorage.getItem(ENFORCE_CACHE_KEY) === "1") {
       patchHistory();
     }
@@ -227,6 +242,7 @@ const index = {
         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";
+        sessionStorage.setItem("oidc_logout", "1");
         window.location.href = "/strapi-plugin-oidc/logout";
         return new Promise(() => {
         });

package/dist/admin/{index-DuJfeoFu.mjs → index-BD7cK7Hf.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, TextInput } from "@strapi/design-system";
 import { Plus, Trash, WarningCircle } from "@strapi/icons";
 import { useIntl } from "react-intl";
-import { e as en, p as pluginId } from "./index-CZ_FdaEz.mjs";
+import { e as en, p as pluginId } from "./index-B2dKk7YS.mjs";
 import styled from "styled-components";
 function getTrad(id) {
   const pluginIdWithId = `${pluginId}.${id}`;
@@ -344,6 +344,10 @@ function useOidcSettings() {
   const [enforceOIDC, setEnforceOIDC] = useState(false);
   const [initialUsers, setInitialUsers] = useState([]);
   const [users, setUsers] = useState([]);
+  const [initialShowSSOButton, setInitialShowSSOButton] = useState(true);
+  const [showSSOButton, setShowSSOButton] = useState(true);
+  const [initialSSOButtonText, setInitialSSOButtonText] = useState("Login via SSO");
+  const [ssoButtonText, setSSOButtonText] = useState("Login via SSO");
   useEffect(() => {
     get(`/strapi-plugin-oidc/oidc-roles`).then((response) => {
       setOIDCRoles(response.data);
@@ -359,6 +363,10 @@ function useOidcSettings() {
       setInitialUseWhitelist(response.data.useWhitelist);
       setEnforceOIDC(response.data.enforceOIDC);
       setInitialEnforceOIDC(response.data.enforceOIDC);
+      setShowSSOButton(response.data.showSSOButton !== false);
+      setInitialShowSSOButton(response.data.showSSOButton !== false);
+      setSSOButtonText(response.data.ssoButtonText || "Login via SSO");
+      setInitialSSOButtonText(response.data.ssoButtonText || "Login via SSO");
     });
   }, [get]);
   const onChangeRole = (values, oidcId) => {
@@ -388,7 +396,13 @@ function useOidcSettings() {
   const onToggleEnforce = (e) => {
     setEnforceOIDC(e.target.checked);
   };
-  const isDirty = useWhitelist !== initialUseWhitelist || enforceOIDC !== initialEnforceOIDC || JSON.stringify(oidcRoles) !== JSON.stringify(initialOidcRoles) || JSON.stringify(users) !== JSON.stringify(initialUsers);
+  const onToggleShowSSOButton = (e) => {
+    setShowSSOButton(e.target.checked);
+  };
+  const onChangeSSOButtonText = (e) => {
+    setSSOButtonText(e.target.value);
+  };
+  const isDirty = useWhitelist !== initialUseWhitelist || enforceOIDC !== initialEnforceOIDC || showSSOButton !== initialShowSSOButton || ssoButtonText !== initialSSOButtonText || JSON.stringify(oidcRoles) !== JSON.stringify(initialOidcRoles) || JSON.stringify(users) !== JSON.stringify(initialUsers);
   const onSaveAll = async () => {
     setLoading(true);
     try {
@@ -403,11 +417,15 @@ function useOidcSettings() {
       });
       await put("/strapi-plugin-oidc/whitelist/settings", {
         useWhitelist,
-        enforceOIDC
+        enforceOIDC,
+        showSSOButton,
+        ssoButtonText
       });
       setInitialOIDCRoles(JSON.parse(JSON.stringify(oidcRoles)));
       setInitialUseWhitelist(useWhitelist);
       setInitialEnforceOIDC(enforceOIDC);
+      setInitialShowSSOButton(showSSOButton);
+      setInitialSSOButtonText(ssoButtonText);
       get("/strapi-plugin-oidc/whitelist").then((getResponse) => {
         setUsers(getResponse.data.whitelistUsers);
         setInitialUsers(JSON.parse(JSON.stringify(getResponse.data.whitelistUsers)));
@@ -439,6 +457,8 @@ function useOidcSettings() {
       enforceOIDC,
       initialEnforceOIDC,
       users,
+      showSSOButton,
+      ssoButtonText,
       isDirty
     },
     actions: {
@@ -450,6 +470,8 @@ function useOidcSettings() {
       onDeleteWhitelist,
       onToggleWhitelist,
       onToggleEnforce,
+      onToggleShowSSOButton,
+      onChangeSSOButtonText,
       onSaveAll
     }
   };

package/dist/admin/{index-DZwncy7E.js → index-CYL_geya.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-ENl8_IZn.js");
+const index = require("./index-Cxj6lwW7.js");
 const styled = require("styled-components");
 const _interopDefault = (e) => e && e.__esModule ? e : { default: e };
 const styled__default = /* @__PURE__ */ _interopDefault(styled);
@@ -348,6 +348,10 @@ function useOidcSettings() {
   const [enforceOIDC, setEnforceOIDC] = react.useState(false);
   const [initialUsers, setInitialUsers] = react.useState([]);
   const [users, setUsers] = react.useState([]);
+  const [initialShowSSOButton, setInitialShowSSOButton] = react.useState(true);
+  const [showSSOButton, setShowSSOButton] = react.useState(true);
+  const [initialSSOButtonText, setInitialSSOButtonText] = react.useState("Login via SSO");
+  const [ssoButtonText, setSSOButtonText] = react.useState("Login via SSO");
   react.useEffect(() => {
     get(`/strapi-plugin-oidc/oidc-roles`).then((response) => {
       setOIDCRoles(response.data);
@@ -363,6 +367,10 @@ function useOidcSettings() {
       setInitialUseWhitelist(response.data.useWhitelist);
       setEnforceOIDC(response.data.enforceOIDC);
       setInitialEnforceOIDC(response.data.enforceOIDC);
+      setShowSSOButton(response.data.showSSOButton !== false);
+      setInitialShowSSOButton(response.data.showSSOButton !== false);
+      setSSOButtonText(response.data.ssoButtonText || "Login via SSO");
+      setInitialSSOButtonText(response.data.ssoButtonText || "Login via SSO");
     });
   }, [get]);
   const onChangeRole = (values, oidcId) => {
@@ -392,7 +400,13 @@ function useOidcSettings() {
   const onToggleEnforce = (e) => {
     setEnforceOIDC(e.target.checked);
   };
-  const isDirty = useWhitelist !== initialUseWhitelist || enforceOIDC !== initialEnforceOIDC || JSON.stringify(oidcRoles) !== JSON.stringify(initialOidcRoles) || JSON.stringify(users) !== JSON.stringify(initialUsers);
+  const onToggleShowSSOButton = (e) => {
+    setShowSSOButton(e.target.checked);
+  };
+  const onChangeSSOButtonText = (e) => {
+    setSSOButtonText(e.target.value);
+  };
+  const isDirty = useWhitelist !== initialUseWhitelist || enforceOIDC !== initialEnforceOIDC || showSSOButton !== initialShowSSOButton || ssoButtonText !== initialSSOButtonText || JSON.stringify(oidcRoles) !== JSON.stringify(initialOidcRoles) || JSON.stringify(users) !== JSON.stringify(initialUsers);
   const onSaveAll = async () => {
     setLoading(true);
     try {
@@ -407,11 +421,15 @@ function useOidcSettings() {
       });
       await put("/strapi-plugin-oidc/whitelist/settings", {
         useWhitelist,
-        enforceOIDC
+        enforceOIDC,
+        showSSOButton,
+        ssoButtonText
       });
       setInitialOIDCRoles(JSON.parse(JSON.stringify(oidcRoles)));
       setInitialUseWhitelist(useWhitelist);
       setInitialEnforceOIDC(enforceOIDC);
+      setInitialShowSSOButton(showSSOButton);
+      setInitialSSOButtonText(ssoButtonText);
       get("/strapi-plugin-oidc/whitelist").then((getResponse) => {
         setUsers(getResponse.data.whitelistUsers);
         setInitialUsers(JSON.parse(JSON.stringify(getResponse.data.whitelistUsers)));
@@ -443,6 +461,8 @@ function useOidcSettings() {
       enforceOIDC,
       initialEnforceOIDC,
       users,
+      showSSOButton,
+      ssoButtonText,
       isDirty
     },
     actions: {
@@ -454,6 +474,8 @@ function useOidcSettings() {
       onDeleteWhitelist,
       onToggleWhitelist,
       onToggleEnforce,
+      onToggleShowSSOButton,
+      onChangeSSOButtonText,
       onSaveAll
     }
   };

package/dist/admin/{index-ENl8_IZn.js → index-Cxj6lwW7.js}

@@ -74,7 +74,10 @@ const en = {
   "enforce.toggle.enabled": "Enabled",
   "enforce.toggle.disabled": "Disabled",
   "enforce.warning": "Make sure OIDC is setup correctly before saving changes, you won't be able to login normally.",
-  "login.sso": "Login via SSO"
+  "login.settings.title": "Login Settings",
+  "login.sso": "Login via SSO",
+  "login.sso.show": "Add button for OIDC on login screen",
+  "login.sso.button.text.label": "Login button text"
 };
 const en$1 = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,
@@ -99,7 +102,7 @@ const index = {
           defaultMessage: "Configuration"
         },
         Component: async () => {
-          return await Promise.resolve().then(() => require("./index-DZwncy7E.js"));
+          return await Promise.resolve().then(() => require("./index-CYL_geya.js"));
         },
         permissions: [{ action: "plugin::strapi-plugin-oidc.read", subject: null }]
       }
@@ -127,6 +130,10 @@ const index = {
               if (isLogoutInProgress) {
                 return;
               }
+              if (sessionStorage.getItem("oidc_logout")) {
+                sessionStorage.removeItem("oidc_logout");
+                return originalMethod.apply(window.history, args);
+              }
               document.documentElement.style.visibility = "hidden";
               window.location.href = "/strapi-plugin-oidc/oidc";
               return;
@@ -138,8 +145,13 @@ const index = {
       window.history.pushState = interceptHistory(window.history.pushState);
       window.history.replaceState = interceptHistory(window.history.replaceState);
       if (isAuthRoute(window.location.pathname)) {
-        document.documentElement.style.visibility = "hidden";
-        window.location.replace("/strapi-plugin-oidc/oidc");
+        if (sessionStorage.getItem("oidc_logout")) {
+          sessionStorage.removeItem("oidc_logout");
+          document.documentElement.style.visibility = "";
+        } else {
+          document.documentElement.style.visibility = "hidden";
+          window.location.replace("/strapi-plugin-oidc/oidc");
+        }
       }
     };
     let ssoButtonInjected = false;
@@ -181,6 +193,9 @@ const index = {
       document.getElementById("strapi-oidc-sso-btn")?.remove();
       ssoButtonInjected = false;
     };
+    if (!localStorage.getItem("jwtToken") && !sessionStorage.getItem("oidc_logout")) {
+      document.documentElement.style.visibility = "hidden";
+    }
     if (localStorage.getItem(ENFORCE_CACHE_KEY) === "1") {
       patchHistory();
     }
@@ -228,6 +243,7 @@ const index = {
         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";
+        sessionStorage.setItem("oidc_logout", "1");
         window.location.href = "/strapi-plugin-oidc/logout";
         return new Promise(() => {
         });

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

package/dist/admin/index.mjs

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

package/dist/server/index.js

@@ -25,7 +25,7 @@ function getExpiredCookieOptions(strapi2, ctx) {
 function clearAuthCookies(strapi2, ctx) {
   const options2 = getExpiredCookieOptions(strapi2, ctx);
   ctx.cookies.set("strapi_admin_refresh", "", options2);
-  ctx.cookies.set("oidc_authenticated", "", options2);
+  ctx.cookies.set("oidc_authenticated", "", { ...options2, path: "/" });
 }
 async function bootstrap({ strapi: strapi2 }) {
   const enforceOidcMiddleware = async (ctx, next) => {
@@ -426,11 +426,13 @@ async function info(ctx) {
   ctx.body = {
     useWhitelist: settings.useWhitelist,
     enforceOIDC: settings.enforceOIDC || false,
+    showSSOButton: settings.showSSOButton !== false,
+    ssoButtonText: settings.ssoButtonText || "Login via SSO",
     whitelistUsers
   };
 }
 async function updateSettings(ctx) {
-  let { useWhitelist, enforceOIDC } = ctx.request.body;
+  let { useWhitelist, enforceOIDC, showSSOButton, ssoButtonText } = ctx.request.body;
   const whitelistService2 = strapi.plugin("strapi-plugin-oidc").service("whitelist");
   if (useWhitelist && enforceOIDC) {
     const users = await whitelistService2.getUsers();
@@ -438,14 +440,16 @@ async function updateSettings(ctx) {
       enforceOIDC = false;
     }
   }
-  await whitelistService2.setSettings({ useWhitelist, enforceOIDC });
-  ctx.body = { useWhitelist, enforceOIDC };
+  await whitelistService2.setSettings({ useWhitelist, enforceOIDC, showSSOButton, ssoButtonText });
+  ctx.body = { useWhitelist, enforceOIDC, showSSOButton, ssoButtonText };
 }
 async function publicSettings(ctx) {
   const whitelistService2 = strapi.plugin("strapi-plugin-oidc").service("whitelist");
   const settings = await whitelistService2.getSettings();
   ctx.body = {
-    enforceOIDC: settings.enforceOIDC || false
+    enforceOIDC: settings.enforceOIDC || false,
+    showSSOButton: settings.showSSOButton !== false,
+    ssoButtonText: settings.ssoButtonText || "Login via SSO"
   };
 }
 async function register(ctx) {
@@ -956,7 +960,7 @@ function oauthService({ strapi: strapi2 }) {
         cookieOptions.expires = new Date(Date.now() + durationInMs);
       }
       ctx.cookies.set("strapi_admin_refresh", refreshToken, cookieOptions);
-      ctx.cookies.set("oidc_authenticated", "1", cookieOptions);
+      ctx.cookies.set("oidc_authenticated", "1", { ...cookieOptions, path: "/" });
       const accessResult = await sessionManager("admin").generateAccessToken(refreshToken);
       if ("error" in accessResult) {
         throw new Error(accessResult.error);
@@ -1027,7 +1031,12 @@ function whitelistService({ strapi: strapi2 }) {
       }
       let settings = await getPluginStore().get({ key: "settings" });
       if (!settings) {
-        settings = { useWhitelist: true, enforceOIDC: false };
+        settings = {
+          useWhitelist: true,
+          enforceOIDC: false,
+          showSSOButton: true,
+          ssoButtonText: "Login via SSO"
+        };
         await getPluginStore().set({ key: "settings", value: settings });
       }
       settingsCache = { value: settings, ts: now };

package/dist/server/index.mjs

@@ -19,7 +19,7 @@ function getExpiredCookieOptions(strapi2, ctx) {
 function clearAuthCookies(strapi2, ctx) {
   const options2 = getExpiredCookieOptions(strapi2, ctx);
   ctx.cookies.set("strapi_admin_refresh", "", options2);
-  ctx.cookies.set("oidc_authenticated", "", options2);
+  ctx.cookies.set("oidc_authenticated", "", { ...options2, path: "/" });
 }
 async function bootstrap({ strapi: strapi2 }) {
   const enforceOidcMiddleware = async (ctx, next) => {
@@ -420,11 +420,13 @@ async function info(ctx) {
   ctx.body = {
     useWhitelist: settings.useWhitelist,
     enforceOIDC: settings.enforceOIDC || false,
+    showSSOButton: settings.showSSOButton !== false,
+    ssoButtonText: settings.ssoButtonText || "Login via SSO",
     whitelistUsers
   };
 }
 async function updateSettings(ctx) {
-  let { useWhitelist, enforceOIDC } = ctx.request.body;
+  let { useWhitelist, enforceOIDC, showSSOButton, ssoButtonText } = ctx.request.body;
   const whitelistService2 = strapi.plugin("strapi-plugin-oidc").service("whitelist");
   if (useWhitelist && enforceOIDC) {
     const users = await whitelistService2.getUsers();
@@ -432,14 +434,16 @@ async function updateSettings(ctx) {
       enforceOIDC = false;
     }
   }
-  await whitelistService2.setSettings({ useWhitelist, enforceOIDC });
-  ctx.body = { useWhitelist, enforceOIDC };
+  await whitelistService2.setSettings({ useWhitelist, enforceOIDC, showSSOButton, ssoButtonText });
+  ctx.body = { useWhitelist, enforceOIDC, showSSOButton, ssoButtonText };
 }
 async function publicSettings(ctx) {
   const whitelistService2 = strapi.plugin("strapi-plugin-oidc").service("whitelist");
   const settings = await whitelistService2.getSettings();
   ctx.body = {
-    enforceOIDC: settings.enforceOIDC || false
+    enforceOIDC: settings.enforceOIDC || false,
+    showSSOButton: settings.showSSOButton !== false,
+    ssoButtonText: settings.ssoButtonText || "Login via SSO"
   };
 }
 async function register(ctx) {
@@ -950,7 +954,7 @@ function oauthService({ strapi: strapi2 }) {
         cookieOptions.expires = new Date(Date.now() + durationInMs);
       }
       ctx.cookies.set("strapi_admin_refresh", refreshToken, cookieOptions);
-      ctx.cookies.set("oidc_authenticated", "1", cookieOptions);
+      ctx.cookies.set("oidc_authenticated", "1", { ...cookieOptions, path: "/" });
       const accessResult = await sessionManager("admin").generateAccessToken(refreshToken);
       if ("error" in accessResult) {
         throw new Error(accessResult.error);
@@ -1021,7 +1025,12 @@ function whitelistService({ strapi: strapi2 }) {
       }
       let settings = await getPluginStore().get({ key: "settings" });
       if (!settings) {
-        settings = { useWhitelist: true, enforceOIDC: false };
+        settings = {
+          useWhitelist: true,
+          enforceOIDC: false,
+          showSSOButton: true,
+          ssoButtonText: "Login via SSO"
+        };
         await getPluginStore().set({ key: "settings", value: settings });
       }
       settingsCache = { value: settings, ts: now };

package/package.json

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