@streamoid/settings 0.1.0 → 0.1.1

package/dist/index.d.mts

@@ -490,6 +490,20 @@ interface SettingsApiAdapter {
     fetchReferrals?: () => Promise<unknown[]>;
 }
 interface SettingsNavigationAdapter {
+    /**
+     * Resolve a fully-qualified URL the host wants Stripe checkout to redirect
+     * back to after success / cancel. Both flows typically land on the billing
+     * tab. The package calls this for `updateSubscription` (upgrade/downgrade)
+     * and `buyCredits` (topup) checkout payloads.
+     *
+     * When omitted, the package falls back to
+     * `${window.location.origin}${window.location.pathname}` — i.e. brings the
+     * user back to the page they triggered checkout from. Hosts override when
+     * they need a different URL shape (e.g. CXO uses
+     * `/dashboard/<wsId>/billing`, Photogenix uses
+     * `/workspace/<wsId>/settings/billing`).
+     */
+    getCheckoutReturnUrl?: (kind: "success" | "cancel") => string;
     /** Imperative navigate to another settings tab. */
     navigateToTab: (tab: SettingsTab) => void;
     /** External-link navigate (e.g. for "What's new" or referral promo links). */

package/dist/index.d.ts

@@ -490,6 +490,20 @@ interface SettingsApiAdapter {
     fetchReferrals?: () => Promise<unknown[]>;
 }
 interface SettingsNavigationAdapter {
+    /**
+     * Resolve a fully-qualified URL the host wants Stripe checkout to redirect
+     * back to after success / cancel. Both flows typically land on the billing
+     * tab. The package calls this for `updateSubscription` (upgrade/downgrade)
+     * and `buyCredits` (topup) checkout payloads.
+     *
+     * When omitted, the package falls back to
+     * `${window.location.origin}${window.location.pathname}` — i.e. brings the
+     * user back to the page they triggered checkout from. Hosts override when
+     * they need a different URL shape (e.g. CXO uses
+     * `/dashboard/<wsId>/billing`, Photogenix uses
+     * `/workspace/<wsId>/settings/billing`).
+     */
+    getCheckoutReturnUrl?: (kind: "success" | "cancel") => string;
     /** Imperative navigate to another settings tab. */
     navigateToTab: (tab: SettingsTab) => void;
     /** External-link navigate (e.g. for "What's new" or referral promo links). */

package/dist/index.js

@@ -4546,7 +4546,7 @@ function UpdateSubscriptionModal({
                               lineHeight: "var(--line-height-line-height-xxl)",
                               color: "var(--alias-text---icons-primary)"
                             },
-                            children: currentPlanName === "free" ? "Free" : "Pro"
+                            children: currentPlanName || "Free"
                           }
                         ),
                         /* @__PURE__ */ (0, import_jsx_runtime11.jsxs)("div", { className: "flex flex-col items-end", children: [
@@ -5360,9 +5360,16 @@ function UsageLogsTable({
   );
 }
 function BillingContent({ embedded = false } = {}) {
-  const { auth, workspace, api, toast } = useSettingsAdapters();
+  const { auth, workspace, api, toast, navigation } = useSettingsAdapters();
   const user = auth.user;
   const workspaceId = workspace.current?.id ?? null;
+  const resolveReturnUrl = (kind) => {
+    if (navigation.getCheckoutReturnUrl) {
+      return navigation.getCheckoutReturnUrl(kind);
+    }
+    if (typeof window === "undefined") return "";
+    return `${window.location.origin}${window.location.pathname}`;
+  };
   const [activeTab, setActiveTab] = (0, import_react8.useState)("invoice");
   const [showPlans, setShowPlans] = (0, import_react8.useState)(false);
   const [showExportModal, setShowExportModal] = (0, import_react8.useState)(false);
@@ -5487,8 +5494,8 @@ function BillingContent({ embedded = false } = {}) {
         quantity: 1,
         customerEmail: user.email,
         customMetadata: { ref: "Unified dashboard" },
-        successUrl: `${window.location.origin}/dashboard/${workspaceId}/billing`,
-        cancelUrl: `${window.location.origin}/dashboard/${workspaceId}/billing`,
+        successUrl: resolveReturnUrl("success"),
+        cancelUrl: resolveReturnUrl("cancel"),
         action: "upgrade"
       };
       try {
@@ -5585,8 +5592,8 @@ function BillingContent({ embedded = false } = {}) {
     if (loadingBilling) return;
     setShowInitialLoader(false);
   }, [showInitialLoader, initialFetchTriggered, loadingBilling]);
-  const planName = subscription?.plan?.amount != null && subscription.plan.amount > 0 ? "Pro" : "Free";
-  const isFreePlan = subscription?.plan?.amount === 0 && planName.trim().toLowerCase() === "free";
+  const planName = subscription?.plan?.name?.trim() || (subscription?.plan?.amount != null && subscription.plan.amount > 0 ? "Pro" : "Free");
+  const isFreePlan = subscription?.plan?.amount == null || subscription.plan.amount === 0;
   const planAmount = subscription?.plan?.amount != null ? `$${(subscription.plan.amount / 100).toFixed(2)} / month` : "$0";
   const usedCredits = availableCredits != null && totalCredits != null ? Math.max(0, totalCredits - availableCredits) : null;
   const progressPct = usedCredits != null && totalCredits != null && totalCredits > 0 ? Math.min(100, Math.round(usedCredits / totalCredits * 100)) : 0;
@@ -5683,7 +5690,6 @@ function BillingContent({ embedded = false } = {}) {
         additionalInfo: `${credits}:${price}`
       }
     );
-    const returnUrl = `${window.location.origin}/dashboard/${workspaceId}/billing`;
     try {
       const res = await api.buyCredits({
         serviceName: DEFAULT_TOPUP_SERVICE,
@@ -5691,8 +5697,8 @@ function BillingContent({ embedded = false } = {}) {
         unitAmount: price,
         itemCount: 1,
         currency: "usd",
-        successUrl: returnUrl,
-        cancelUrl: returnUrl,
+        successUrl: resolveReturnUrl("success"),
+        cancelUrl: resolveReturnUrl("cancel"),
         metadata: { source: "self-serve" }
       });
       const payloadData = "data" in res && res.data ? res.data : res;

package/dist/index.mjs

@@ -4554,7 +4554,7 @@ function UpdateSubscriptionModal({
                               lineHeight: "var(--line-height-line-height-xxl)",
                               color: "var(--alias-text---icons-primary)"
                             },
-                            children: currentPlanName === "free" ? "Free" : "Pro"
+                            children: currentPlanName || "Free"
                           }
                         ),
                         /* @__PURE__ */ jsxs9("div", { className: "flex flex-col items-end", children: [
@@ -5368,9 +5368,16 @@ function UsageLogsTable({
   );
 }
 function BillingContent({ embedded = false } = {}) {
-  const { auth, workspace, api, toast } = useSettingsAdapters();
+  const { auth, workspace, api, toast, navigation } = useSettingsAdapters();
   const user = auth.user;
   const workspaceId = workspace.current?.id ?? null;
+  const resolveReturnUrl = (kind) => {
+    if (navigation.getCheckoutReturnUrl) {
+      return navigation.getCheckoutReturnUrl(kind);
+    }
+    if (typeof window === "undefined") return "";
+    return `${window.location.origin}${window.location.pathname}`;
+  };
   const [activeTab, setActiveTab] = useState7("invoice");
   const [showPlans, setShowPlans] = useState7(false);
   const [showExportModal, setShowExportModal] = useState7(false);
@@ -5495,8 +5502,8 @@ function BillingContent({ embedded = false } = {}) {
         quantity: 1,
         customerEmail: user.email,
         customMetadata: { ref: "Unified dashboard" },
-        successUrl: `${window.location.origin}/dashboard/${workspaceId}/billing`,
-        cancelUrl: `${window.location.origin}/dashboard/${workspaceId}/billing`,
+        successUrl: resolveReturnUrl("success"),
+        cancelUrl: resolveReturnUrl("cancel"),
         action: "upgrade"
       };
       try {
@@ -5593,8 +5600,8 @@ function BillingContent({ embedded = false } = {}) {
     if (loadingBilling) return;
     setShowInitialLoader(false);
   }, [showInitialLoader, initialFetchTriggered, loadingBilling]);
-  const planName = subscription?.plan?.amount != null && subscription.plan.amount > 0 ? "Pro" : "Free";
-  const isFreePlan = subscription?.plan?.amount === 0 && planName.trim().toLowerCase() === "free";
+  const planName = subscription?.plan?.name?.trim() || (subscription?.plan?.amount != null && subscription.plan.amount > 0 ? "Pro" : "Free");
+  const isFreePlan = subscription?.plan?.amount == null || subscription.plan.amount === 0;
   const planAmount = subscription?.plan?.amount != null ? `$${(subscription.plan.amount / 100).toFixed(2)} / month` : "$0";
   const usedCredits = availableCredits != null && totalCredits != null ? Math.max(0, totalCredits - availableCredits) : null;
   const progressPct = usedCredits != null && totalCredits != null && totalCredits > 0 ? Math.min(100, Math.round(usedCredits / totalCredits * 100)) : 0;
@@ -5691,7 +5698,6 @@ function BillingContent({ embedded = false } = {}) {
         additionalInfo: `${credits}:${price}`
       }
     );
-    const returnUrl = `${window.location.origin}/dashboard/${workspaceId}/billing`;
     try {
       const res = await api.buyCredits({
         serviceName: DEFAULT_TOPUP_SERVICE,
@@ -5699,8 +5705,8 @@ function BillingContent({ embedded = false } = {}) {
         unitAmount: price,
         itemCount: 1,
         currency: "usd",
-        successUrl: returnUrl,
-        cancelUrl: returnUrl,
+        successUrl: resolveReturnUrl("success"),
+        cancelUrl: resolveReturnUrl("cancel"),
         metadata: { source: "self-serve" }
       });
       const payloadData = "data" in res && res.data ? res.data : res;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@streamoid/settings",
-  "version": "0.1.0",
+  "version": "0.1.1",
   "main": "./dist/index.js",
   "module": "./dist/index.mjs",
   "types": "./dist/index.d.ts",