Skip to content

Infisical is the open-source platform for securing secrets, certificates, access, and AI Agents.

feat(signup): open the pricing trial prompt for signed-in users (#8738)

Andrew Huange1bd22cff7aa
diff --git a/frontend/src/components/auth/signupTrialIntent.ts b/frontend/src/components/auth/signupTrialIntent.ts
index 2b0afce1bd..0028a23628 100644
--- a/frontend/src/components/auth/signupTrialIntent.ts
+++ b/frontend/src/components/auth/signupTrialIntent.ts
@@ -68,14 +68,18 @@ export const getSignupTrialIntent = (): SignupTrialIntent | null => {
}
};
-export const captureSignupTrialIntent = (search: string) => {
+export const parseSignupTrialSearch = (search: string) => {
if (!isInfisicalCloud()) return null;
const params = new URLSearchParams(search);
- const intent = parseIntent({
+ return parseIntent({
product: params.get("product"),
plan: params.get("plan"),
cycle: params.get("cycle")
});
+};
+
+export const captureSignupTrialIntent = (search: string) => {
+ const intent = parseSignupTrialSearch(search);
if (!intent) return getSignupTrialIntent();
const captured = { ...intent, savedAt: Date.now() };
try {
@@ -99,7 +103,10 @@ export const bindSignupTrialIntent = (orgId: string) => {
export const getSignupTrialProjectType = (intent: SignupTrialIntent | null): SignupProductType[] =>
intent ? [TRIAL_PRODUCTS[intent.product].projectType] : [];
-export const getSignupTrialBillingSearch = (intent: SignupTrialIntent, returnPath: string) => ({
+export const getSignupTrialBillingSearch = (
+ intent: Pick<SignupTrialIntent, "product" | "plan" | "cycle">,
+ returnPath: string
+) => ({
upgradeProduct: TRIAL_PRODUCTS[intent.product].billingProduct,
upgradePlan: intent.plan,
...(intent.cycle && { upgradeCycle: intent.cycle }),
diff --git a/frontend/src/pages/middlewares/restrict-login-signup.tsx b/frontend/src/pages/middlewares/restrict-login-signup.tsx
index d8c57ab994..87a988afee 100644
--- a/frontend/src/pages/middlewares/restrict-login-signup.tsx
+++ b/frontend/src/pages/middlewares/restrict-login-signup.tsx
@@ -7,6 +7,10 @@ import DOMPurify from "dompurify";
import rehypeRaw from "rehype-raw";
import { z } from "zod";
+import {
+ getSignupTrialBillingSearch,
+ parseSignupTrialSearch
+} from "@app/components/auth/signupTrialIntent";
import { Button } from "@app/components/v3";
import { SessionStorageKeys } from "@app/const";
import { useServerConfig } from "@app/context";
@@ -111,6 +115,20 @@ export const Route = createFileRoute("/_restrict-login-signup")({
const orgId = data.subOrganizationId || data.organizationId;
if (orgId) {
+ // A signed-in visitor from a pricing-page trial button gets that plan's trial confirmation on
+ // their current organization's billing page, which falls back to projects when they can't trial.
+ const trialIntent =
+ location.pathname.replace(/\/$/, "") === "/signup"
+ ? parseSignupTrialSearch(location.searchStr)
+ : null;
+ if (trialIntent) {
+ const billingSearch = new URLSearchParams(
+ getSignupTrialBillingSearch(trialIntent, `/organizations/${orgId}/projects`)
+ );
+ throw redirect({
+ href: `/organizations/${data.organizationId ?? orgId}/billing?${billingSearch.toString()}`
+ });
+ }
throw redirect({
to: "/organizations/$orgId/projects",
params: { orgId }
diff --git a/frontend/src/pages/organization/BillingV2Page/BillingV2Page.tsx b/frontend/src/pages/organization/BillingV2Page/BillingV2Page.tsx
index e3fbc6f694..ba0b9d3655 100644
--- a/frontend/src/pages/organization/BillingV2Page/BillingV2Page.tsx
+++ b/frontend/src/pages/organization/BillingV2Page/BillingV2Page.tsx
@@ -120,11 +120,18 @@ export const BillingV2Page = () => {
if (flow || openedUpgradeProduct.current || !upgradeProduct) {
return;
}
- const hasProduct = catalog.some((product) => product.id === upgradeProduct);
+ const product = catalog.find((candidate) => candidate.id === upgradeProduct);
+ const hasProduct = Boolean(product);
if (upgradePlan) {
if (isCatalogPending || (hasProduct && !overview && !isError)) return;
- if (!hasProduct || isError) {
- if (upgradeReturnPath) window.location.assign(upgradeReturnPath);
+ const trialPlan = product?.plans.find((plan) => plan.tier === upgradePlan);
+ const canTrial =
+ !isError &&
+ hasManageBillingPermission &&
+ Boolean(overview?.selfServe) &&
+ Boolean(trialPlan?.selfServe && trialPlan.trialable);
+ if (!canTrial) {
+ if (upgradeReturnPath) window.location.replace(upgradeReturnPath);
return;
}
} else if (!hasProduct) {
@@ -132,7 +139,16 @@ export const BillingV2Page = () => {
}
openedUpgradeProduct.current = true;
setFlow({ type: "sheet", prodId: upgradeProduct, trialTier: upgradePlan ?? undefined });
- }, [catalog, flow, upgradeProduct, upgradePlan, isCatalogPending, overview, isError]);
+ }, [
+ catalog,
+ flow,
+ upgradeProduct,
+ upgradePlan,
+ isCatalogPending,
+ overview,
+ isError,
+ hasManageBillingPermission
+ ]);
// Stripe redirects back with ?checkout=success|canceled; surface the outcome and refresh state.
useEffect(() => {
@@ -364,6 +380,7 @@ export const BillingV2Page = () => {
initialView={flow.view}
initialTrialTier={flow.trialTier}
showAnnualTrialNote={Boolean(flow.trialTier) && upgradeCycle === "annual"}
+ trialOrgName={flow.trialTier ? currentOrg?.name : undefined}
returnPath={upgradeReturnPath ?? window.location.pathname}
renewsOn={overview?.entitlements[flow.prodId]?.renewsOn ?? null}
selfServe={overview?.selfServe ?? true}
diff --git a/frontend/src/pages/organization/BillingV2Page/components/ProductSheet.tsx b/frontend/src/pages/organization/BillingV2Page/components/ProductSheet.tsx
index 0f11b9dd3f..4ffb305ae5 100644
--- a/frontend/src/pages/organization/BillingV2Page/components/ProductSheet.tsx
+++ b/frontend/src/pages/organization/BillingV2Page/components/ProductSheet.tsx
@@ -462,6 +462,7 @@ type ProductSheetProps = {
// org may still trial it. Dismissing that confirmation closes the sheet.
initialTrialTier?: string;
showAnnualTrialNote?: boolean;
+ trialOrgName?: string;
returnPath: string;
renewsOn: string | null;
// capabilities.selfServe: false for an enterprise-managed org. Self-serve CTAs render disabled and a
@@ -483,6 +484,7 @@ export const ProductSheet = ({
initialView,
initialTrialTier,
showAnnualTrialNote,
+ trialOrgName,
returnPath,
renewsOn,
selfServe,
@@ -800,6 +802,7 @@ export const ProductSheet = ({
</AlertDialogMedia>
<AlertDialogTitle>
Start your {trialConfirmPlan?.name ?? prod.name} trial
+ {isInitialTrialConfirm && trialOrgName && ` for ${trialOrgName}`}
</AlertDialogTitle>
<AlertDialogDescription>
{trialIsUpgrade