@alexasomba/better-auth-paystack 2.4.0 → 2.4.3

package/dist/index.mjs

@@ -1,10 +1,210 @@
-import { t as PACKAGE_VERSION } from "./version-C_50YiuM.mjs";
-import { HIDE_METADATA, defineErrorCodes, logger } from "better-auth";
+import { t as PACKAGE_VERSION } from "./version-GQ15aLQo.mjs";
+import { HIDE_METADATA, defineErrorCodes } from "better-auth";
 import { defu } from "defu";
 import { APIError, createAuthEndpoint, createAuthMiddleware, getSessionFromCtx, originCheck, sessionMiddleware } from "better-auth/api";
 import { z } from "zod";
-import { PaystackResponse } from "@alexasomba/paystack-node";
+import { PaystackError, PaystackResponse } from "@alexasomba/paystack-node";
 import { mergeSchema } from "better-auth/db";
+//#region src/billing-store.ts
+function sortSubscriptionsForCurrent(subscriptions) {
+	const statusRank = new Map([
+		["active", 0],
+		["trialing", 1],
+		["incomplete", 2],
+		["past_due", 3],
+		["canceled", 4]
+	]);
+	return [...subscriptions].sort((a, b) => {
+		const rankA = statusRank.get(a.status) ?? 99;
+		const rankB = statusRank.get(b.status) ?? 99;
+		if (rankA !== rankB) return rankA - rankB;
+		return new Date(b.updatedAt).getTime() - new Date(a.updatedAt).getTime();
+	});
+}
+function createBillingStore(ctx) {
+	return createBillingStoreFromAdapter(ctx.context.adapter);
+}
+function createBillingStoreFromAdapter(adapter) {
+	const findOne = async (model, where) => await adapter.findOne({
+		model,
+		where
+	}) ?? null;
+	const findMany = async (model, where) => await adapter.findMany({
+		model,
+		...where ? { where } : {}
+	}) ?? [];
+	return {
+		findSubscriptionById: (id) => findOne("subscription", [{
+			field: "id",
+			value: id
+		}]),
+		findSubscriptionByCode: (subscriptionCode) => findOne("subscription", [{
+			field: "paystackSubscriptionCode",
+			value: subscriptionCode
+		}]),
+		findSubscriptionsByReference: (referenceId) => findMany("subscription", [{
+			field: "referenceId",
+			value: referenceId
+		}]),
+		async findCurrentSubscription(referenceId) {
+			return sortSubscriptionsForCurrent(await this.findSubscriptionsByReference(referenceId))[0] ?? null;
+		},
+		findSubscriptionsByTransactionReference: (reference) => findMany("subscription", [{
+			field: "paystackTransactionReference",
+			value: reference
+		}]),
+		createSubscription: async (data) => await adapter.create({
+			model: "subscription",
+			data
+		}),
+		updateSubscription: (id, update) => adapter.update({
+			model: "subscription",
+			update,
+			where: [{
+				field: "id",
+				value: id
+			}]
+		}),
+		updateSubscriptionByCode: (subscriptionCode, update) => adapter.update({
+			model: "subscription",
+			update,
+			where: [{
+				field: "paystackSubscriptionCode",
+				value: subscriptionCode
+			}]
+		}),
+		createTransaction: async (data) => await adapter.create({
+			model: "paystackTransaction",
+			data
+		}),
+		findTransactionByReference: (reference) => findOne("paystackTransaction", [{
+			field: "reference",
+			value: reference
+		}]),
+		updateTransactionByReference: (reference, update) => adapter.update({
+			model: "paystackTransaction",
+			update,
+			where: [{
+				field: "reference",
+				value: reference
+			}]
+		}),
+		async listTransactions(referenceId) {
+			return (await findMany("paystackTransaction", [{
+				field: "referenceId",
+				value: referenceId
+			}])).sort((a, b) => b.createdAt.getTime() - a.createdAt.getTime());
+		},
+		async listProducts() {
+			return (await findMany("paystackProduct")).sort((a, b) => a.name.localeCompare(b.name));
+		},
+		findProductByName: (name) => findOne("paystackProduct", [{
+			field: "name",
+			value: name
+		}]),
+		findProductBySlug: (slug) => findOne("paystackProduct", [{
+			field: "slug",
+			value: slug
+		}]),
+		async updateProduct(id, update) {
+			await adapter.update({
+				model: "paystackProduct",
+				update,
+				where: [{
+					field: "id",
+					value: id
+				}]
+			});
+		},
+		async upsertProductByPaystackId(paystackId, data) {
+			const existing = await findOne("paystackProduct", [{
+				field: "paystackId",
+				value: paystackId
+			}]);
+			if (existing?.id !== void 0) {
+				const { createdAt: _createdAt, ...update } = data;
+				await adapter.update({
+					model: "paystackProduct",
+					update,
+					where: [{
+						field: "id",
+						value: String(existing.id)
+					}]
+				});
+				return;
+			}
+			await adapter.create({
+				model: "paystackProduct",
+				data
+			});
+		},
+		listPlans: () => findMany("paystackPlan"),
+		findPlanByName: (name) => findOne("paystackPlan", [{
+			field: "name",
+			value: name
+		}]),
+		findPlanByCode: (planCode) => findOne("paystackPlan", [{
+			field: "planCode",
+			value: planCode
+		}]),
+		async upsertPlanByPaystackId(paystackId, data) {
+			const existing = await findOne("paystackPlan", [{
+				field: "paystackId",
+				value: paystackId
+			}]);
+			if (existing?.id !== void 0) {
+				const { createdAt: _createdAt, ...update } = data;
+				await adapter.update({
+					model: "paystackPlan",
+					update,
+					where: [{
+						field: "id",
+						value: existing.id
+					}]
+				});
+				return;
+			}
+			await adapter.create({
+				model: "paystackPlan",
+				data
+			});
+		},
+		findUser: (id) => findOne("user", [{
+			field: "id",
+			value: id
+		}]),
+		findOrganization: (id) => findOne("organization", [{
+			field: "id",
+			value: id
+		}]),
+		findOrganizationOwner: (organizationId) => findOne("member", [{
+			field: "organizationId",
+			value: organizationId
+		}, {
+			field: "role",
+			value: "owner"
+		}]),
+		listMembers: (organizationId) => findMany("member", [{
+			field: "organizationId",
+			value: organizationId
+		}]),
+		listTeams: (organizationId) => findMany("team", [{
+			field: "organizationId",
+			value: organizationId
+		}]),
+		async saveCustomerCode(referenceId, customerCode, isOrganization) {
+			await adapter.update({
+				model: isOrganization ? "organization" : "user",
+				update: { paystackCustomerCode: customerCode },
+				where: [{
+					field: "id",
+					value: referenceId
+				}]
+			});
+		}
+	};
+}
+//#endregion
 //#region src/paystack-sdk.ts
 /**
 * Interface for checking if a result is a PaystackResponse from the SDK v1.9.1+
@@ -20,6 +220,10 @@ function unwrapSdkResult(result) {
 	if (IsPaystackResponse(result)) try {
 		return result.unwrap();
 	} catch (e) {
+		if (e instanceof PaystackError) throw new APIError("BAD_REQUEST", {
+			message: e.message,
+			status: e.status
+		});
 		throw new APIError("BAD_REQUEST", { message: e?.message ?? "Paystack API error" });
 	}
 	let current = result;
@@ -42,6 +246,50 @@ function unwrapSdkResult(result) {
 function getPaystackOps(client) {
 	return client;
 }
+function createPaystackAdapter(client) {
+	const requireClient = () => {
+		if (client === void 0 || client === null) throw new APIError("BAD_REQUEST", { message: "Paystack client is not configured" });
+		return client;
+	};
+	return {
+		async initializeTransaction(body) {
+			return unwrapSdkResult(await requireClient().transaction?.initialize({ body }));
+		},
+		async verifyTransaction(reference) {
+			return unwrapSdkResult(await requireClient().transaction?.verify(reference));
+		},
+		async chargeAuthorization(body) {
+			return unwrapSdkResult(await requireClient().transaction?.chargeAuthorization({ body }));
+		},
+		async createCustomer(body) {
+			return unwrapSdkResult(await requireClient().customer?.create({ body }));
+		},
+		async listProducts() {
+			return unwrapSdkResult(await requireClient().product?.list({}));
+		},
+		async fetchProduct(productId) {
+			return unwrapSdkResult(await requireClient().product?.fetch(productId));
+		},
+		async listPlans() {
+			return unwrapSdkResult(await requireClient().plan?.list());
+		},
+		async createSubscription(body) {
+			return unwrapSdkResult(await requireClient().subscription?.create({ body }));
+		},
+		async fetchSubscription(subscriptionCode) {
+			return unwrapSdkResult(await requireClient().subscription?.fetch(subscriptionCode));
+		},
+		async disableSubscription(body) {
+			return unwrapSdkResult(await requireClient().subscription?.disable({ body }));
+		},
+		async enableSubscription(body) {
+			return unwrapSdkResult(await requireClient().subscription?.enable({ body }));
+		},
+		async manageSubscriptionLink(subscriptionCode) {
+			return unwrapSdkResult(await requireClient().subscription?.manageLink(subscriptionCode));
+		}
+	};
+}
 //#endregion
 //#region src/utils.ts
 function getPlanSeatAmount(plan) {
@@ -129,97 +377,46 @@ function validateMinAmount(amount, currency) {
 	return min !== void 0 ? amount >= min : true;
 }
 async function syncProductQuantityFromPaystack(ctx, productName, paystackClient) {
-	let localProduct = await ctx.context.adapter.findOne({
-		model: "paystackProduct",
-		where: [{
-			field: "name",
-			value: productName
-		}]
-	});
-	localProduct ??= await ctx.context.adapter.findOne({
-		model: "paystackProduct",
-		where: [{
-			field: "slug",
-			value: productName.toLowerCase().replace(/\s+/g, "-")
-		}]
-	});
+	const store = createBillingStore(ctx);
+	let localProduct = await store.findProductByName(productName);
+	localProduct ??= await store.findProductBySlug(productName.toLowerCase().replace(/\s+/g, "-"));
 	if (localProduct?.paystackId === void 0 || localProduct.paystackId === null || localProduct.paystackId === "") {
-		if (localProduct?.id !== void 0 && localProduct.unlimited !== true && typeof localProduct.quantity === "number" && localProduct.quantity > 0) await ctx.context.adapter.update({
-			model: "paystackProduct",
-			update: {
-				quantity: localProduct.quantity - 1,
-				updatedAt: /* @__PURE__ */ new Date()
-			},
-			where: [{
-				field: "id",
-				value: localProduct.id
-			}]
+		if (localProduct?.id !== void 0 && localProduct.unlimited !== true && typeof localProduct.quantity === "number" && localProduct.quantity > 0) await store.updateProduct(localProduct.id, {
+			quantity: localProduct.quantity - 1,
+			updatedAt: /* @__PURE__ */ new Date()
 		});
 		return;
 	}
 	try {
 		const paystackProductId = Number(localProduct.paystackId);
 		if (!Number.isFinite(paystackProductId)) return;
-		const remoteQuantity = unwrapSdkResult(await paystackClient.product?.fetch(paystackProductId))?.quantity;
-		if (remoteQuantity !== void 0 && localProduct.id !== void 0) await ctx.context.adapter.update({
-			model: "paystackProduct",
-			update: {
-				quantity: remoteQuantity,
-				updatedAt: /* @__PURE__ */ new Date()
-			},
-			where: [{
-				field: "id",
-				value: localProduct.id
-			}]
+		const remoteQuantity = (await createPaystackAdapter(paystackClient).fetchProduct(paystackProductId))?.quantity;
+		if (remoteQuantity !== void 0 && localProduct.id !== void 0) await store.updateProduct(localProduct.id, {
+			quantity: remoteQuantity,
+			updatedAt: /* @__PURE__ */ new Date()
 		});
 	} catch {
-		if (localProduct?.id !== void 0 && localProduct.unlimited !== true && typeof localProduct.quantity === "number" && localProduct.quantity > 0) await ctx.context.adapter.update({
-			model: "paystackProduct",
-			update: {
-				quantity: localProduct.quantity - 1,
-				updatedAt: /* @__PURE__ */ new Date()
-			},
-			where: [{
-				field: "id",
-				value: localProduct.id
-			}]
+		if (localProduct?.id !== void 0 && localProduct.unlimited !== true && typeof localProduct.quantity === "number" && localProduct.quantity > 0) await store.updateProduct(localProduct.id, {
+			quantity: localProduct.quantity - 1,
+			updatedAt: /* @__PURE__ */ new Date()
 		});
 	}
 }
 async function syncSubscriptionSeats(ctx, organizationId, options) {
 	if (options.subscription?.enabled !== true) return;
-	const adapter = ctx.context.adapter;
-	const subscription = await adapter.findOne({
-		model: "subscription",
-		where: [{
-			field: "referenceId",
-			value: organizationId
-		}]
-	});
+	const store = createBillingStore(ctx);
+	const subscription = await store.findCurrentSubscription(organizationId);
 	if (subscription?.paystackSubscriptionCode === void 0 || subscription.paystackSubscriptionCode === null || subscription.paystackSubscriptionCode === "") return;
 	if (subscription === null || subscription === void 0) return;
 	const plan = await getPlanByName(options, subscription.plan);
 	if (plan === null || plan === void 0) return;
 	if (getPlanSeatAmount(plan) === void 0) return;
-	const quantity = (await adapter.findMany({
-		model: "member",
-		where: [{
-			field: "organizationId",
-			value: organizationId
-		}]
-	})).length;
+	const quantity = (await store.listMembers(organizationId)).length;
 	try {
 		assertLocallyManagedSubscription(subscription, "automatic seat sync");
-		await adapter.update({
-			model: "subscription",
-			where: [{
-				field: "id",
-				value: subscription.id
-			}],
-			update: {
-				seats: quantity,
-				updatedAt: /* @__PURE__ */ new Date()
-			}
+		await store.updateSubscription(subscription.id, {
+			seats: quantity,
+			updatedAt: /* @__PURE__ */ new Date()
 		});
 	} catch (e) {
 		const log = ctx.context.logger;
@@ -227,35 +424,28 @@ async function syncSubscriptionSeats(ctx, organizationId, options) {
 	}
 }
 //#endregion
-//#region src/middleware.ts
+//#region src/reference-access.ts
 const BILLING_ORG_ROLES = new Set(["owner", "admin"]);
 function hasBillingRole(role) {
 	if (Array.isArray(role)) return role.some((value) => hasBillingRole(value));
 	if (typeof role !== "string") return false;
 	return role.split(",").map((value) => value.trim()).some((value) => BILLING_ORG_ROLES.has(value));
 }
-const referenceMiddleware = (options, action) => createAuthMiddleware(async (ctx) => {
-	const session = ctx.context.session;
-	if (session === null || session === void 0) throw new APIError("UNAUTHORIZED");
-	const body = ctx.body ?? {};
-	const query = ctx.query ?? {};
-	const requestQueryReferenceId = typeof ctx.request?.url === "string" ? new URL(ctx.request.url).searchParams.get("referenceId") ?? void 0 : void 0;
-	const referenceId = body.referenceId ?? query.referenceId ?? requestQueryReferenceId ?? session.user.id;
-	const subscriptionOptions = options.subscription;
-	if (referenceId === session.user.id) return { context: {
-		...ctx.context,
-		referenceId
-	} };
-	if (subscriptionOptions?.enabled === true && "authorizeReference" in subscriptionOptions && typeof subscriptionOptions.authorizeReference === "function") {
-		if (await subscriptionOptions.authorizeReference({
-			user: session.user,
-			session: session.session,
-			referenceId,
-			action
-		}, ctx) === true) return { context: {
-			...ctx.context,
-			referenceId
-		} };
+function resolveBillingReferenceId(input) {
+	const body = input.body ?? {};
+	const query = input.query ?? {};
+	const requestQueryReferenceId = typeof input.requestUrl === "string" ? new URL(input.requestUrl).searchParams.get("referenceId") ?? void 0 : void 0;
+	return body.referenceId ?? query.referenceId ?? requestQueryReferenceId ?? input.fallbackUserId;
+}
+async function authorizeBillingReference(ctx, options, data) {
+	if (data.referenceId === data.user.id) return;
+	if (options.subscription?.enabled === true && typeof options.subscription.authorizeReference === "function") {
+		if (await options.subscription.authorizeReference({
+			user: data.user,
+			session: data.session,
+			referenceId: data.referenceId,
+			action: data.action
+		}, ctx) === true) return;
 		throw new APIError("UNAUTHORIZED");
 	}
 	if (options.organization?.enabled === true) {
@@ -263,56 +453,170 @@ const referenceMiddleware = (options, action) => createAuthMiddleware(async (ctx
 			model: "member",
 			where: [{
 				field: "userId",
-				value: session.user.id
+				value: data.user.id
 			}, {
 				field: "organizationId",
-				value: referenceId
+				value: data.referenceId
 			}]
 		});
-		if (member !== null && member !== void 0 && hasBillingRole(member.role)) return { context: {
-			...ctx.context,
-			referenceId
-		} };
+		if (member !== null && member !== void 0 && hasBillingRole(member.role)) return;
 	}
-	logger.error(`Passing referenceId into a subscription action isn't allowed unless subscription.authorizeReference allows it or the session user is an organization owner/admin.`);
-	throw new APIError("BAD_REQUEST", { message: "Passing referenceId isn't allowed without subscription.authorizeReference or organization owner/admin membership." });
+	throw new APIError("UNAUTHORIZED");
+}
+//#endregion
+//#region src/middleware.ts
+const referenceMiddleware = (options, action) => createAuthMiddleware(async (ctx) => {
+	const session = ctx.context.session;
+	if (session === null || session === void 0) throw new APIError("UNAUTHORIZED");
+	const referenceId = resolveBillingReferenceId({
+		body: ctx.body,
+		query: ctx.query,
+		requestUrl: ctx.request?.url,
+		fallbackUserId: session.user.id
+	});
+	await authorizeBillingReference(ctx, options, {
+		user: session.user,
+		session: session.session,
+		referenceId,
+		action
+	});
+	return { context: {
+		...ctx.context,
+		referenceId
+	} };
 });
 //#endregion
 //#region src/limits.ts
 const getOrganizationSubscription = async (ctx, organizationId) => {
-	return await ctx.context.adapter.findOne({
-		model: "subscription",
-		where: [{
-			field: "referenceId",
-			value: organizationId
-		}]
-	});
+	return createBillingStore(ctx).findCurrentSubscription(organizationId);
 };
 const checkSeatLimit = async (ctx, organizationId, seatsToAdd = 1) => {
 	const subscription = await getOrganizationSubscription(ctx, organizationId);
 	if (subscription?.seats === null) return true;
-	const members = await ctx.context.adapter.findMany({
-		model: "member",
-		where: [{
-			field: "organizationId",
-			value: organizationId
-		}]
-	});
+	const members = await createBillingStore(ctx).listMembers(organizationId);
 	if (!subscription) return true;
 	if (members.length + seatsToAdd > subscription.seats) throw new APIError("FORBIDDEN", { message: `Organization member limit reached. Used: ${members.length}, Max: ${subscription.seats}` });
 	return true;
 };
 const checkTeamLimit = async (ctx, organizationId, maxTeams) => {
-	if ((await ctx.context.adapter.findMany({
-		model: "team",
-		where: [{
-			field: "organizationId",
-			value: organizationId
-		}]
-	})).length >= maxTeams) throw new APIError("FORBIDDEN", { message: `Organization team limit reached. Max teams: ${maxTeams}` });
+	if ((await createBillingStore(ctx).listTeams(organizationId)).length >= maxTeams) throw new APIError("FORBIDDEN", { message: `Organization team limit reached. Max teams: ${maxTeams}` });
 	return true;
 };
 //#endregion
+//#region src/subscription-lifecycle.ts
+async function handleProratedUpgrade(ctx, options, input) {
+	const store = createBillingStore(ctx);
+	const existingSub = await store.findCurrentSubscription(input.referenceId);
+	if (existingSub?.status !== "active" || existingSub.paystackSubscriptionCode === void 0 || existingSub.paystackSubscriptionCode === null || existingSub.paystackSubscriptionCode === "" || existingSub.periodEnd === void 0 || existingSub.periodEnd === null || existingSub.periodStart === void 0 || existingSub.periodStart === null) return null;
+	const now = /* @__PURE__ */ new Date();
+	const periodEnd = new Date(existingSub.periodEnd);
+	const periodStart = new Date(existingSub.periodStart);
+	const totalDays = Math.max(1, Math.ceil((periodEnd.getTime() - periodStart.getTime()) / (1e3 * 60 * 60 * 24)));
+	const remainingDays = Math.max(0, Math.ceil((periodEnd.getTime() - now.getTime()) / (1e3 * 60 * 60 * 24)));
+	let oldAmount = 0;
+	if (existingSub.plan !== "") {
+		const oldPlan = await getPlanByName(options, existingSub.plan) ?? await store.findPlanByName(existingSub.plan);
+		if (oldPlan !== void 0 && oldPlan !== null) oldAmount = calculatePlanAmount(oldPlan, existingSub.seats);
+	}
+	let membersCount = 1;
+	let newSeatCount;
+	let newAmount;
+	try {
+		assertLocallyManagedSubscription(existingSub, "plan or seat changes");
+		if (getPlanSeatAmount(input.plan) !== void 0) {
+			const members = await store.listMembers(input.referenceId);
+			membersCount = members.length > 0 ? members.length : 1;
+		}
+		newSeatCount = input.quantity ?? existingSub.seats ?? membersCount;
+		newAmount = calculatePlanAmount(input.plan, newSeatCount);
+	} catch (error) {
+		throw new APIError("BAD_REQUEST", { message: error instanceof Error ? error.message : "Invalid seat configuration for plan." });
+	}
+	const costDifference = newAmount - oldAmount;
+	const prorationMetadata = {
+		type: "proration",
+		subscriptionId: existingSub.id,
+		referenceId: input.referenceId,
+		newPlan: input.plan.name.toLowerCase(),
+		oldPlan: existingSub.plan,
+		newSeatCount,
+		remainingDays
+	};
+	let completedProrationReference;
+	if (costDifference > 0 && remainingDays > 0) {
+		const proratedAmount = Math.round(costDifference / totalDays * remainingDays);
+		if (proratedAmount < 5e3) throw new APIError("BAD_REQUEST", {
+			message: "Prorated upgrade amount is below Paystack's minimum charge. Schedule the change for period end instead.",
+			status: 400
+		});
+		const paystack = createPaystackAdapter(options.paystackClient);
+		if (existingSub.paystackAuthorizationCode !== void 0 && existingSub.paystackAuthorizationCode !== null && existingSub.paystackAuthorizationCode !== "") {
+			const sdkRes = await paystack.chargeAuthorization({
+				email: input.targetEmail,
+				amount: proratedAmount,
+				authorization_code: existingSub.paystackAuthorizationCode,
+				reference: `upg_${existingSub.id}_${Date.now()}_${Math.random().toString(36).substring(7)}`,
+				metadata: JSON.stringify(prorationMetadata)
+			});
+			if (sdkRes?.status !== "success") throw new APIError("BAD_REQUEST", { message: "Failed to process prorated charge via saved authorization." });
+			await store.createTransaction({
+				reference: sdkRes.reference ?? "",
+				paystackId: sdkRes.id !== void 0 && sdkRes.id !== null ? String(sdkRes.id) : void 0,
+				referenceId: input.referenceId,
+				userId: input.userId,
+				amount: sdkRes.amount ?? proratedAmount,
+				currency: sdkRes.currency ?? input.finalCurrency,
+				status: "success",
+				plan: input.plan.name.toLowerCase(),
+				metadata: JSON.stringify(prorationMetadata),
+				createdAt: /* @__PURE__ */ new Date(),
+				updatedAt: /* @__PURE__ */ new Date()
+			});
+			completedProrationReference = sdkRes.reference ?? void 0;
+		} else {
+			const initRes = await paystack.initializeTransaction({
+				email: input.targetEmail,
+				amount: proratedAmount,
+				currency: input.finalCurrency,
+				callback_url: input.callbackURL ?? void 0,
+				metadata: JSON.stringify(prorationMetadata),
+				...input.allowedSubscriptionChannels !== void 0 ? { channels: input.allowedSubscriptionChannels } : {}
+			});
+			await store.createTransaction({
+				reference: initRes?.reference ?? "",
+				referenceId: input.referenceId,
+				userId: input.userId,
+				amount: proratedAmount,
+				currency: input.finalCurrency,
+				status: "pending",
+				plan: input.plan.name.toLowerCase(),
+				metadata: JSON.stringify(prorationMetadata),
+				createdAt: /* @__PURE__ */ new Date(),
+				updatedAt: /* @__PURE__ */ new Date()
+			});
+			return {
+				kind: "checkout",
+				url: initRes?.authorization_url,
+				reference: initRes?.reference,
+				accessCode: initRes?.access_code,
+				redirect: true
+			};
+		}
+	}
+	await store.updateSubscription(existingSub.id, {
+		plan: input.plan.name,
+		seats: newSeatCount,
+		...completedProrationReference !== void 0 ? { paystackTransactionReference: completedProrationReference } : {},
+		updatedAt: /* @__PURE__ */ new Date()
+	});
+	return {
+		kind: "completed",
+		status: "success",
+		message: "Subscription successfully upgraded with prorated charge.",
+		prorated: true
+	};
+}
+//#endregion
 //#region src/routes.ts
 const PAYSTACK_ERROR_CODES = defineErrorCodes({
 	SUBSCRIPTION_NOT_FOUND: "Subscription not found",
@@ -333,32 +637,6 @@ function isAllowedSubscriptionChannel(channel, allowedChannels) {
 	if (allowedChannels === void 0) return true;
 	return channel !== void 0 && channel !== null && allowedChannels.includes(channel);
 }
-async function assertReferenceAccess(ctx, options, data) {
-	if (data.referenceId === data.user.id) return;
-	if (options.subscription?.enabled === true && typeof options.subscription.authorizeReference === "function") {
-		if (await options.subscription.authorizeReference({
-			user: data.user,
-			session: data.session,
-			referenceId: data.referenceId,
-			action: data.action
-		}, ctx) === true) return;
-		throw new APIError("UNAUTHORIZED");
-	}
-	if (options.organization?.enabled === true) {
-		const member = await ctx.context.adapter.findOne({
-			model: "member",
-			where: [{
-				field: "userId",
-				value: data.user.id
-			}, {
-				field: "organizationId",
-				value: data.referenceId
-			}]
-		});
-		if (member !== null && member !== void 0 && hasBillingRole(member.role)) return;
-	}
-	throw new APIError("UNAUTHORIZED");
-}
 async function hmacSha512Hex(secret, message) {
 	const encoder = new TextEncoder();
 	const keyData = encoder.encode(secret);
@@ -854,148 +1132,27 @@ const initializeTransaction = (options, path = "/initialize-transaction") => {
 			};
 			if (allowedSubscriptionChannels !== void 0) initBody.channels = allowedSubscriptionChannels;
 			if (plan !== void 0 && prorateAndCharge === true) {
-				const existingSub = await getOrganizationSubscription(ctx, referenceId);
-				if (existingSub?.status === "active" && existingSub.paystackSubscriptionCode !== void 0 && existingSub.paystackSubscriptionCode !== null && existingSub.paystackSubscriptionCode !== "") {
-					if (existingSub.periodEnd !== void 0 && existingSub.periodEnd !== null && existingSub.periodStart !== void 0 && existingSub.periodStart !== null) {
-						const now = /* @__PURE__ */ new Date();
-						const periodEndLocal = new Date(existingSub.periodEnd);
-						const periodStartLocal = new Date(existingSub.periodStart);
-						const totalDays = Math.max(1, Math.ceil((periodEndLocal.getTime() - periodStartLocal.getTime()) / (1e3 * 60 * 60 * 24)));
-						const remainingDays = Math.max(0, Math.ceil((periodEndLocal.getTime() - now.getTime()) / (1e3 * 60 * 60 * 24)));
-						let oldAmount = 0;
-						if (existingSub.plan !== "") {
-							const oldPlan = await getPlanByName(options, existingSub.plan) ?? await ctx.context.adapter.findOne({
-								model: "paystackPlan",
-								where: [{
-									field: "name",
-									value: existingSub.plan
-								}]
-							}) ?? void 0;
-							if (oldPlan !== void 0 && oldPlan !== null) {
-								const oldSeatCount = existingSub.seats;
-								oldAmount = calculatePlanAmount(oldPlan, oldSeatCount);
-							}
-						}
-						let membersCount = 1;
-						let newSeatCount = quantity ?? existingSub.seats ?? membersCount;
-						let newAmount;
-						try {
-							assertLocallyManagedSubscription(existingSub, "plan or seat changes");
-							if (getPlanSeatAmount(plan) !== void 0) {
-								const members = await ctx.context.adapter.findMany({
-									model: "member",
-									where: [{
-										field: "organizationId",
-										value: referenceId
-									}]
-								});
-								membersCount = members.length > 0 ? members.length : 1;
-							}
-							newSeatCount = quantity ?? existingSub.seats ?? membersCount;
-							newAmount = calculatePlanAmount(plan, newSeatCount);
-						} catch (error) {
-							throw new APIError("BAD_REQUEST", { message: error instanceof Error ? error.message : "Invalid seat configuration for plan." });
-						}
-						const costDifference = newAmount - oldAmount;
-						const prorationMetadata = {
-							type: "proration",
-							subscriptionId: existingSub.id,
-							referenceId,
-							newPlan: plan.name.toLowerCase(),
-							oldPlan: existingSub.plan,
-							newSeatCount,
-							remainingDays
-						};
-						let completedProrationReference;
-						if (costDifference > 0 && remainingDays > 0) {
-							const proratedAmount = Math.round(costDifference / totalDays * remainingDays);
-							if (proratedAmount < 5e3) throw new APIError("BAD_REQUEST", {
-								message: "Prorated upgrade amount is below Paystack's minimum charge. Schedule the change for period end instead.",
-								status: 400
-							});
-							const ops = getPaystackOps(options.paystackClient);
-							if (ops === void 0 || ops === null) {
-								ctx.context.logger.error("Paystack client not configured for proration charge");
-								return;
-							}
-							if (existingSub.paystackAuthorizationCode !== void 0 && existingSub.paystackAuthorizationCode !== null && existingSub.paystackAuthorizationCode !== "") {
-								const sdkRes = unwrapSdkResult(await ops.transaction?.chargeAuthorization({ body: {
-									email: targetEmail,
-									amount: proratedAmount,
-									authorization_code: existingSub.paystackAuthorizationCode,
-									reference: `upg_${existingSub.id}_${Date.now()}_${Math.random().toString(36).substring(7)}`,
-									metadata: JSON.stringify(prorationMetadata)
-								} }));
-								if (sdkRes?.status !== "success") throw new APIError("BAD_REQUEST", { message: "Failed to process prorated charge via saved authorization." });
-								await ctx.context.adapter.create({
-									model: "paystackTransaction",
-									data: {
-										reference: sdkRes.reference ?? "",
-										paystackId: sdkRes.id !== void 0 && sdkRes.id !== null ? String(sdkRes.id) : void 0,
-										referenceId,
-										userId: user.id,
-										amount: sdkRes.amount ?? proratedAmount,
-										currency: sdkRes.currency ?? finalCurrency,
-										status: "success",
-										plan: plan.name.toLowerCase(),
-										metadata: JSON.stringify(prorationMetadata),
-										createdAt: /* @__PURE__ */ new Date(),
-										updatedAt: /* @__PURE__ */ new Date()
-									}
-								});
-								completedProrationReference = sdkRes.reference ?? void 0;
-							} else {
-								const initRes = unwrapSdkResult(await ops.transaction?.initialize({ body: {
-									email: targetEmail,
-									amount: proratedAmount,
-									currency: finalCurrency,
-									callback_url: callbackURL ?? void 0,
-									metadata: JSON.stringify(prorationMetadata),
-									...allowedSubscriptionChannels !== void 0 ? { channels: allowedSubscriptionChannels } : {}
-								} }));
-								await ctx.context.adapter.create({
-									model: "paystackTransaction",
-									data: {
-										reference: initRes?.reference ?? "",
-										referenceId,
-										userId: user.id,
-										amount: proratedAmount,
-										currency: finalCurrency,
-										status: "pending",
-										plan: plan.name.toLowerCase(),
-										metadata: JSON.stringify(prorationMetadata),
-										createdAt: /* @__PURE__ */ new Date(),
-										updatedAt: /* @__PURE__ */ new Date()
-									}
-								});
-								return ctx.json({
-									url: initRes?.authorization_url,
-									reference: initRes?.reference,
-									accessCode: initRes?.access_code,
-									redirect: true
-								});
-							}
-						}
-						await ctx.context.adapter.update({
-							model: "subscription",
-							where: [{
-								field: "id",
-								value: existingSub.id
-							}],
-							update: {
-								plan: plan.name,
-								seats: newSeatCount,
-								...completedProrationReference !== void 0 ? { paystackTransactionReference: completedProrationReference } : {},
-								updatedAt: /* @__PURE__ */ new Date()
-							}
-						});
-						return ctx.json({
-							status: "success",
-							message: "Subscription successfully upgraded with prorated charge.",
-							prorated: true
-						});
-					}
-				}
+				const proration = await handleProratedUpgrade(ctx, options, {
+					plan,
+					referenceId,
+					quantity,
+					targetEmail,
+					userId: user.id,
+					finalCurrency,
+					callbackURL,
+					allowedSubscriptionChannels
+				});
+				if (proration?.kind === "checkout") return ctx.json({
+					url: proration.url ?? "",
+					reference: proration.reference ?? "",
+					accessCode: proration.accessCode ?? "",
+					redirect: proration.redirect
+				});
+				if (proration?.kind === "completed") return ctx.json({
+					status: proration.status,
+					message: proration.message,
+					prorated: proration.prorated
+				});
 			}
 			if (plan !== void 0) if (trialStart !== void 0) initBody.amount = 5e3;
 			else {
@@ -1150,30 +1307,12 @@ const verifyTransaction = (options, path = "/verify-transaction") => {
 					message: `This subscription requires one of: ${allowedSubscriptionChannels?.join(", ") ?? "allowed channels"}.`
 				});
 			}
-			if (session !== void 0 && session !== null && referenceId !== void 0 && referenceId !== null && referenceId !== "" && referenceId !== session.user.id) {
-				const authRef = subscriptionOptions?.authorizeReference;
-				let authorized = false;
-				if (authRef !== void 0 && authRef !== null) authorized = await authRef({
-					user: session.user,
-					session: session.session,
-					referenceId,
-					action: "verify-transaction"
-				}, ctx);
-				if (authorized === false && options.organization?.enabled === true) {
-					const member = await ctx.context.adapter.findOne({
-						model: "member",
-						where: [{
-							field: "userId",
-							value: session.user.id
-						}, {
-							field: "organizationId",
-							value: referenceId
-						}]
-					});
-					if (member !== void 0 && member !== null) authorized = true;
-				}
-				if (authorized === false) throw new APIError("UNAUTHORIZED");
-			}
+			if (session !== void 0 && session !== null && referenceId !== void 0 && referenceId !== null && referenceId !== "" && referenceId !== session.user.id) await authorizeBillingReference(ctx, options, {
+				user: session.user,
+				session: session.session,
+				referenceId,
+				action: "verify-transaction"
+			});
 			try {
 				await ctx.context.adapter.update({
 					model: "paystackTransaction",
@@ -1338,23 +1477,18 @@ const listSubscriptions = (options, path = "/list-subscriptions") => {
 		if (subscriptionOptions?.enabled !== true) throw new APIError("BAD_REQUEST", { message: "Subscriptions are not enabled in the Paystack options." });
 		const session = await getSessionFromCtx(ctx);
 		if (session === void 0 || session === null) throw new APIError("UNAUTHORIZED");
+		const store = createBillingStore(ctx);
 		const referenceIdPart = ctx.context.referenceId;
 		const queryRefId = ctx.query?.referenceId ?? (typeof ctx.request?.url === "string" ? new URL(ctx.request.url).searchParams.get("referenceId") ?? void 0 : void 0);
 		const userId = session.user.id;
-		if (queryRefId !== void 0 && queryRefId !== userId && referenceIdPart !== queryRefId) await assertReferenceAccess(ctx, options, {
+		if (queryRefId !== void 0 && queryRefId !== userId && referenceIdPart !== queryRefId) await authorizeBillingReference(ctx, options, {
 			user: session.user,
 			session: session.session,
 			referenceId: queryRefId,
 			action: "list-subscriptions"
 		});
 		const referenceId = queryRefId ?? referenceIdPart ?? userId;
-		const res = await ctx.context.adapter.findMany({
-			model: "subscription",
-			where: [{
-				field: "referenceId",
-				value: referenceId
-			}]
-		});
+		const res = await store.findSubscriptionsByReference(referenceId);
 		return ctx.json({ subscriptions: res });
 	});
 };
@@ -1370,24 +1504,19 @@ const listTransactions = (options, path = "/list-transactions") => {
 	}, async (ctx) => {
 		const session = await getSessionFromCtx(ctx);
 		if (session === void 0 || session === null) throw new APIError("UNAUTHORIZED");
+		const store = createBillingStore(ctx);
 		const referenceIdPart = ctx.context.referenceId;
 		const queryRefId = ctx.query?.referenceId ?? (typeof ctx.request?.url === "string" ? new URL(ctx.request.url).searchParams.get("referenceId") ?? void 0 : void 0);
 		const userId = session.user.id;
-		if (queryRefId !== void 0 && queryRefId !== userId && referenceIdPart !== queryRefId) await assertReferenceAccess(ctx, options, {
+		if (queryRefId !== void 0 && queryRefId !== userId && referenceIdPart !== queryRefId) await authorizeBillingReference(ctx, options, {
 			user: session.user,
 			session: session.session,
 			referenceId: queryRefId,
 			action: "list-transactions"
 		});
 		const referenceId = queryRefId ?? referenceIdPart ?? userId;
-		const sorted = (await ctx.context.adapter.findMany({
-			model: "paystackTransaction",
-			where: [{
-				field: "referenceId",
-				value: referenceId
-			}]
-		})).sort((a, b) => b.createdAt.getTime() - a.createdAt.getTime());
-		return ctx.json({ transactions: sorted });
+		const transactions = await store.listTransactions(referenceId);
+		return ctx.json({ transactions });
 	});
 };
 const enableDisableBodySchema = z.object({
@@ -1586,8 +1715,8 @@ const listProducts = (_options, path = "/list-products") => {
 		method: "GET",
 		metadata: { openapi: { operationId: "listPaystackProducts" } }
 	}, async (ctx) => {
-		const sorted = (await ctx.context.adapter.findMany({ model: "paystackProduct" })).sort((a, b) => a.name.localeCompare(b.name));
-		return ctx.json({ products: sorted });
+		const products = await createBillingStore(ctx).listProducts();
+		return ctx.json({ products });
 	});
 };
 const listPlans = (_options, path = "/list-plans") => {
@@ -1597,7 +1726,7 @@ const listPlans = (_options, path = "/list-plans") => {
 		use: [sessionMiddleware]
 	}, async (ctx) => {
 		try {
-			const plans = await ctx.context.adapter.findMany({ model: "paystackPlan" });
+			const plans = await createBillingStore(ctx).listPlans();
 			return ctx.json({ plans });
 		} catch (error) {
 			ctx.context.logger.error("Failed to list plans", error);
@@ -1890,22 +2019,16 @@ const getSchema = (options) => {
 //#endregion
 //#region src/operations.ts
 async function syncPaystackProducts(ctx, options) {
-	const paystack = getPaystackOps(options.paystackClient);
+	const paystack = createPaystackAdapter(options.paystackClient);
+	const store = createBillingStore(ctx);
 	try {
-		const productsData = unwrapSdkResult(await paystack?.product?.list({}));
+		const productsData = await paystack.listProducts();
 		if (!Array.isArray(productsData)) return {
 			status: "success",
 			count: 0
 		};
 		for (const product of productsData) {
 			const paystackId = String(product.id);
-			const existing = await ctx.context.adapter.findOne({
-				model: "paystackProduct",
-				where: [{
-					field: "paystackId",
-					value: paystackId
-				}]
-			});
 			const productFields = {
 				name: product.name ?? "",
 				description: product.description ?? "",
@@ -1918,20 +2041,9 @@ async function syncPaystackProducts(ctx, options) {
 				metadata: product.metadata !== void 0 && product.metadata !== null ? JSON.stringify(product.metadata) : void 0,
 				updatedAt: /* @__PURE__ */ new Date()
 			};
-			if (existing !== void 0 && existing !== null) await ctx.context.adapter.update({
-				model: "paystackProduct",
-				update: productFields,
-				where: [{
-					field: "id",
-					value: String(existing.id)
-				}]
-			});
-			else await ctx.context.adapter.create({
-				model: "paystackProduct",
-				data: {
-					...productFields,
-					createdAt: /* @__PURE__ */ new Date()
-				}
+			await store.upsertProductByPaystackId(paystackId, {
+				...productFields,
+				createdAt: /* @__PURE__ */ new Date()
 			});
 		}
 		return {
@@ -1944,25 +2056,19 @@ async function syncPaystackProducts(ctx, options) {
 	}
 }
 async function syncPaystackPlans(ctx, options) {
-	const paystack = getPaystackOps(options.paystackClient);
+	const paystack = createPaystackAdapter(options.paystackClient);
+	const store = createBillingStore(ctx);
 	try {
-		const plansData = unwrapSdkResult(await paystack?.plan?.list());
+		const plansData = await paystack.listPlans();
 		if (!Array.isArray(plansData)) return {
 			status: "success",
 			count: 0
 		};
 		for (const plan of plansData) {
 			const paystackId = String(plan.id);
-			const existing = await ctx.context.adapter.findOne({
-				model: "paystackPlan",
-				where: [{
-					field: "paystackId",
-					value: paystackId
-				}]
-			});
 			const planData = {
 				name: plan.name ?? "",
-				description: plan.description ?? "",
+				description: typeof plan.description === "string" ? plan.description : "",
 				amount: plan.amount ?? 0,
 				currency: plan.currency ?? "",
 				interval: plan.interval ?? "",
@@ -1971,20 +2077,9 @@ async function syncPaystackPlans(ctx, options) {
 				metadata: plan.metadata !== void 0 && plan.metadata !== null ? JSON.stringify(plan.metadata) : void 0,
 				updatedAt: /* @__PURE__ */ new Date()
 			};
-			if (existing !== void 0 && existing !== null) await ctx.context.adapter.update({
-				model: "paystackPlan",
-				update: planData,
-				where: [{
-					field: "id",
-					value: existing.id
-				}]
-			});
-			else await ctx.context.adapter.create({
-				model: "paystackPlan",
-				data: {
-					...planData,
-					createdAt: /* @__PURE__ */ new Date()
-				}
+			await store.upsertPlanByPaystackId(paystackId, {
+				...planData,
+				createdAt: /* @__PURE__ */ new Date()
 			});
 		}
 		return {
@@ -1998,13 +2093,8 @@ async function syncPaystackPlans(ctx, options) {
 }
 async function chargeSubscriptionRenewal(ctx, options, input) {
 	const { subscriptionId, amount: bodyAmount } = input;
-	const subscription = await ctx.context.adapter.findOne({
-		model: "subscription",
-		where: [{
-			field: "id",
-			value: subscriptionId
-		}]
-	});
+	const store = createBillingStore(ctx);
+	const subscription = await store.findSubscriptionById(subscriptionId);
 	if (subscription === void 0 || subscription === null) throw new APIError("NOT_FOUND", { message: "Subscription not found" });
 	if (subscription.paystackAuthorizationCode === void 0 || subscription.paystackAuthorizationCode === null || subscription.paystackAuthorizationCode === "") throw new APIError("BAD_REQUEST", { message: "No authorization code found for this subscription" });
 	const plan = (await getPlans(options.subscription)).find((candidate) => candidate.name.toLowerCase() === subscription.plan.toLowerCase());
@@ -2015,35 +2105,14 @@ async function chargeSubscriptionRenewal(ctx, options, input) {
 	let billingUserId = subscription.userId;
 	const referenceId = subscription.referenceId;
 	if (referenceId !== void 0 && referenceId !== null && referenceId !== "") {
-		const user = await ctx.context.adapter.findOne({
-			model: "user",
-			where: [{
-				field: "id",
-				value: referenceId
-			}]
-		});
+		const user = await store.findUser(referenceId);
 		if (user !== void 0 && user !== null) {
 			email = user.email;
 			billingUserId = user.id;
 		} else if (options.organization?.enabled === true) {
-			const ownerMember = await ctx.context.adapter.findOne({
-				model: "member",
-				where: [{
-					field: "organizationId",
-					value: referenceId
-				}, {
-					field: "role",
-					value: "owner"
-				}]
-			});
+			const ownerMember = await store.findOrganizationOwner(referenceId);
 			if (ownerMember !== void 0 && ownerMember !== null) {
-				const ownerUser = await ctx.context.adapter.findOne({
-					model: "user",
-					where: [{
-						field: "id",
-						value: ownerMember.userId
-					}]
-				});
+				const ownerUser = await store.findUser(ownerMember.userId);
 				email = ownerUser?.email;
 				billingUserId = ownerUser?.id ?? ownerMember.userId;
 			}
@@ -2055,7 +2124,7 @@ async function chargeSubscriptionRenewal(ctx, options, input) {
 		message: `Amount ${amount} is less than the minimum required for ${finalCurrency}.`,
 		status: 400
 	});
-	const chargeData = unwrapSdkResult(await getPaystackOps(options.paystackClient)?.transaction?.chargeAuthorization({ body: {
+	const typedChargeData = await createPaystackAdapter(options.paystackClient).chargeAuthorization({
 		email,
 		amount,
 		authorization_code: subscription.paystackAuthorizationCode,
@@ -2064,51 +2133,41 @@ async function chargeSubscriptionRenewal(ctx, options, input) {
 			subscriptionId,
 			referenceId
 		})
-	} }));
-	if (chargeData?.status === "success" && chargeData.reference !== void 0) {
+	});
+	if (typedChargeData?.status === "success" && typedChargeData.reference !== void 0) {
 		const now = /* @__PURE__ */ new Date();
 		const nextPeriodEnd = getNextPeriodEnd(now, plan.interval ?? "monthly");
-		await ctx.context.adapter.create({
-			model: "paystackTransaction",
-			data: {
-				reference: chargeData.reference,
-				paystackId: chargeData.id !== void 0 && chargeData.id !== null ? String(chargeData.id) : void 0,
-				referenceId,
-				userId: billingUserId,
-				amount: chargeData.amount,
-				currency: chargeData.currency,
-				status: "success",
-				plan: plan.name.toLowerCase(),
-				metadata: JSON.stringify({
-					type: "renewal",
-					subscriptionId,
-					referenceId
-				}),
-				createdAt: now,
-				updatedAt: now
-			}
+		await store.createTransaction({
+			reference: typedChargeData.reference,
+			paystackId: typedChargeData.id !== void 0 && typedChargeData.id !== null ? String(typedChargeData.id) : void 0,
+			referenceId,
+			userId: billingUserId,
+			amount: typedChargeData.amount,
+			currency: typedChargeData.currency,
+			status: "success",
+			plan: plan.name.toLowerCase(),
+			metadata: JSON.stringify({
+				type: "renewal",
+				subscriptionId,
+				referenceId
+			}),
+			createdAt: now,
+			updatedAt: now
 		});
-		await ctx.context.adapter.update({
-			model: "subscription",
-			update: {
-				periodStart: now,
-				periodEnd: nextPeriodEnd,
-				updatedAt: now,
-				paystackTransactionReference: chargeData.reference
-			},
-			where: [{
-				field: "id",
-				value: subscription.id
-			}]
+		await store.updateSubscription(subscription.id, {
+			periodStart: now,
+			periodEnd: nextPeriodEnd,
+			updatedAt: now,
+			paystackTransactionReference: typedChargeData.reference
 		});
 		return {
 			status: "success",
-			data: chargeData
+			data: typedChargeData
 		};
 	}
 	return {
 		status: "failed",
-		data: chargeData
+		data: typedChargeData
 	};
 }
 //#endregion
@@ -2151,23 +2210,14 @@ const createPaystackPlugin = (options) => {
 				user: { create: { async after(user, hookCtx) {
 					if (!hookCtx || options.createCustomerOnSignUp !== true || user.email === null || user.email === void 0 || user.email === "") return;
 					try {
-						const paystackOps = getPaystackOps(options.paystackClient);
-						if (!paystackOps) return;
-						const sdkRes = unwrapSdkResult(await paystackOps.customer?.create({ body: {
+						const sdkRes = await createPaystackAdapter(options.paystackClient).createCustomer({
 							email: user.email,
 							first_name: user.name ?? void 0,
 							metadata: JSON.stringify({ userId: user.id })
-						} }) ?? await Promise.reject(/* @__PURE__ */ new Error("Paystack client missing customer ops")));
+						});
 						const customerCode = sdkRes?.customer_code;
 						if (customerCode !== void 0 && customerCode !== null && customerCode !== "") {
-							await ctx.adapter.update({
-								model: "user",
-								where: [{
-									field: "id",
-									value: user.id
-								}],
-								update: { paystackCustomerCode: customerCode }
-							});
+							await createBillingStoreFromAdapter(ctx.adapter).saveCustomerCode(user.id, customerCode, false);
 							if (typeof options.onCustomerCreate === "function") await options.onCustomerCreate({
 								paystackCustomer: sdkRes,
 								user: {
@@ -2185,23 +2235,9 @@ const createPaystackPlugin = (options) => {
 						const extraCreateParams = typeof options.organization?.getCustomerCreateParams === "function" ? await options.organization.getCustomerCreateParams(org, hookCtx) : {};
 						let targetEmail = org.email;
 						if (targetEmail === void 0 || targetEmail === null) {
-							const ownerMember = await ctx.adapter.findOne({
-								model: "member",
-								where: [{
-									field: "organizationId",
-									value: org.id
-								}, {
-									field: "role",
-									value: "owner"
-								}]
-							});
-							if (ownerMember !== null && ownerMember !== void 0) targetEmail = (await ctx.adapter.findOne({
-								model: "user",
-								where: [{
-									field: "id",
-									value: ownerMember.userId
-								}]
-							}))?.email;
+							const store = createBillingStoreFromAdapter(ctx.adapter);
+							const ownerMember = await store.findOrganizationOwner(org.id);
+							if (ownerMember !== null && ownerMember !== void 0) targetEmail = (await store.findUser(ownerMember.userId))?.email;
 						}
 						if (targetEmail === void 0 || targetEmail === null) return;
 						const params = defu({
@@ -2209,19 +2245,10 @@ const createPaystackPlugin = (options) => {
 							first_name: org.name,
 							metadata: JSON.stringify({ organizationId: org.id })
 						}, extraCreateParams);
-						const paystackOps = getPaystackOps(options.paystackClient);
-						if (!paystackOps) return;
-						const sdkRes = unwrapSdkResult(await paystackOps.customer?.create({ body: params }) ?? await Promise.reject(/* @__PURE__ */ new Error("Paystack client missing customer ops")));
+						const sdkRes = await createPaystackAdapter(options.paystackClient).createCustomer(params);
 						const customerCode = sdkRes?.customer_code;
 						if (customerCode !== void 0 && customerCode !== null && customerCode !== "" && sdkRes !== void 0 && sdkRes !== null) {
-							await ctx.adapter.update({
-								model: "organization",
-								where: [{
-									field: "id",
-									value: org.id
-								}],
-								update: { paystackCustomerCode: customerCode }
-							});
+							await createBillingStoreFromAdapter(ctx.adapter).saveCustomerCode(org.id, customerCode, true);
 							if (typeof options.organization?.onCustomerCreate === "function") await options.organization.onCustomerCreate({
 								paystackCustomer: sdkRes,
 								organization: {