@better-auth/stripe 1.5.0-beta.2 → 1.5.0-beta.3

package/src/schema.ts

@@ -77,6 +77,17 @@ export const user = {
 	},
 } satisfies BetterAuthPluginDBSchema;
 
+export const organization = {
+	organization: {
+		fields: {
+			stripeCustomerId: {
+				type: "string",
+				required: false,
+			},
+		},
+	},
+} satisfies BetterAuthPluginDBSchema;
+
 export const getSchema = (options: StripeOptions) => {
 	let baseSchema = {};
 
@@ -91,6 +102,13 @@ export const getSchema = (options: StripeOptions) => {
 		};
 	}
 
+	if (options.organization?.enabled) {
+		baseSchema = {
+			...baseSchema,
+			...organization,
+		};
+	}
+
 	if (
 		options.schema &&
 		!options.subscription?.enabled &&

package/src/types.ts

@@ -4,8 +4,32 @@ import type {
 	Session,
 	User,
 } from "better-auth";
+import type { Organization } from "better-auth/plugins/organization";
 import type Stripe from "stripe";
-import type { subscriptions, user } from "./schema";
+import type { organization, subscriptions, user } from "./schema";
+
+export type AuthorizeReferenceAction =
+	| "upgrade-subscription"
+	| "list-subscription"
+	| "cancel-subscription"
+	| "restore-subscription"
+	| "billing-portal";
+
+export type CustomerType = "user" | "organization";
+
+export type WithStripeCustomerId = {
+	stripeCustomerId?: string;
+};
+
+// TODO: Types extended by a plugin should be moved into that plugin.
+export type WithActiveOrganizationId = {
+	activeOrganizationId?: string;
+};
+
+export type StripeCtxSession = {
+	session: Session & WithActiveOrganizationId;
+	user: User & WithStripeCustomerId;
+};
 
 export type StripePlan = {
 	/**
@@ -253,12 +277,7 @@ export type SubscriptionOptions = {
 					user: User & Record<string, any>;
 					session: Session & Record<string, any>;
 					referenceId: string;
-					action:
-						| "upgrade-subscription"
-						| "list-subscription"
-						| "cancel-subscription"
-						| "restore-subscription"
-						| "billing-portal";
+					action: AuthorizeReferenceAction;
 				},
 				ctx: GenericEndpointContext,
 		  ) => Promise<boolean>)
@@ -313,14 +332,6 @@ export type SubscriptionOptions = {
 						options?: Stripe.RequestOptions;
 				  })
 		| undefined;
-	/**
-	 * Enable organization subscription
-	 */
-	organization?:
-		| {
-				enabled: boolean;
-		  }
-		| undefined;
 };
 
 export interface StripeOptions {
@@ -348,7 +359,7 @@ export interface StripeOptions {
 		| ((
 				data: {
 					stripeCustomer: Stripe.Customer;
-					user: User & { stripeCustomerId: string };
+					user: User & WithStripeCustomerId;
 				},
 				ctx: GenericEndpointContext,
 		  ) => Promise<void>)
@@ -378,6 +389,49 @@ export interface StripeOptions {
 				  } & SubscriptionOptions)
 		  )
 		| undefined;
+	/**
+	 * Organization Stripe integration
+	 *
+	 * Enable organizations to have their own Stripe customer ID
+	 */
+	organization?:
+		| {
+				/**
+				 * Enable organization Stripe customer
+				 */
+				enabled: true;
+				/**
+				 * A custom function to get the customer create params
+				 * for organization customers.
+				 *
+				 * @param organization - the organization
+				 * @param ctx - the context object
+				 * @returns
+				 */
+				getCustomerCreateParams?:
+					| ((
+							organization: Organization,
+							ctx: GenericEndpointContext,
+					  ) => Promise<Partial<Stripe.CustomerCreateParams>>)
+					| undefined;
+				/**
+				 * A callback to run after an organization customer has been created
+				 *
+				 * @param data - data containing stripeCustomer and organization
+				 * @param ctx - the context object
+				 * @returns
+				 */
+				onCustomerCreate?:
+					| ((
+							data: {
+								stripeCustomer: Stripe.Customer;
+								organization: Organization & WithStripeCustomerId;
+							},
+							ctx: GenericEndpointContext,
+					  ) => Promise<void>)
+					| undefined;
+		  }
+		| undefined;
 	/**
 	 * A callback to run after a stripe event is received
 	 * @param event - Stripe Event
@@ -387,7 +441,9 @@ export interface StripeOptions {
 	/**
 	 * Schema for the stripe plugin
 	 */
-	schema?: InferOptionSchema<typeof subscriptions & typeof user> | undefined;
+	schema?:
+		| InferOptionSchema<
+				typeof subscriptions & typeof user & typeof organization
+		  >
+		| undefined;
 }
-
-export interface InputSubscription extends Omit<Subscription, "id"> {}

package/src/utils.ts

@@ -57,3 +57,14 @@ export function isPendingCancel(sub: Subscription): boolean {
 export function isStripePendingCancel(stripeSub: Stripe.Subscription): boolean {
 	return !!(stripeSub.cancel_at_period_end || stripeSub.cancel_at);
 }
+
+/**
+ * Escapes a value for use in Stripe search queries.
+ * Stripe search query uses double quotes for string values,
+ * and double quotes within the value need to be escaped with backslash.
+ *
+ * @see https://docs.stripe.com/search#search-query-language
+ */
+export function escapeStripeSearchValue(value: string): string {
+	return value.replace(/"/g, '\\"');
+}