@nihplod/sso-sdk 1.6.0 → 1.7.0

package/dist/react/index.mjs

@@ -90,24 +90,6 @@ var SILENT_PROBE_KEY = "silent_probe";
 function buildKey(base, clientId) {
   return clientId ? `${base}:${clientId}` : base;
 }
-function createMemoryStorageAdapter() {
-  const store = /* @__PURE__ */ new Map();
-  return {
-    get(key) {
-      return store.get(key) ?? null;
-    },
-    set(key, value) {
-      store.set(key, value);
-    },
-    remove(key) {
-      store.delete(key);
-    },
-    keys() {
-      return [...store.keys()];
-    }
-  };
-}
-var memoryStorageAdapter = createMemoryStorageAdapter();
 function createSessionStorageAdapter() {
   const fallback = /* @__PURE__ */ new Map();
   return {
@@ -375,7 +357,19 @@ async function fetchJwks(baseUrl, options = {}) {
     return cachedJwks.jwks;
   }
   const discovery = await fetchDiscoveryDoc(baseUrl);
-  const jwksUri = discovery?.jwks_uri || `${baseUrl}/api/oauth/jwks`;
+  let jwksUri = `${baseUrl}/api/oauth/jwks`;
+  if (discovery?.jwks_uri) {
+    try {
+      if (new URL(discovery.jwks_uri).origin === new URL(baseUrl).origin) {
+        jwksUri = discovery.jwks_uri;
+      } else {
+        console.warn(
+          "[SSO SDK] Discovery \u7684 jwks_uri \u4E0E ssoBaseUrl \u4E0D\u540C\u6E90\uFF0C\u5DF2\u5FFD\u7565\u5E76\u4F7F\u7528\u9ED8\u8BA4 JWKS \u7AEF\u70B9"
+        );
+      }
+    } catch {
+    }
+  }
   try {
     const res = await fetch(jwksUri, {
       signal: AbortSignal.timeout(FETCH_TIMEOUT_MS),
@@ -566,11 +560,7 @@ function assertValidTokenResponse(data, requireRefreshToken) {
     );
   }
 }
-var SILENT_PROBE_ERRORS = /* @__PURE__ */ new Set([
-  "login_required",
-  "consent_required",
-  "interaction_required"
-]);
+var SILENT_PROBE_ERRORS = /* @__PURE__ */ new Set(["login_required", "consent_required", "interaction_required"]);
 var _SsoClient = class _SsoClient {
   constructor(config) {
     this._discovery = null;
@@ -636,6 +626,22 @@ var _SsoClient = class _SsoClient {
     if (!authorizationOk) bad.push("authorization_endpoint");
     if (!sameOrigin(d.token_endpoint)) bad.push("token_endpoint");
     if (!sameOrigin(d.userinfo_endpoint)) bad.push("userinfo_endpoint");
+    if (d.jwks_uri && !sameOrigin(d.jwks_uri)) bad.push("jwks_uri");
+    if (d.revocation_endpoint && !sameOrigin(d.revocation_endpoint)) {
+      bad.push("revocation_endpoint");
+    }
+    if (d.introspection_endpoint && !sameOrigin(d.introspection_endpoint)) {
+      bad.push("introspection_endpoint");
+    }
+    if (d.end_session_endpoint) {
+      try {
+        if (new URL(d.end_session_endpoint).origin !== publicOrigin) {
+          bad.push("end_session_endpoint");
+        }
+      } catch {
+        bad.push("end_session_endpoint");
+      }
+    }
     if (bad.length > 0) {
       if (!this._discoveryOriginWarned) {
         this._discoveryOriginWarned = true;
@@ -661,16 +667,11 @@ var _SsoClient = class _SsoClient {
     const url = `${this._serverBase}/api/oauth/.well-known/openid-configuration`;
     try {
       const controller = new AbortController();
-      const timeoutId = setTimeout(
-        () => controller.abort(),
-        _SsoClient.DISCOVERY_TIMEOUT_MS
-      );
+      const timeoutId = setTimeout(() => controller.abort(), _SsoClient.DISCOVERY_TIMEOUT_MS);
       const res = await fetch(url, { signal: controller.signal });
       clearTimeout(timeoutId);
       if (!res.ok) {
-        console.warn(
-          `[SSO SDK] OIDC Discovery \u8BF7\u6C42\u5931\u8D25: HTTP ${res.status}, \u56DE\u9000\u5230\u9ED8\u8BA4\u7AEF\u70B9`
-        );
+        console.warn(`[SSO SDK] OIDC Discovery \u8BF7\u6C42\u5931\u8D25: HTTP ${res.status}, \u56DE\u9000\u5230\u9ED8\u8BA4\u7AEF\u70B9`);
         return null;
       }
       const doc = await res.json();
@@ -885,10 +886,7 @@ var _SsoClient = class _SsoClient {
       removeOAuthState(this.config.clientId);
       removeOAuthNonce(this.config.clientId);
       removePkceVerifier(`${this.config.clientId}_popup_nonce`);
-      throw new SsoError(
-        "popup_blocked",
-        "\u5F39\u7A97\u88AB\u6D4F\u89C8\u5668\u62E6\u622A\uFF0C\u8BF7\u5141\u8BB8\u5F39\u7A97\u540E\u91CD\u8BD5"
-      );
+      throw new SsoError("popup_blocked", "\u5F39\u7A97\u88AB\u6D4F\u89C8\u5668\u62E6\u622A\uFF0C\u8BF7\u5141\u8BB8\u5F39\u7A97\u540E\u91CD\u8BD5");
     }
     const redirectUriOrigin = new URL(this.config.redirectUri).origin;
     try {
@@ -917,9 +915,7 @@ var _SsoClient = class _SsoClient {
           }
           this.handleCallback(event.data.callbackUrl).then((tokenData) => {
             if (tokenData === null) {
-              reject(
-                new SsoError("not_authenticated", "SSO \u4F1A\u8BDD\u4E0D\u5B58\u5728\uFF08\u9759\u9ED8\u63A2\u6D4B\u65E0\u4F1A\u8BDD\uFF09")
-              );
+              reject(new SsoError("not_authenticated", "SSO \u4F1A\u8BDD\u4E0D\u5B58\u5728\uFF08\u9759\u9ED8\u63A2\u6D4B\u65E0\u4F1A\u8BDD\uFF09"));
               return;
             }
             resolve(tokenData);
@@ -930,12 +926,7 @@ var _SsoClient = class _SsoClient {
             if (!completed) {
               completed = true;
               cleanup();
-              reject(
-                new SsoError(
-                  "popup_closed",
-                  "\u767B\u5F55\u7A97\u53E3\u5DF2\u5173\u95ED"
-                )
-              );
+              reject(new SsoError("popup_closed", "\u767B\u5F55\u7A97\u53E3\u5DF2\u5173\u95ED"));
             }
           }
         }, 500);
@@ -1002,18 +993,24 @@ var _SsoClient = class _SsoClient {
       removeOAuthNonce(this.config.clientId);
       removePkceVerifier(this.config.clientId);
       removeSilentProbe(this.config.clientId);
-      throw new SsoError(
-        "state_mismatch",
-        "State \u53C2\u6570\u4E0D\u5339\u914D\uFF0C\u53EF\u80FD\u5B58\u5728 CSRF \u653B\u51FB"
-      );
+      throw new SsoError("state_mismatch", "State \u53C2\u6570\u4E0D\u5339\u914D\uFF0C\u53EF\u80FD\u5B58\u5728 CSRF \u653B\u51FB");
+    }
+    const returnedIss = params.get("iss");
+    if (returnedIss) {
+      const discovery = await this._getDiscovery();
+      const expectedIssuer = (discovery?.issuer || this.config.ssoBaseUrl).replace(/\/+$/, "");
+      if (returnedIss.replace(/\/+$/, "") !== expectedIssuer) {
+        removeOAuthState(this.config.clientId);
+        removeOAuthNonce(this.config.clientId);
+        removePkceVerifier(this.config.clientId);
+        removeSilentProbe(this.config.clientId);
+        throw new SsoError("issuer_mismatch", "\u6388\u6743\u54CD\u5E94 issuer \u4E0D\u5339\u914D\uFF0C\u53EF\u80FD\u5B58\u5728 IdP \u6DF7\u53E0\u653B\u51FB");
+      }
     }
     const expectedNonce = getOAuthNonce(this.config.clientId) ?? void 0;
     const verifier = getPkceVerifier(this.config.clientId);
     if (!verifier) {
-      throw new SsoError(
-        "pkce_required",
-        "code_verifier \u4E0D\u5B58\u5728\uFF08\u53EF\u80FD\u5DF2\u8FC7\u671F\u6216\u6765\u81EA\u5176\u4ED6\u6807\u7B7E\u9875\uFF09"
-      );
+      throw new SsoError("pkce_required", "code_verifier \u4E0D\u5B58\u5728\uFF08\u53EF\u80FD\u5DF2\u8FC7\u671F\u6216\u6765\u81EA\u5176\u4ED6\u6807\u7B7E\u9875\uFF09");
     }
     const tokenEndpoint = await this._getTokenEndpoint();
     const body = new URLSearchParams();
@@ -1060,10 +1057,7 @@ var _SsoClient = class _SsoClient {
       removePkceVerifier(this.config.clientId);
       removeSilentProbe(this.config.clientId);
       removeTokenData(this.config.clientId);
-      throw new SsoError(
-        "id_token_invalid",
-        "Token \u54CD\u5E94\u7F3A\u5C11 id_token\uFF08scope \u542B openid \u65F6\u5FC5\u9700\uFF09"
-      );
+      throw new SsoError("id_token_invalid", "Token \u54CD\u5E94\u7F3A\u5C11 id_token\uFF08scope \u542B openid \u65F6\u5FC5\u9700\uFF09");
     }
     if (data.id_token) {
       try {
@@ -1128,19 +1122,14 @@ var _SsoClient = class _SsoClient {
     }
     let res = null;
     let lastErr;
-    for (let attempt = 0; attempt < 2; attempt++) {
-      try {
-        res = await fetchWithTimeout(tokenEndpoint, {
-          method: "POST",
-          headers: { "Content-Type": "application/x-www-form-urlencoded" },
-          body: body.toString()
-        });
-        lastErr = null;
-        break;
-      } catch (err) {
-        lastErr = err;
-        if (attempt < 1) await new Promise((r) => setTimeout(r, 1e3));
-      }
+    try {
+      res = await fetchWithTimeout(tokenEndpoint, {
+        method: "POST",
+        headers: { "Content-Type": "application/x-www-form-urlencoded" },
+        body: body.toString()
+      });
+    } catch (err) {
+      lastErr = err;
     }
     if (lastErr || !res) {
       throw new SsoError("network_error", "\u5237\u65B0 Token \u7F51\u7EDC\u8BF7\u6C42\u5931\u8D25", lastErr);
@@ -1222,10 +1211,7 @@ var _SsoClient = class _SsoClient {
         removeTokenData(this.config.clientId);
         throw new SsoError("not_authenticated", "Token \u5DF2\u5931\u6548");
       }
-      throw new SsoError(
-        "userinfo_failed",
-        `\u83B7\u53D6\u7528\u6237\u4FE1\u606F\u5931\u8D25: HTTP ${res.status}`
-      );
+      throw new SsoError("userinfo_failed", `\u83B7\u53D6\u7528\u6237\u4FE1\u606F\u5931\u8D25: HTTP ${res.status}`);
     }
     return await res.json();
   }
@@ -1285,7 +1271,7 @@ var _SsoClient = class _SsoClient {
         if (this.config.clientSecret) {
           revokeBody.set("client_secret", this.config.clientSecret);
         }
-        await fetchWithTimeout(
+        const doRevoke = () => fetchWithTimeout(
           revokeUrl,
           {
             method: "POST",
@@ -1294,6 +1280,14 @@ var _SsoClient = class _SsoClient {
           },
           REVOKE_TIMEOUT_MS
         );
+        let res = await doRevoke();
+        if (!res.ok && (res.status >= 500 || res.status === 429)) {
+          await new Promise((resolve) => setTimeout(resolve, 300));
+          res = await doRevoke();
+        }
+        if (!res.ok) {
+          this.debugLog("logout: \u670D\u52A1\u7AEF\u64A4\u9500 refresh_token \u5931\u8D25", { status: res.status });
+        }
       } catch {
       }
     }
@@ -1304,10 +1298,7 @@ var _SsoClient = class _SsoClient {
       logoutUrl.searchParams.set("client_id", this.config.clientId);
       const postLogoutUri = this.config.postLogoutRedirectUri || this.config.redirectUri;
       if (postLogoutUri) {
-        logoutUrl.searchParams.set(
-          "post_logout_redirect_uri",
-          postLogoutUri
-        );
+        logoutUrl.searchParams.set("post_logout_redirect_uri", postLogoutUri);
       }
       if (idTokenHint) {
         logoutUrl.searchParams.set("id_token_hint", idTokenHint);
@@ -1537,7 +1528,15 @@ function SsoProvider({
       const tokenData = getTokenData(client.config.clientId);
       if (!tokenData) return;
       const remainingSec = (tokenData.expires_at - Date.now()) / 1e3;
-      if (remainingSec <= 0 || remainingSec <= refreshThreshold) {
+      const lifetimeSec = Math.max(
+        1,
+        (tokenData.expires_at - tokenData.issued_at) / 1e3
+      );
+      const effectiveThreshold = Math.max(
+        1,
+        Math.min(refreshThreshold, Math.floor(lifetimeSec / 3))
+      );
+      if (remainingSec <= 0 || remainingSec <= effectiveThreshold) {
         refreshTimerRef.current = setTimeout(
           () => {
             if (active) void attemptRefresh();
@@ -1546,13 +1545,13 @@ function SsoProvider({
         );
         return;
       }
-      const delayMs = Math.max((remainingSec - refreshThreshold) * 1e3, minDelayMs, 1e3);
+      const delayMs = Math.max((remainingSec - effectiveThreshold) * 1e3, minDelayMs, 1e3);
       refreshTimerRef.current = setTimeout(() => {
         if (!active) return;
         const td = getTokenData(client.config.clientId);
         if (!td) return;
         const secLeft = (td.expires_at - Date.now()) / 1e3;
-        if (secLeft <= refreshThreshold) {
+        if (secLeft <= effectiveThreshold) {
           void attemptRefresh();
         } else {
           scheduleNextRefresh();
@@ -1567,7 +1566,7 @@ function SsoProvider({
         refreshTimerRef.current = null;
       }
     };
-  }, [client, loadUser, refreshThreshold, onTokenRefreshed]);
+  }, [client, loadUser, refreshThreshold, onTokenRefreshed, markSessionExpired]);
   useEffect(() => {
     const handleStorageChange = (e) => {
       if (e.key && e.key.startsWith("nihplod_sso_") && !e.key.startsWith(REFRESH_LOCK_PREFIX)) {
@@ -1662,6 +1661,26 @@ function useSso() {
 
 // src/react/RequireAuth.tsx
 import React2, { useEffect as useEffect2, useRef as useRef2, useState as useState2 } from "react";
+function LoginErrorContent({
+  loginError,
+  retry,
+  renderLoginError
+}) {
+  if (renderLoginError) {
+    return React2.createElement(
+      React2.Fragment,
+      null,
+      renderLoginError(loginError, retry)
+    );
+  }
+  const message = loginError instanceof Error ? loginError.message : "\u767B\u5F55\u5931\u8D25";
+  return React2.createElement(
+    "div",
+    null,
+    React2.createElement("p", null, `\u767B\u5F55\u672A\u5B8C\u6210\uFF1A${message}`),
+    React2.createElement("button", { onClick: retry }, "\u91CD\u8BD5\u767B\u5F55")
+  );
+}
 function RequireAuth({
   children,
   fallback,
@@ -1707,20 +1726,11 @@ function RequireAuth({
   }
   if (!isAuthenticated) {
     if (loginError) {
-      if (renderLoginError) {
-        return React2.createElement(
-          React2.Fragment,
-          null,
-          renderLoginError(loginError, retry)
-        );
-      }
-      const message = loginError instanceof Error ? loginError.message : "\u767B\u5F55\u5931\u8D25";
-      return React2.createElement(
-        "div",
-        null,
-        React2.createElement("p", null, `\u767B\u5F55\u672A\u5B8C\u6210\uFF1A${message}`),
-        React2.createElement("button", { onClick: retry }, "\u91CD\u8BD5\u767B\u5F55")
-      );
+      return React2.createElement(LoginErrorContent, {
+        loginError,
+        retry,
+        renderLoginError
+      });
     }
     if (fallback) return React2.createElement(React2.Fragment, null, fallback);
     return React2.createElement("div", null, "\u8BF7\u5148\u767B\u5F55");