@dineway-ai/plugin-payment 0.2.6 → 0.2.8

package/src/subscriptions/runtime.ts

@@ -3,9 +3,10 @@ import { getDb, type PluginSecretStoreOptions } from "dineway";
 import {
 	PaymentStripeSecretStore,
 	PAYMENT_STRIPE_SECRET_KEY,
-	PAYMENT_STRIPE_SUBSCRIPTION_WEBHOOK_SECRET,
+	PAYMENT_STRIPE_WEBHOOK_SECRET,
 } from "../configuration/secrets.js";
 import { getPaymentStripeConfiguration } from "../configuration/service.js";
+import { PAYMENT_WEBHOOK_PATH } from "../webhooks/types.js";
 import { PaymentSubscriptionService } from "./service.js";
 import { SubscriptionError, type SubscriptionOptions } from "./types.js";
 
@@ -17,7 +18,7 @@ export async function getPaymentSubscriptionService(
 	const config = await getPaymentStripeConfiguration(db, secretOptions);
 	const store = new PaymentStripeSecretStore(db, secretOptions);
 	const secretKey = await store.resolveForRuntime(PAYMENT_STRIPE_SECRET_KEY);
-	const webhookSecret = await store.resolveForRuntime(PAYMENT_STRIPE_SUBSCRIPTION_WEBHOOK_SECRET);
+	const webhookSecret = await store.resolveForRuntime(PAYMENT_STRIPE_WEBHOOK_SECRET);
 	if (
 		config.settings.configurationStatus !== "valid" ||
 		!config.settings.stripeAccountId ||
@@ -26,7 +27,7 @@ export async function getPaymentSubscriptionService(
 	) {
 		throw new SubscriptionError(
 			"BILLING_UNAVAILABLE",
-			"Configure and verify Stripe and the subscription webhook first",
+			"Configure and verify Stripe and the Payment webhook first",
 			503,
 		);
 	}
@@ -47,7 +48,7 @@ export async function getSubscriptionConfiguration(options: SubscriptionOptions)
 	const db = await getDb();
 	const configuration = await getPaymentStripeConfiguration(db);
 	const webhookSecret = await new PaymentStripeSecretStore(db).status(
-		PAYMENT_STRIPE_SUBSCRIPTION_WEBHOOK_SECRET,
+		PAYMENT_STRIPE_WEBHOOK_SECRET,
 	);
 	return {
 		namespace: options.namespace,
@@ -57,9 +58,6 @@ export async function getSubscriptionConfiguration(options: SubscriptionOptions)
 			configuration.settings.configurationStatus === "valid" &&
 			Boolean(configuration.secretKey && webhookSecret),
 		webhookSecret,
-		webhookUrl: new URL(
-			"/_dineway/api/plugins/dineway-payment/subscriptions/webhook",
-			options.siteUrl,
-		).href,
+		webhookUrl: new URL(PAYMENT_WEBHOOK_PATH, options.siteUrl).href,
 	};
 }

package/src/subscriptions/schemas.ts

@@ -90,6 +90,51 @@ export const checkoutSchema = z
 	})
 	.strict();
 export const portalSchema = checkoutSchema.pick({ locale: true, returnPath: true });
+export const billingSubjectSchema = z
+	.object({
+		realm: subscriptionCode.refine((value) => value !== "dineway", "The Dineway realm is reserved"),
+		id: z
+			.string()
+			.min(1)
+			.max(128)
+			.regex(/^[A-Za-z0-9_.:-]+$/),
+		email: z.string().trim().email().max(320),
+		emailVerified: z.literal(true),
+	})
+	.strict();
+const purchaseKey = z
+	.string()
+	.min(1)
+	.max(160)
+	.regex(/^[A-Za-z0-9_.:-]+$/);
+export const purchaseSchema = z
+	.object({
+		reference: purchaseKey,
+		groupKey: purchaseKey,
+		pricing: z.discriminatedUnion("kind", [
+			z
+				.object({
+					kind: z.literal("catalogue"),
+					planCode: subscriptionCode,
+					interval: z.enum(["month", "year"]),
+				})
+				.strict(),
+			z
+				.object({
+					kind: z.literal("dynamic"),
+					name: z.string().trim().min(1).max(160),
+					amount: z.number().int().min(1).max(99999999),
+					currency: z.string().regex(/^[a-z]{3}$/),
+					interval: z.enum(["day", "week", "month", "year"]),
+					intervalCount: z.number().int().min(1).max(365),
+				})
+				.strict(),
+		]),
+		firstPeriodCredit: z.number().int().min(0).max(99999999).default(0),
+		returnPath: subscriptionReturnPath,
+		locale: subscriptionLocale.default("auto"),
+	})
+	.strict();
 export const memberListSchema = z
 	.object({
 		cursor: z.string().max(255).optional(),