@feelflow/ffid-sdk 5.10.0 → 5.13.0

package/dist/server/index.js

@@ -118,6 +118,9 @@ function normalizeUserinfo(raw) {
   return {
     sub: raw.sub,
     email: raw.email,
+    // #3791: undefined → undefined を保つ（false に丸めない）。古い FFID は wire に
+    // 含めないため、consumer は undefined を「未確認」ではなく「不明」として扱える。
+    emailVerified: raw.email_verified,
     name: raw.name,
     picture: raw.picture,
     companyName: raw.company_name ?? null,
@@ -373,6 +376,9 @@ function createVerifyAccessToken(deps) {
     const base = {
       sub: introspectResponse.sub,
       email: introspectResponse.email ?? null,
+      // #3791: preserve undefined (do NOT coerce to false) so introspect-strategy
+      // callers can distinguish "verified" / "not verified" / "older server".
+      email_verified: introspectResponse.email_verified,
       name: introspectResponse.name ?? null,
       picture: introspectResponse.picture ?? null,
       company_name: introspectResponse.company_name ?? null,
@@ -430,6 +436,8 @@ function createVerifyAccessToken(deps) {
 // src/client/billing-methods.ts
 var BILLING_CHECKOUT_ENDPOINT = "/api/v1/billing/checkout";
 var BILLING_PORTAL_ENDPOINT = "/api/v1/billing/portal";
+var EXT_INVOICES_ENDPOINT = "/api/v1/billing/ext/invoices";
+var EXT_RETRY_PAYMENT_ENDPOINT = "/api/v1/billing/ext/retry-payment";
 function createBillingMethods(deps) {
   const { fetchWithAuth, createError } = deps;
   async function createCheckoutSession(params) {
@@ -471,7 +479,31 @@ function createBillingMethods(deps) {
       `${BILLING_PORTAL_ENDPOINT}?${query.toString()}`
     );
   }
-  return { createCheckoutSession, createPortalSession };
+  async function listInvoices(params) {
+    if (!params.organizationId) {
+      return { error: createError("VALIDATION_ERROR", "organizationId \u306F\u5FC5\u9808\u3067\u3059") };
+    }
+    const query = new URLSearchParams({ organizationId: params.organizationId });
+    return fetchWithAuth(`${EXT_INVOICES_ENDPOINT}?${query.toString()}`);
+  }
+  async function getInvoice(params) {
+    if (!params.invoiceId) {
+      return { error: createError("VALIDATION_ERROR", "invoiceId \u306F\u5FC5\u9808\u3067\u3059") };
+    }
+    return fetchWithAuth(
+      `${EXT_INVOICES_ENDPOINT}/${encodeURIComponent(params.invoiceId)}`
+    );
+  }
+  async function retryPayment(params) {
+    if (!params.organizationId) {
+      return { error: createError("VALIDATION_ERROR", "organizationId \u306F\u5FC5\u9808\u3067\u3059") };
+    }
+    return fetchWithAuth(EXT_RETRY_PAYMENT_ENDPOINT, {
+      method: "POST",
+      body: JSON.stringify({ organizationId: params.organizationId })
+    });
+  }
+  return { createCheckoutSession, createPortalSession, listInvoices, getInvoice, retryPayment };
 }
 
 // src/client/subscription-methods.ts
@@ -813,6 +845,45 @@ function createMembersMethods(deps) {
   return { listMembers, addMember, updateMemberRole, removeMember };
 }
 
+// src/client/seat-methods.ts
+function seatsEndpoint(subscriptionId) {
+  return `/api/v1/subscriptions/ext/${encodeURIComponent(subscriptionId)}/seats/assignments`;
+}
+function createSeatMethods(deps) {
+  const { fetchWithAuth, createError } = deps;
+  async function listSeatAssignments(params) {
+    if (!params.subscriptionId) {
+      return { error: createError("VALIDATION_ERROR", "subscriptionId \u306F\u5FC5\u9808\u3067\u3059") };
+    }
+    return fetchWithAuth(seatsEndpoint(params.subscriptionId));
+  }
+  async function assignSeats(params) {
+    if (!params.subscriptionId) {
+      return { error: createError("VALIDATION_ERROR", "subscriptionId \u306F\u5FC5\u9808\u3067\u3059") };
+    }
+    if (!Array.isArray(params.userIds) || params.userIds.length === 0) {
+      return { error: createError("VALIDATION_ERROR", "userIds \u306F 1 \u4EF6\u4EE5\u4E0A\u6307\u5B9A\u3057\u3066\u304F\u3060\u3055\u3044") };
+    }
+    return fetchWithAuth(seatsEndpoint(params.subscriptionId), {
+      method: "POST",
+      body: JSON.stringify({ userIds: params.userIds })
+    });
+  }
+  async function unassignSeat(params) {
+    if (!params.subscriptionId) {
+      return { error: createError("VALIDATION_ERROR", "subscriptionId \u306F\u5FC5\u9808\u3067\u3059") };
+    }
+    if (!params.userId) {
+      return { error: createError("VALIDATION_ERROR", "userId \u306F\u5FC5\u9808\u3067\u3059") };
+    }
+    return fetchWithAuth(
+      `${seatsEndpoint(params.subscriptionId)}/${encodeURIComponent(params.userId)}`,
+      { method: "DELETE" }
+    );
+  }
+  return { listSeatAssignments, assignSeats, unassignSeat };
+}
+
 // src/client/profile-methods.ts
 var EXT_PROFILE_ENDPOINT = "/api/v1/users/ext/me";
 function resolveAuthOverride(options, createError) {
@@ -863,7 +934,7 @@ function createProfileMethods(deps) {
 }
 
 // src/client/version-check.ts
-var SDK_VERSION = "5.10.0";
+var SDK_VERSION = "5.13.0";
 var SDK_USER_AGENT = `FFID-SDK/${SDK_VERSION} (TypeScript)`;
 var SDK_VERSION_HEADER = "X-FFID-SDK-Version";
 function sdkHeaders() {
@@ -935,9 +1006,20 @@ function createOAuthTokenMethods(deps) {
     logger,
     errorCodes
   } = deps;
-  async function exchangeCodeForTokens(code, codeVerifier) {
+  async function exchangeCodeForTokens(code, codeVerifier, opts) {
     const url = `${baseUrl}${OAUTH_TOKEN_ENDPOINT}`;
     logger.debug("Exchanging code for tokens:", url);
+    if (opts?.expectedState !== void 0 || opts?.actualState !== void 0) {
+      if (opts?.expectedState !== opts?.actualState) {
+        logger.error("Token exchange aborted: OAuth state mismatch or omitted (possible CSRF)");
+        return {
+          error: {
+            code: errorCodes.STATE_MISMATCH_ERROR,
+            message: "OAuth state \u304C\u4E00\u81F4\u3057\u307E\u305B\u3093\u3002CSRF \u306E\u53EF\u80FD\u6027\u304C\u3042\u308B\u305F\u3081\u8A8D\u8A3C\u3092\u4E2D\u6B62\u3057\u307E\u3057\u305F"
+          }
+        };
+      }
+    }
     const effectiveRedirectUri = resolvedRedirectUri ?? (typeof window !== "undefined" ? window.location.origin + window.location.pathname : null);
     if (!effectiveRedirectUri) {
       logger.error("redirectUri is required for token exchange in SSR environments. Set config.redirectUri explicitly.");
@@ -1382,6 +1464,46 @@ function base64UrlEncode(buffer) {
   return btoa(binary).replace(/\+/g, "-").replace(/\//g, "_").replace(/=+$/, "");
 }
 
+// src/auth/state.ts
+var STATE_STORAGE_KEY = "ffid_oauth_state";
+var STATE_FALLBACK_STORAGE_KEY = "ffid_oauth_state_fb";
+var STATE_FALLBACK_TIMESTAMP_KEY = "ffid_oauth_state_fb_ts";
+function storeState(state, logger) {
+  if (typeof window === "undefined") {
+    logger?.warn("storeState: storage is not available in SSR context");
+    return false;
+  }
+  let sessionStored = false;
+  try {
+    window.sessionStorage.setItem(STATE_STORAGE_KEY, state);
+    sessionStored = true;
+  } catch (error) {
+    logger?.warn("storeState: sessionStorage \u3078\u306E\u4FDD\u5B58\u306B\u5931\u6557\u3057\u307E\u3057\u305F:", error);
+  }
+  let localStored = false;
+  try {
+    window.localStorage.setItem(STATE_FALLBACK_STORAGE_KEY, state);
+    window.localStorage.setItem(STATE_FALLBACK_TIMESTAMP_KEY, String(Date.now()));
+    localStored = true;
+  } catch (error) {
+    logger?.warn("storeState: localStorage fallback \u3078\u306E\u4FDD\u5B58\u306B\u5931\u6557\u3057\u307E\u3057\u305F:", error);
+  }
+  return sessionStored || localStored;
+}
+function cleanupStateStorage(logger) {
+  try {
+    window.sessionStorage.removeItem(STATE_STORAGE_KEY);
+  } catch (error) {
+    logger?.warn("retrieveState: sessionStorage \u306E\u30AF\u30EA\u30FC\u30F3\u30A2\u30C3\u30D7\u306B\u5931\u6557\u3057\u307E\u3057\u305F:", error);
+  }
+  try {
+    window.localStorage.removeItem(STATE_FALLBACK_STORAGE_KEY);
+    window.localStorage.removeItem(STATE_FALLBACK_TIMESTAMP_KEY);
+  } catch (error) {
+    logger?.warn("retrieveState: localStorage \u306E\u30AF\u30EA\u30FC\u30F3\u30A2\u30C3\u30D7\u306B\u5931\u6557\u3057\u307E\u3057\u305F:", error);
+  }
+}
+
 // src/client/redirect.ts
 var OAUTH_AUTHORIZE_ENDPOINT = "/api/v1/oauth/authorize";
 var AUTH_LOGOUT_ENDPOINT = "/api/v1/auth/logout";
@@ -1513,6 +1635,7 @@ function createRedirectMethods(deps) {
     const recentCount = getRecentRedirectCount(authorizeKey, now, logger);
     if (recentCount >= REDIRECT_LOOP_THRESHOLD) {
       cleanupVerifierStorage(logger);
+      cleanupStateStorage(logger);
       logger.warn("[FFID SDK] redirect loop detected \u2014 \u81EA\u52D5\u30EA\u30C0\u30A4\u30EC\u30AF\u30C8\u3092\u505C\u6B62\u3057\u307E\u3057\u305F", {
         authorizeKey,
         recentCount,
@@ -1536,6 +1659,11 @@ function createRedirectMethods(deps) {
       return { success: false, error: errorMessage };
     }
     const state = generateRandomState();
+    if (!storeState(state, logger)) {
+      logger.error(
+        "redirectToAuthorize: OAuth state \u3092\u4FDD\u5B58\u3067\u304D\u307E\u305B\u3093\u3067\u3057\u305F\uFF08storage \u5229\u7528\u4E0D\u53EF\uFF09\u3002\u30B3\u30FC\u30EB\u30D0\u30C3\u30AF\u3067\u306E CSRF \u691C\u8A3C\u304C\u5931\u6557\u3057\u307E\u3059"
+      );
+    }
     const redirectUri = resolvedRedirectUri ?? window.location.origin + window.location.pathname;
     const params = new URLSearchParams({
       response_type: "code",
@@ -2250,7 +2378,8 @@ var FFID_ERROR_CODES = {
   TOKEN_EXCHANGE_ERROR: "TOKEN_EXCHANGE_ERROR",
   TOKEN_REFRESH_ERROR: "TOKEN_REFRESH_ERROR",
   NO_TOKENS: "NO_TOKENS",
-  TOKEN_VERIFICATION_ERROR: "TOKEN_VERIFICATION_ERROR"
+  TOKEN_VERIFICATION_ERROR: "TOKEN_VERIFICATION_ERROR",
+  STATE_MISMATCH_ERROR: "STATE_MISMATCH_ERROR"
 };
 var EXT_CHECK_ENDPOINT = "/api/v1/subscriptions/ext/check";
 var DEFAULT_ALLOW_GRACE = true;
@@ -2608,7 +2737,11 @@ function createFFIDClient(config) {
     }
     return result;
   }
-  const { createCheckoutSession, createPortalSession } = createBillingMethods({
+  const { createCheckoutSession, createPortalSession, listInvoices, getInvoice, retryPayment } = createBillingMethods({
+    fetchWithAuth,
+    createError
+  });
+  const { listSeatAssignments, assignSeats, unassignSeat } = createSeatMethods({
     fetchWithAuth,
     createError
   });
@@ -2717,6 +2850,12 @@ function createFFIDClient(config) {
     getAnalyticsConfig,
     createCheckoutSession,
     createPortalSession,
+    listInvoices,
+    getInvoice,
+    retryPayment,
+    listSeatAssignments,
+    assignSeats,
+    unassignSeat,
     listPlans,
     getSubscription,
     subscribe,

package/dist/server/test/index.d.cts

@@ -1,5 +1,5 @@
-import { k as FFIDClient, e as FFIDOAuthUserInfo } from '../../ffid-client-DRjzfAaS.cjs';
-import '../../types-BYdtyO_2.cjs';
+import { k as FFIDClient, e as FFIDOAuthUserInfo } from '../../ffid-client-C3K3sAqq.cjs';
+import '../../types-BeVl-z12.cjs';
 
 /**
  * FFID SDK - Test mode client (E2E / integration test bypass)

package/dist/server/test/index.d.ts

@@ -1,5 +1,5 @@
-import { k as FFIDClient, e as FFIDOAuthUserInfo } from '../../ffid-client-gboJROw0.js';
-import '../../types-BYdtyO_2.js';
+import { k as FFIDClient, e as FFIDOAuthUserInfo } from '../../ffid-client-BG0Qr86U.js';
+import '../../types-BeVl-z12.js';
 
 /**
  * FFID SDK - Test mode client (E2E / integration test bypass)

package/dist/{types-BYdtyO_2.d.cts → types-BeVl-z12.d.cts}

@@ -49,6 +49,15 @@
  * @see /api/v1/subscriptions/ext/check
  * @see docs/03-implementation/EXPIRED_CONTRACT_HANDLING.md
  */
-type EffectiveSubscriptionStatus = 'active' | 'active_canceling' | 'past_due_grace' | 'blocked' | 'canceled' | 'trial_expired' | 'expired';
+declare const EFFECTIVE_SUBSCRIPTION_STATUSES: readonly ["active", "active_canceling", "past_due_grace", "blocked", "canceled", "trial_expired", "expired"];
+/**
+ * Derived from {@link EFFECTIVE_SUBSCRIPTION_STATUSES} so the literal set has
+ * a runtime representation. The server mirrors the same const in
+ * `src/lib/common/subscription-helpers.ts`, and a server-side unit test pins
+ * element-equality between the two arrays (#3474) — convention-only sync
+ * could drift silently in the server-extending direction (a new server
+ * literal would fall through SDK consumers' `switch` defaults).
+ */
+type EffectiveSubscriptionStatus = (typeof EFFECTIVE_SUBSCRIPTION_STATUSES)[number];
 
 export type { EffectiveSubscriptionStatus as E };

package/dist/{types-BYdtyO_2.d.ts → types-BeVl-z12.d.ts}

@@ -49,6 +49,15 @@
  * @see /api/v1/subscriptions/ext/check
  * @see docs/03-implementation/EXPIRED_CONTRACT_HANDLING.md
  */
-type EffectiveSubscriptionStatus = 'active' | 'active_canceling' | 'past_due_grace' | 'blocked' | 'canceled' | 'trial_expired' | 'expired';
+declare const EFFECTIVE_SUBSCRIPTION_STATUSES: readonly ["active", "active_canceling", "past_due_grace", "blocked", "canceled", "trial_expired", "expired"];
+/**
+ * Derived from {@link EFFECTIVE_SUBSCRIPTION_STATUSES} so the literal set has
+ * a runtime representation. The server mirrors the same const in
+ * `src/lib/common/subscription-helpers.ts`, and a server-side unit test pins
+ * element-equality between the two arrays (#3474) — convention-only sync
+ * could drift silently in the server-extending direction (a new server
+ * literal would fall through SDK consumers' `switch` defaults).
+ */
+type EffectiveSubscriptionStatus = (typeof EFFECTIVE_SUBSCRIPTION_STATUSES)[number];
 
 export type { EffectiveSubscriptionStatus as E };

package/dist/webhooks/index.cjs

@@ -92,6 +92,7 @@ function verifyWebhookSignature(rawBody, signatureHeader, secret, toleranceSecon
 var SDK_LOG_PREFIX = "[FFID Webhook SDK]";
 var HTTP_OK = 200;
 var HTTP_BAD_REQUEST = 400;
+var HTTP_INTERNAL_SERVER_ERROR = 500;
 var noopLogger = {
   debug: () => {
   },
@@ -184,7 +185,8 @@ function createFFIDWebhookHandler(config) {
       }).catch((error) => {
         logger.error("Webhook processing failed:", error);
         const message = error instanceof Error ? error.message : "Webhook processing failed";
-        res.status(HTTP_BAD_REQUEST).json({ error: message });
+        const status = error instanceof FFIDWebhookError ? HTTP_BAD_REQUEST : HTTP_INTERNAL_SERVER_ERROR;
+        res.status(status).json({ error: message });
       });
     };
   }
@@ -211,9 +213,10 @@ function createFFIDWebhookHandler(config) {
       } catch (error) {
         logger.error("Webhook processing failed:", error);
         const message = error instanceof Error ? error.message : "Webhook processing failed";
+        const status = error instanceof FFIDWebhookError ? HTTP_BAD_REQUEST : HTTP_INTERNAL_SERVER_ERROR;
         return new Response(
           JSON.stringify({ error: message }),
-          { status: HTTP_BAD_REQUEST, headers: { "Content-Type": "application/json" } }
+          { status, headers: { "Content-Type": "application/json" } }
         );
       }
     };

package/dist/webhooks/index.d.cts

@@ -1,4 +1,4 @@
-import { E as EffectiveSubscriptionStatus } from '../types-BYdtyO_2.cjs';
+import { E as EffectiveSubscriptionStatus } from '../types-BeVl-z12.cjs';
 
 /**
  * FFID Webhook SDK Constants

package/dist/webhooks/index.d.ts

@@ -1,4 +1,4 @@
-import { E as EffectiveSubscriptionStatus } from '../types-BYdtyO_2.js';
+import { E as EffectiveSubscriptionStatus } from '../types-BeVl-z12.js';
 
 /**
  * FFID Webhook SDK Constants

package/dist/webhooks/index.js

@@ -90,6 +90,7 @@ function verifyWebhookSignature(rawBody, signatureHeader, secret, toleranceSecon
 var SDK_LOG_PREFIX = "[FFID Webhook SDK]";
 var HTTP_OK = 200;
 var HTTP_BAD_REQUEST = 400;
+var HTTP_INTERNAL_SERVER_ERROR = 500;
 var noopLogger = {
   debug: () => {
   },
@@ -182,7 +183,8 @@ function createFFIDWebhookHandler(config) {
       }).catch((error) => {
         logger.error("Webhook processing failed:", error);
         const message = error instanceof Error ? error.message : "Webhook processing failed";
-        res.status(HTTP_BAD_REQUEST).json({ error: message });
+        const status = error instanceof FFIDWebhookError ? HTTP_BAD_REQUEST : HTTP_INTERNAL_SERVER_ERROR;
+        res.status(status).json({ error: message });
       });
     };
   }
@@ -209,9 +211,10 @@ function createFFIDWebhookHandler(config) {
       } catch (error) {
         logger.error("Webhook processing failed:", error);
         const message = error instanceof Error ? error.message : "Webhook processing failed";
+        const status = error instanceof FFIDWebhookError ? HTTP_BAD_REQUEST : HTTP_INTERNAL_SERVER_ERROR;
         return new Response(
           JSON.stringify({ error: message }),
-          { status: HTTP_BAD_REQUEST, headers: { "Content-Type": "application/json" } }
+          { status, headers: { "Content-Type": "application/json" } }
         );
       }
     };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@feelflow/ffid-sdk",
-  "version": "5.10.0",
+  "version": "5.13.0",
   "description": "FeelFlow ID Platform SDK for React/Next.js applications",
   "keywords": [
     "feelflow",