@alexasomba/better-auth-paystack 1.1.2 → 1.2.1

package/dist/index.mjs

@@ -1,11 +1,10 @@
-import { defineErrorCodes } from "@better-auth/core/utils";
+import { defineErrorCodes } from "@better-auth/core/utils/error-codes";
 import { defu } from "defu";
 import { createAuthEndpoint, createAuthMiddleware } from "@better-auth/core/api";
 import { HIDE_METADATA, logger } from "better-auth";
 import { APIError, getSessionFromCtx, originCheck, sessionMiddleware } from "better-auth/api";
 import * as z from "zod/v4";
 import { mergeSchema } from "better-auth/db";
-
 //#region src/paystack-sdk.ts
 function isOpenApiFetchResponse(value) {
 	return value !== null && value !== void 0 && typeof value === "object" && ("data" in value || "error" in value || "response" in value);
@@ -73,6 +72,17 @@ function getPaystackOps(paystackClient) {
 			if (paystackClient?.subscription_manageEmail !== void 0) return paystackClient.subscription_manageEmail({ params: { path: { code } } });
 			return paystackClient?.subscription?.manage?.email?.(code, email);
 		},
+		subscriptionUpdate: (params) => {
+			if (paystackClient?.subscription_update !== void 0) return paystackClient.subscription_update({
+				params: { path: { code: params.code } },
+				body: {
+					plan: params.plan,
+					authorization: params.authorization,
+					amount: params.amount
+				}
+			});
+			return paystackClient?.subscription?.update?.(params.code, params);
+		},
 		transactionChargeAuthorization: (body) => {
 			if (paystackClient?.transaction_chargeAuthorization !== void 0) return paystackClient.transaction_chargeAuthorization({ body });
 			return paystackClient?.transaction?.chargeAuthorization?.(body);
@@ -106,7 +116,6 @@ function getPaystackOps(paystackClient) {
 		}
 	};
 }
-
 //#endregion
 //#region src/utils.ts
 async function getPlans(subscriptionOptions) {
@@ -179,8 +188,8 @@ async function syncProductQuantityFromPaystack(ctx, productName, paystackClient)
 			value: productName.toLowerCase().replace(/\s+/g, "-")
 		}]
 	});
-	if (localProduct?.paystackId === void 0 || localProduct?.paystackId === null || localProduct?.paystackId === "") {
-		if (localProduct && localProduct.unlimited !== true && localProduct.quantity !== void 0 && localProduct.quantity > 0) await ctx.context.adapter.update({
+	if (localProduct?.paystackId === void 0 || localProduct.paystackId === null || localProduct.paystackId === "") {
+		if (localProduct !== null && localProduct.unlimited !== true && typeof localProduct.quantity === "number" && localProduct.quantity > 0) await ctx.context.adapter.update({
 			model: "paystackProduct",
 			update: {
 				quantity: localProduct.quantity - 1,
@@ -207,7 +216,7 @@ async function syncProductQuantityFromPaystack(ctx, productName, paystackClient)
 			}]
 		});
 	} catch {
-		if (localProduct.unlimited !== true && localProduct.quantity !== void 0 && localProduct.quantity > 0) await ctx.context.adapter.update({
+		if (localProduct !== null && localProduct.unlimited !== true && typeof localProduct.quantity === "number" && localProduct.quantity > 0) await ctx.context.adapter.update({
 			model: "paystackProduct",
 			update: {
 				quantity: localProduct.quantity - 1,
@@ -220,7 +229,51 @@ async function syncProductQuantityFromPaystack(ctx, productName, paystackClient)
 		});
 	}
 }
-
+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
+		}]
+	});
+	if (subscription?.paystackSubscriptionCode === void 0 || subscription.paystackSubscriptionCode === null || subscription.paystackSubscriptionCode === "") return;
+	const plan = await getPlanByName(options, subscription.plan);
+	if (plan === null) return;
+	if (plan.seatAmount === void 0 && plan.seatPlanCode === void 0) return;
+	const quantity = (await adapter.findMany({
+		model: "member",
+		where: [{
+			field: "organizationId",
+			value: organizationId
+		}]
+	})).length;
+	let totalAmount = plan.amount ?? 0;
+	if (plan.seatAmount !== void 0 && plan.seatAmount !== null && typeof plan.seatAmount === "number") totalAmount += quantity * plan.seatAmount;
+	const ops = getPaystackOps(options.paystackClient);
+	try {
+		await ops.subscriptionUpdate({
+			code: subscription.paystackSubscriptionCode,
+			amount: totalAmount
+		});
+		await adapter.update({
+			model: "subscription",
+			where: [{
+				field: "id",
+				value: subscription.id
+			}],
+			update: {
+				seats: quantity,
+				updatedAt: /* @__PURE__ */ new Date()
+			}
+		});
+	} catch (e) {
+		const log = ctx.context.logger;
+		if (log !== void 0 && log !== null) log.error("Failed to sync subscription seats with Paystack", e);
+	}
+}
 //#endregion
 //#region src/middleware.ts
 const referenceMiddleware = (options, action) => createAuthMiddleware(async (ctx) => {
@@ -259,7 +312,40 @@ const referenceMiddleware = (options, action) => createAuthMiddleware(async (ctx
 	logger.error(`Passing referenceId into a subscription action isn't allowed if subscription.authorizeReference isn't defined in your paystack plugin config and matches no organization membership.`);
 	throw new APIError("BAD_REQUEST", { message: "Passing referenceId isn't allowed without subscription.authorizeReference or valid organization membership." });
 });
-
+//#endregion
+//#region src/limits.ts
+const getOrganizationSubscription = async (ctx, organizationId) => {
+	return await ctx.context.adapter.findOne({
+		model: "subscription",
+		where: [{
+			field: "referenceId",
+			value: organizationId
+		}]
+	});
+};
+const checkSeatLimit = async (ctx, organizationId, seatsToAdd = 1) => {
+	const subscription = await getOrganizationSubscription(ctx, organizationId);
+	if (subscription?.seats === void 0 || subscription.seats === null) return true;
+	const members = await ctx.context.adapter.findMany({
+		model: "member",
+		where: [{
+			field: "organizationId",
+			value: organizationId
+		}]
+	});
+	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}` });
+	return true;
+};
 //#endregion
 //#region src/routes.ts
 const PAYSTACK_ERROR_CODES = defineErrorCodes({
@@ -300,7 +386,7 @@ const paystackWebhook = (options) => {
 		disableBody: true
 	}, async (ctx) => {
 		const request = ctx.requestClone ?? ctx.request;
-		if (!request) throw new APIError("BAD_REQUEST", { message: "Request object is missing from context" });
+		if (request === void 0 || request === null) throw new APIError("BAD_REQUEST", { message: "Request object is missing from context" });
 		const payload = await request.text();
 		const signature = (ctx.headers ?? ctx.request?.headers)?.get("x-paystack-signature");
 		if (signature === void 0 || signature === null || signature === "") throw new APIError("UNAUTHORIZED", {
@@ -342,7 +428,7 @@ const paystackWebhook = (options) => {
 							value: reference
 						}]
 					});
-					if (transaction?.product) await syncProductQuantityFromPaystack(ctx, transaction.product, options.paystackClient);
+					if (transaction?.product !== void 0 && transaction.product !== null && transaction.product !== "") await syncProductQuantityFromPaystack(ctx, transaction.product, options.paystackClient);
 				} catch (e) {
 					ctx.context.logger.warn("Failed to sync product quantity", e);
 				}
@@ -398,11 +484,10 @@ const paystackWebhook = (options) => {
 						value: planName
 					});
 					if (where.length > 0) {
-						const matches = await ctx.context.adapter.findMany({
+						const subscription = (await ctx.context.adapter.findMany({
 							model: "subscription",
 							where
-						});
-						const subscription = matches !== void 0 && matches !== null ? matches[0] : void 0;
+						}))?.[0];
 						if (subscription !== void 0 && subscription !== null) {
 							await ctx.context.adapter.update({
 								model: "subscription",
@@ -410,7 +495,7 @@ const paystackWebhook = (options) => {
 									paystackSubscriptionCode: subscriptionCode,
 									status: "active",
 									updatedAt: /* @__PURE__ */ new Date(),
-									periodEnd: payloadData?.next_payment_date !== void 0 && payloadData?.next_payment_date !== null && payloadData?.next_payment_date !== "" ? new Date(payloadData.next_payment_date) : void 0
+									periodEnd: payloadData?.next_payment_date !== void 0 && payloadData.next_payment_date !== null && payloadData.next_payment_date !== "" ? new Date(payloadData.next_payment_date) : void 0
 								},
 								where: [{
 									field: "id",
@@ -455,8 +540,8 @@ const paystackWebhook = (options) => {
 					});
 					let newStatus = "canceled";
 					const nextPaymentDate = data?.next_payment_date;
-					const periodEnd = nextPaymentDate ? new Date(nextPaymentDate) : existing?.periodEnd ? new Date(existing.periodEnd) : void 0;
-					if (periodEnd && periodEnd > /* @__PURE__ */ new Date()) newStatus = "active";
+					const periodEnd = nextPaymentDate !== void 0 && nextPaymentDate !== null && nextPaymentDate !== "" ? new Date(nextPaymentDate) : existing?.periodEnd !== void 0 ? new Date(existing.periodEnd) : void 0;
+					if (periodEnd !== void 0 && periodEnd > /* @__PURE__ */ new Date()) newStatus = "active";
 					await ctx.context.adapter.update({
 						model: "subscription",
 						update: {
@@ -470,7 +555,7 @@ const paystackWebhook = (options) => {
 							value: subscriptionCode
 						}]
 					});
-					if (existing) await options.subscription.onSubscriptionCancel?.({
+					if (existing !== void 0 && existing !== null) await options.subscription.onSubscriptionCancel?.({
 						event,
 						subscription: {
 							...existing,
@@ -479,6 +564,31 @@ const paystackWebhook = (options) => {
 					}, ctx);
 				}
 			}
+			if (eventName === "charge.success" || eventName === "invoice.update") {
+				const payloadData = data;
+				const subscriptionCode = payloadData?.subscription?.subscription_code ?? payloadData?.subscription_code;
+				if (subscriptionCode !== void 0 && subscriptionCode !== null && subscriptionCode !== "") {
+					const existingSub = await ctx.context.adapter.findOne({
+						model: "subscription",
+						where: [{
+							field: "paystackSubscriptionCode",
+							value: subscriptionCode
+						}]
+					});
+					if (existingSub?.pendingPlan !== void 0 && existingSub.pendingPlan !== null && existingSub.pendingPlan !== "") await ctx.context.adapter.update({
+						model: "subscription",
+						update: {
+							plan: existingSub.pendingPlan,
+							pendingPlan: null,
+							updatedAt: /* @__PURE__ */ new Date()
+						},
+						where: [{
+							field: "id",
+							value: existingSub.id
+						}]
+					});
+				}
+			}
 		} catch (_e) {
 			ctx.context.logger.error("Failed to sync Paystack webhook event", _e);
 		}
@@ -495,7 +605,10 @@ const initializeTransactionBodySchema = z.object({
 	metadata: z.record(z.string(), z.unknown()).optional(),
 	referenceId: z.string().optional(),
 	callbackURL: z.string().optional(),
-	quantity: z.number().int().positive().optional()
+	quantity: z.number().int().positive().optional(),
+	scheduleAtPeriodEnd: z.boolean().optional(),
+	cancelAtPeriodEnd: z.boolean().optional(),
+	prorateAndCharge: z.boolean().optional()
 });
 const initializeTransaction = (options, path = "/paystack/initialize-transaction") => {
 	const subscriptionOptions = options.subscription;
@@ -509,11 +622,11 @@ const initializeTransaction = (options, path = "/paystack/initialize-transaction
 		] : [sessionMiddleware, originCheck]
 	}, async (ctx) => {
 		const paystack = getPaystackOps(options.paystackClient);
-		const { plan: planName, product: productName, amount: bodyAmount, currency, email, metadata: extraMetadata, callbackURL, quantity } = ctx.body;
+		const { plan: planName, product: productName, amount: bodyAmount, currency, email, metadata: extraMetadata, callbackURL, quantity, scheduleAtPeriodEnd, cancelAtPeriodEnd, prorateAndCharge } = ctx.body;
 		if (callbackURL !== void 0 && callbackURL !== null && callbackURL !== "") {
 			const checkTrusted = () => {
 				try {
-					if (!callbackURL) return false;
+					if (callbackURL === void 0 || callbackURL === null || callbackURL === "") return false;
 					if (callbackURL.startsWith("/")) return true;
 					const baseUrl = ctx.context?.baseURL ?? ctx.request?.url ?? "";
 					if (!baseUrl) return false;
@@ -523,7 +636,7 @@ const initializeTransaction = (options, path = "/paystack/initialize-transaction
 					return false;
 				}
 			};
-			if (!checkTrusted()) throw new APIError("FORBIDDEN", {
+			if (checkTrusted() !== true) throw new APIError("FORBIDDEN", {
 				message: "callbackURL is not a trusted origin.",
 				status: 403
 			});
@@ -531,16 +644,16 @@ const initializeTransaction = (options, path = "/paystack/initialize-transaction
 		const session = await getSessionFromCtx(ctx);
 		if (!session) throw new APIError("UNAUTHORIZED");
 		const user = session.user;
-		if (subscriptionOptions?.enabled === true && subscriptionOptions.requireEmailVerification === true && !user.emailVerified) throw new APIError("BAD_REQUEST", {
+		if (subscriptionOptions?.enabled === true && subscriptionOptions.requireEmailVerification === true && user.emailVerified !== true) throw new APIError("BAD_REQUEST", {
 			code: "EMAIL_VERIFICATION_REQUIRED",
-			message: PAYSTACK_ERROR_CODES.EMAIL_VERIFICATION_REQUIRED
+			message: PAYSTACK_ERROR_CODES.EMAIL_VERIFICATION_REQUIRED.message
 		});
 		let plan;
 		let product;
 		if (planName !== void 0 && planName !== null && planName !== "") {
 			if (subscriptionOptions?.enabled !== true) throw new APIError("BAD_REQUEST", { message: "Subscriptions are not enabled." });
 			plan = await getPlanByName(options, planName) ?? void 0;
-			if (!plan) {
+			if (plan === null || plan === void 0) {
 				const nativePlan = await ctx.context.adapter.findOne({
 					model: "paystackPlan",
 					where: [{
@@ -548,7 +661,7 @@ const initializeTransaction = (options, path = "/paystack/initialize-transaction
 						value: planName
 					}]
 				});
-				if (nativePlan) plan = nativePlan;
+				if (nativePlan !== void 0 && nativePlan !== null) plan = nativePlan;
 				else plan = await ctx.context.adapter.findOne({
 					model: "paystackPlan",
 					where: [{
@@ -557,9 +670,9 @@ const initializeTransaction = (options, path = "/paystack/initialize-transaction
 					}]
 				}) ?? void 0;
 			}
-			if (!plan) throw new APIError("BAD_REQUEST", {
+			if (plan === null || plan === void 0) throw new APIError("BAD_REQUEST", {
 				code: "SUBSCRIPTION_PLAN_NOT_FOUND",
-				message: PAYSTACK_ERROR_CODES.SUBSCRIPTION_PLAN_NOT_FOUND,
+				message: PAYSTACK_ERROR_CODES.SUBSCRIPTION_PLAN_NOT_FOUND.message,
 				status: 400
 			});
 		} else if (productName !== void 0 && productName !== null && productName !== "") {
@@ -573,7 +686,7 @@ const initializeTransaction = (options, path = "/paystack/initialize-transaction
 					}]
 				}) ?? void 0;
 			}
-			if (!product) throw new APIError("BAD_REQUEST", {
+			if (product === null || product === void 0) throw new APIError("BAD_REQUEST", {
 				message: `Product '${productName}' not found.`,
 				status: 400
 			});
@@ -581,23 +694,77 @@ const initializeTransaction = (options, path = "/paystack/initialize-transaction
 			message: "Either 'plan', 'product', or 'amount' is required to initialize a transaction.",
 			status: 400
 		});
-		const amount = bodyAmount ?? product?.price;
+		let amount = bodyAmount ?? product?.price;
 		const finalCurrency = currency ?? product?.currency ?? plan?.currency ?? "NGN";
+		const referenceIdFromCtx = ctx.context.referenceId;
+		const referenceId = ctx.body.referenceId !== void 0 && ctx.body.referenceId !== null && ctx.body.referenceId !== "" ? ctx.body.referenceId : referenceIdFromCtx !== void 0 && referenceIdFromCtx !== null && referenceIdFromCtx !== "" ? referenceIdFromCtx : session.user.id;
+		if (plan && scheduleAtPeriodEnd === true) {
+			const existingSub = await getOrganizationSubscription(ctx, referenceId);
+			if (existingSub?.status === "active") {
+				await ctx.context.adapter.update({
+					model: "subscription",
+					where: [{
+						field: "id",
+						value: existingSub.id
+					}],
+					update: {
+						pendingPlan: plan.name,
+						updatedAt: /* @__PURE__ */ new Date()
+					}
+				});
+				return ctx.json({
+					status: "success",
+					message: "Plan change scheduled at period end.",
+					scheduled: true
+				});
+			}
+		}
+		if (cancelAtPeriodEnd === true) {
+			const existingSub = await getOrganizationSubscription(ctx, referenceId);
+			if (existingSub?.status === "active") {
+				await ctx.context.adapter.update({
+					model: "subscription",
+					where: [{
+						field: "id",
+						value: existingSub.id
+					}],
+					update: {
+						cancelAtPeriodEnd: true,
+						updatedAt: /* @__PURE__ */ new Date()
+					}
+				});
+				return ctx.json({
+					status: "success",
+					message: "Subscription cancellation scheduled at period end.",
+					scheduled: true
+				});
+			}
+		}
+		if (plan !== null && plan !== void 0 && (plan.seatAmount !== void 0 || "seatPriceId" in plan)) {
+			const members = await ctx.context.adapter.findMany({
+				model: "member",
+				where: [{
+					field: "organizationId",
+					value: referenceId
+				}]
+			});
+			const seatCount = members.length > 0 ? members.length : 1;
+			const quantityToUse = quantity ?? seatCount;
+			amount = (plan.amount ?? 0) + quantityToUse * (plan.seatAmount ?? plan.seatPriceId ?? 0);
+		}
 		let url;
 		let reference;
 		let accessCode;
-		const referenceIdFromCtx = ctx.context.referenceId;
-		const referenceId = ctx.body.referenceId !== void 0 && ctx.body.referenceId !== null && ctx.body.referenceId !== "" ? ctx.body.referenceId : referenceIdFromCtx !== void 0 && referenceIdFromCtx !== null && referenceIdFromCtx !== "" ? referenceIdFromCtx : session.user.id;
 		let trialStart;
 		let trialEnd;
 		if (plan?.freeTrial?.days !== void 0 && plan.freeTrial.days !== null && plan.freeTrial.days > 0) {
-			if (!(await ctx.context.adapter.findMany({
+			if ((await ctx.context.adapter.findMany({
 				model: "subscription",
 				where: [{
 					field: "referenceId",
 					value: referenceId
 				}]
-			}))?.some((sub) => sub.trialStart !== void 0 && sub.trialStart !== null || sub.trialEnd !== void 0 && sub.trialEnd !== null || sub.status === "trialing")) {
+			}))?.some((sub) => sub.trialStart !== void 0 && sub.trialStart !== null || sub.trialEnd !== void 0 && sub.trialEnd !== null || sub.status === "trialing") !== true) {
 				trialStart = /* @__PURE__ */ new Date();
 				trialEnd = /* @__PURE__ */ new Date();
 				trialEnd.setDate(trialEnd.getDate() + plan.freeTrial.days);
@@ -628,7 +795,7 @@ const initializeTransaction = (options, path = "/paystack/initialize-transaction
 								value: "owner"
 							}]
 						});
-						if (ownerMember) {
+						if (ownerMember !== void 0 && ownerMember !== null) {
 							const ownerUser = await ctx.context.adapter.findOne({
 								model: "user",
 								where: [{
@@ -646,7 +813,7 @@ const initializeTransaction = (options, path = "/paystack/initialize-transaction
 				userId: user.id,
 				plan: plan?.name.toLowerCase(),
 				product: product?.name.toLowerCase(),
-				isTrial: !!trialStart,
+				isTrial: trialStart !== void 0 && trialStart !== null,
 				trialEnd: trialEnd?.toISOString(),
 				...extraMetadata
 			});
@@ -661,29 +828,108 @@ const initializeTransaction = (options, path = "/paystack/initialize-transaction
 				const ops = getPaystackOps(options.paystackClient);
 				if (initBody.email !== void 0 && initBody.email !== null && initBody.email !== "") await ops.customerUpdate(paystackCustomerCode, { email: initBody.email });
 			} catch (_e) {}
-			if (plan) if (trialStart) initBody.amount = 5e3;
+			if (plan !== void 0 && plan !== null && prorateAndCharge === true) {
+				const existingSub = await getOrganizationSubscription(ctx, referenceId);
+				if (existingSub?.status === "active" && existingSub.paystackAuthorizationCode !== null && existingSub.paystackAuthorizationCode !== void 0 && existingSub.paystackSubscriptionCode !== null && existingSub.paystackSubscriptionCode !== void 0) {
+					const now = /* @__PURE__ */ new Date();
+					const periodEndLocal = existingSub.periodEnd ? new Date(existingSub.periodEnd) : new Date(now.getTime() + 720 * 60 * 60 * 1e3);
+					const periodStartLocal = existingSub.periodStart ? new Date(existingSub.periodStart) : now;
+					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 !== void 0 && existingSub.plan !== null && existingSub.plan !== "") {
+						const oldPlan = await getPlanByName(options, existingSub.plan) ?? await ctx.context.adapter.findOne({
+							model: "paystackPlan",
+							where: [{
+								field: "name",
+								value: existingSub.plan
+							}]
+						});
+						if (oldPlan !== null && oldPlan !== void 0) {
+							const oldSeatCount = existingSub.seats ?? 1;
+							oldAmount = (oldPlan.amount ?? 0) + oldSeatCount * (oldPlan.seatAmount ?? oldPlan.seatPriceId ?? 0);
+						}
+					}
+					let membersCount = 1;
+					if (plan.seatAmount !== void 0 || plan.seatPriceId !== void 0) {
+						const members = await ctx.context.adapter.findMany({
+							model: "member",
+							where: [{
+								field: "organizationId",
+								value: referenceId
+							}]
+						});
+						membersCount = members.length > 0 ? members.length : 1;
+					}
+					const newSeatCount = quantity ?? existingSub.seats ?? membersCount;
+					const newAmount = (plan.amount ?? 0) + newSeatCount * (plan.seatAmount ?? plan.seatPriceId ?? 0);
+					const costDifference = newAmount - oldAmount;
+					if (costDifference > 0 && remainingDays > 0) {
+						const proratedAmount = Math.round(costDifference / totalDays * remainingDays);
+						if (proratedAmount >= 5e3) {
+							if (unwrapSdkResult(await getPaystackOps(options.paystackClient).transactionChargeAuthorization({
+								email: targetEmail,
+								amount: proratedAmount,
+								authorization_code: existingSub.paystackAuthorizationCode,
+								reference: `prorate_${Date.now()}_${Math.random().toString(36).substring(7)}`,
+								metadata: {
+									type: "proration",
+									referenceId,
+									newPlan: plan.name,
+									oldPlan: existingSub.plan,
+									remainingDays
+								}
+							}))?.status !== "success") throw new APIError("BAD_REQUEST", { message: "Failed to process prorated charge via saved authorization." });
+						}
+					}
+					await getPaystackOps(options.paystackClient).subscriptionUpdate({
+						code: existingSub.paystackSubscriptionCode,
+						amount: newAmount,
+						plan: plan.planCode
+					});
+					await ctx.context.adapter.update({
+						model: "subscription",
+						where: [{
+							field: "id",
+							value: existingSub.id
+						}],
+						update: {
+							plan: plan.name,
+							seats: newSeatCount,
+							updatedAt: /* @__PURE__ */ new Date()
+						}
+					});
+					return ctx.json({
+						status: "success",
+						message: "Subscription successfully upgraded with prorated charge.",
+						prorated: true
+					});
+				}
+			}
+			if (plan !== void 0 && plan !== null) if (trialStart !== void 0 && trialStart !== null) initBody.amount = 5e3;
 			else {
 				initBody.plan = plan.planCode;
 				initBody.invoice_limit = plan.invoiceLimit;
-				const planAmount = amount ?? plan.amount ?? 5e4;
-				initBody.amount = Math.max(Math.round(planAmount), 5e4);
-				if (quantity !== void 0 && quantity !== null && quantity > 0) initBody.amount = initBody.amount * quantity;
+				let finalAmount;
+				if (amount !== void 0 && amount !== null) {
+					finalAmount = amount;
+					initBody.quantity = 1;
+				} else finalAmount = (plan.amount ?? 0) * (quantity ?? 1);
+				initBody.amount = Math.max(Math.round(finalAmount), 5e3);
 			}
 			else {
 				if (amount === void 0 || amount === null || amount === 0) throw new APIError("BAD_REQUEST", { message: "Amount is required for one-time payments" });
 				initBody.amount = Math.round(amount);
 			}
-			const initRes = unwrapSdkResult(await paystack.transactionInitialize(initBody));
-			let data = initRes !== void 0 && initRes !== null && typeof initRes === "object" && "status" in initRes && "data" in initRes ? initRes.data : initRes?.data ?? initRes;
-			if (data !== void 0 && data !== null && typeof data === "object" && "status" in data && "data" in data) data = data.data;
-			url = data?.authorization_url;
-			reference = data?.reference;
-			accessCode = data?.access_code;
+			const sdkRes = unwrapSdkResult(await paystack.transactionInitialize(initBody));
+			url = sdkRes?.authorization_url ?? sdkRes?.data?.authorization_url;
+			reference = sdkRes?.reference ?? sdkRes?.data?.reference;
+			accessCode = sdkRes?.access_code ?? sdkRes?.data?.access_code;
 		} catch (error) {
 			ctx.context.logger.error("Failed to initialize Paystack transaction", error);
 			throw new APIError("BAD_REQUEST", {
 				code: "FAILED_TO_INITIALIZE_TRANSACTION",
-				message: error?.message ?? PAYSTACK_ERROR_CODES.FAILED_TO_INITIALIZE_TRANSACTION
+				message: error?.message ?? PAYSTACK_ERROR_CODES.FAILED_TO_INITIALIZE_TRANSACTION.message
 			});
 		}
 		await ctx.context.adapter.create({
@@ -697,7 +943,7 @@ const initializeTransaction = (options, path = "/paystack/initialize-transaction
 				status: "pending",
 				plan: plan?.name.toLowerCase(),
 				product: product?.name.toLowerCase(),
-				metadata: extraMetadata !== void 0 && extraMetadata !== null ? JSON.stringify(extraMetadata) : void 0,
+				metadata: extraMetadata !== void 0 && extraMetadata !== null && Object.keys(extraMetadata).length > 0 ? JSON.stringify(extraMetadata) : void 0,
 				createdAt: /* @__PURE__ */ new Date(),
 				updatedAt: /* @__PURE__ */ new Date()
 			}
@@ -712,7 +958,7 @@ const initializeTransaction = (options, path = "/paystack/initialize-transaction
 						value: referenceId
 					}]
 				});
-				if (org?.paystackCustomerCode !== void 0 && org?.paystackCustomerCode !== null && org.paystackCustomerCode !== "") storedCustomerCode = org.paystackCustomerCode;
+				if (org?.paystackCustomerCode !== void 0 && org.paystackCustomerCode !== null && org.paystackCustomerCode !== "") storedCustomerCode = org.paystackCustomerCode;
 			}
 			const newSubscription = await ctx.context.adapter.create({
 				model: "subscription",
@@ -765,10 +1011,11 @@ const verifyTransaction = (options, path = "/paystack/verify-transaction") => {
 			ctx.context.logger.error("Failed to verify Paystack transaction", error);
 			throw new APIError("BAD_REQUEST", {
 				code: "FAILED_TO_VERIFY_TRANSACTION",
-				message: error?.message ?? PAYSTACK_ERROR_CODES.FAILED_TO_VERIFY_TRANSACTION
+				message: error?.message ?? PAYSTACK_ERROR_CODES.FAILED_TO_VERIFY_TRANSACTION.message
 			});
 		}
-		const data = unwrapSdkResult(verifyRes);
+		const dataRaw = unwrapSdkResult(verifyRes);
+		const data = dataRaw?.data ?? dataRaw;
 		const status = data?.status;
 		const reference = data?.reference ?? ctx.body.reference;
 		const paystackId = data?.id !== void 0 && data?.id !== null ? String(data.id) : void 0;
@@ -785,24 +1032,26 @@ const verifyTransaction = (options, path = "/paystack/verify-transaction") => {
 			if (session !== null && session !== void 0 && referenceId !== session.user.id) {
 				const authRef = subscriptionOptions?.authorizeReference;
 				let authorized = false;
-				if (authRef !== void 0 && authRef !== null) authorized = await authRef({
+				if (authRef !== void 0) authorized = await authRef({
 					user: session.user,
 					session,
 					referenceId,
 					action: "verify-transaction"
 				}, ctx);
-				else if (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 !== null && member !== void 0) authorized = true;
+				if (authorized !== true) {
+					if (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) throw new APIError("UNAUTHORIZED");
 			}
@@ -813,7 +1062,7 @@ const verifyTransaction = (options, path = "/paystack/verify-transaction") => {
 						status: "success",
 						paystackId,
 						...data?.amount !== void 0 && data?.amount !== null ? { amount: data.amount } : {},
-						...data?.currency !== void 0 && data?.currency !== null ? { currency: data.currency } : {},
+						...data?.currency !== void 0 && data?.currency !== null && data?.currency !== "" ? { currency: data.currency } : {},
 						updatedAt: /* @__PURE__ */ new Date()
 					},
 					where: [{
@@ -823,28 +1072,35 @@ const verifyTransaction = (options, path = "/paystack/verify-transaction") => {
 				});
 				const customer = data?.customer;
 				const paystackCustomerCodeFromPaystack = customer !== void 0 && customer !== null && typeof customer === "object" ? customer.customer_code : void 0;
-				if (paystackCustomerCodeFromPaystack !== void 0 && paystackCustomerCodeFromPaystack !== null && paystackCustomerCodeFromPaystack !== "" && referenceId !== void 0 && referenceId !== null && referenceId !== "") if ((options.organization?.enabled === true && (referenceId.startsWith("org_") || await ctx.context.adapter.findOne({
-					model: "organization",
-					where: [{
-						field: "id",
-						value: referenceId
-					}]
-				}) !== null)) === true) await ctx.context.adapter.update({
-					model: "organization",
-					update: { paystackCustomerCode: paystackCustomerCodeFromPaystack },
-					where: [{
-						field: "id",
-						value: referenceId
-					}]
-				});
-				else await ctx.context.adapter.update({
-					model: "user",
-					update: { paystackCustomerCode: paystackCustomerCodeFromPaystack },
-					where: [{
-						field: "id",
-						value: referenceId
-					}]
-				});
+				if (paystackCustomerCodeFromPaystack !== void 0 && paystackCustomerCodeFromPaystack !== null && paystackCustomerCodeFromPaystack !== "" && referenceId !== void 0 && referenceId !== null && referenceId !== "") {
+					let isOrg = options.organization?.enabled === true && typeof referenceId === "string" && referenceId.startsWith("org_");
+					if (!isOrg && options.organization?.enabled === true) {
+						const org = await ctx.context.adapter.findOne({
+							model: "organization",
+							where: [{
+								field: "id",
+								value: referenceId
+							}]
+						});
+						isOrg = org !== null && org !== void 0;
+					}
+					if (isOrg === true) await ctx.context.adapter.update({
+						model: "organization",
+						update: { paystackCustomerCode: paystackCustomerCodeFromPaystack },
+						where: [{
+							field: "id",
+							value: referenceId
+						}]
+					});
+					else await ctx.context.adapter.update({
+						model: "user",
+						update: { paystackCustomerCode: paystackCustomerCodeFromPaystack },
+						where: [{
+							field: "id",
+							value: referenceId
+						}]
+					});
+				}
 				const transaction = await ctx.context.adapter.findOne({
 					model: "paystackTransaction",
 					where: [{
@@ -852,7 +1108,7 @@ const verifyTransaction = (options, path = "/paystack/verify-transaction") => {
 						value: reference
 					}]
 				});
-				if (transaction?.product) await syncProductQuantityFromPaystack(ctx, transaction.product, options.paystackClient);
+				if (transaction?.product !== void 0 && transaction?.product !== null && transaction?.product !== "") await syncProductQuantityFromPaystack(ctx, transaction.product, options.paystackClient);
 				let isTrial = false;
 				let trialEnd;
 				let targetPlan;
@@ -865,17 +1121,17 @@ const verifyTransaction = (options, path = "/paystack/verify-transaction") => {
 				}
 				let paystackSubscriptionCode;
 				if (isTrial === true && targetPlan !== void 0 && targetPlan !== null && targetPlan !== "" && trialEnd !== void 0 && trialEnd !== null && trialEnd !== "") {
-					const email = (data?.customer)?.email;
+					const email = data.customer?.email;
 					const planConfig = (await getPlans(subscriptionOptions)).find((p) => p.name.toLowerCase() === targetPlan?.toLowerCase());
-					if (planConfig !== void 0 && (planConfig.planCode === void 0 || planConfig.planCode === null || planConfig.planCode === "")) paystackSubscriptionCode = `LOC_${reference}`;
-					if (authorizationCode !== void 0 && authorizationCode !== null && authorizationCode !== "" && email !== void 0 && email !== null && email !== "" && planConfig?.planCode !== void 0 && planConfig?.planCode !== null && planConfig?.planCode !== "") {
-						const subData = unwrapSdkResult(await paystack.subscriptionCreate({
+					if (planConfig !== void 0 && planConfig !== null && (planConfig.planCode === void 0 || planConfig.planCode === null || planConfig.planCode === "")) paystackSubscriptionCode = `LOC_${reference}`;
+					if (authorizationCode !== void 0 && authorizationCode !== null && authorizationCode !== "" && email !== void 0 && email !== null && email !== "" && planConfig?.planCode !== void 0 && planConfig.planCode !== null && planConfig.planCode !== "") {
+						const subRes = unwrapSdkResult(await paystack.subscriptionCreate({
 							customer: email,
 							plan: planConfig.planCode,
 							authorization: authorizationCode,
 							start_date: trialEnd
 						}));
-						paystackSubscriptionCode = (subData?.data ?? subData)?.subscription_code;
+						paystackSubscriptionCode = (subRes?.data ?? subRes)?.subscription_code;
 					}
 				} else if (isTrial !== true) {
 					const planCodeFromPaystack = (data?.plan)?.plan_code;
@@ -890,15 +1146,15 @@ const verifyTransaction = (options, path = "/paystack/verify-transaction") => {
 					}]
 				});
 				let targetSub;
-				if (existingSubs && existingSubs.length > 0) targetSub = existingSubs.find((s) => !(referenceId !== void 0 && referenceId !== null && referenceId !== "") || s.referenceId === referenceId);
+				if (existingSubs !== null && existingSubs !== void 0 && existingSubs.length > 0) targetSub = existingSubs.find((s) => referenceId === void 0 || referenceId === null || referenceId === "" || s.referenceId === referenceId);
 				let updatedSubscription = null;
 				if (targetSub !== void 0 && targetSub !== null) updatedSubscription = await ctx.context.adapter.update({
 					model: "subscription",
 					update: {
-						status: isTrial === true ? "trialing" : "active",
+						status: isTrial ? "trialing" : "active",
 						periodStart: /* @__PURE__ */ new Date(),
 						updatedAt: /* @__PURE__ */ new Date(),
-						...isTrial === true && trialEnd !== void 0 && trialEnd !== null && trialEnd !== "" ? {
+						...isTrial === true && trialEnd !== void 0 && trialEnd !== null ? {
 							trialStart: /* @__PURE__ */ new Date(),
 							trialEnd: new Date(trialEnd),
 							periodEnd: new Date(trialEnd)
@@ -922,20 +1178,6 @@ const verifyTransaction = (options, path = "/paystack/verify-transaction") => {
 			} catch (e) {
 				ctx.context.logger.error("Failed to update transaction/subscription after verification", e);
 			}
-		} else if (status === "failed" || status === "abandoned") try {
-			await ctx.context.adapter.update({
-				model: "paystackTransaction",
-				update: {
-					status,
-					updatedAt: /* @__PURE__ */ new Date()
-				},
-				where: [{
-					field: "reference",
-					value: reference
-				}]
-			});
-		} catch (e) {
-			ctx.context.logger.error("Failed to update transaction status", e);
 		}
 		return ctx.json({
 			status,
@@ -961,7 +1203,7 @@ const listSubscriptions = (options) => {
 		if (!session) throw new APIError("UNAUTHORIZED");
 		const referenceIdPart = ctx.context.referenceId;
 		const queryRefId = ctx.query?.referenceId;
-		const referenceId = referenceIdPart !== void 0 && referenceIdPart !== null && referenceIdPart !== "" ? referenceIdPart : queryRefId !== void 0 && queryRefId !== null && queryRefId !== "" ? queryRefId : session.user.id;
+		const referenceId = referenceIdPart ?? queryRefId ?? session.user.id;
 		const res = await ctx.context.adapter.findMany({
 			model: "subscription",
 			where: [{
@@ -998,7 +1240,8 @@ const listTransactions = (options, path = "/paystack/list-transactions") => {
 const enableDisableBodySchema = z.object({
 	referenceId: z.string().optional(),
 	subscriptionCode: z.string(),
-	emailToken: z.string().optional()
+	emailToken: z.string().optional(),
+	atPeriodEnd: z.boolean().optional()
 });
 function decodeBase64UrlToString(value) {
 	const normalized = value.replace(/-/g, "+").replace(/_/g, "/");
@@ -1029,7 +1272,7 @@ const disablePaystackSubscription = (options, path = "/paystack/disable-subscrip
 			referenceMiddleware(options, "disable-subscription")
 		] : [sessionMiddleware, originCheck]
 	}, async (ctx) => {
-		const { subscriptionCode } = ctx.body;
+		const { subscriptionCode, atPeriodEnd } = ctx.body;
 		const paystack = getPaystackOps(options.paystackClient);
 		try {
 			if (subscriptionCode.startsWith("LOC_")) {
@@ -1040,12 +1283,12 @@ const disablePaystackSubscription = (options, path = "/paystack/disable-subscrip
 						value: subscriptionCode
 					}]
 				});
-				if (sub) {
+				if (sub !== null && sub !== void 0) {
 					await ctx.context.adapter.update({
 						model: "subscription",
 						update: {
-							status: "active",
-							cancelAtPeriodEnd: true,
+							status: atPeriodEnd === false ? "canceled" : "active",
+							cancelAtPeriodEnd: atPeriodEnd !== false,
 							updatedAt: /* @__PURE__ */ new Date()
 						},
 						where: [{
@@ -1061,15 +1304,15 @@ const disablePaystackSubscription = (options, path = "/paystack/disable-subscrip
 			let nextPaymentDate;
 			try {
 				const fetchRes = unwrapSdkResult(await paystack.subscriptionFetch(subscriptionCode));
-				const data = fetchRes !== null && fetchRes !== void 0 && typeof fetchRes === "object" && "status" in fetchRes && "data" in fetchRes ? fetchRes.data : fetchRes?.data !== void 0 ? fetchRes.data : fetchRes;
+				const data = fetchRes?.data ?? fetchRes;
 				if (emailToken === void 0 || emailToken === null || emailToken === "") emailToken = data?.email_token;
 				nextPaymentDate = data?.next_payment_date;
 			} catch {}
 			if (emailToken === void 0 || emailToken === null || emailToken === "") try {
 				const linkRes = unwrapSdkResult(await paystack.subscriptionManageLink(subscriptionCode));
-				const data = linkRes !== null && linkRes !== void 0 && typeof linkRes === "object" && "status" in linkRes && "data" in linkRes ? linkRes.data : linkRes?.data !== void 0 ? linkRes.data : linkRes;
-				const link = typeof data === "string" ? data : data?.link;
-				if (link !== void 0 && link !== null && link !== "") emailToken = tryGetEmailTokenFromSubscriptionManageLink(link);
+				const data = linkRes?.data ?? linkRes;
+				const link = typeof data === "string" ? data : data.link;
+				if (typeof link === "string" && link !== "") emailToken = tryGetEmailTokenFromSubscriptionManageLink(link);
 			} catch {}
 			if (emailToken === void 0 || emailToken === null || emailToken === "") throw new Error("Could not retrieve email_token for subscription disable.");
 			await paystack.subscriptionDisable({
@@ -1084,11 +1327,11 @@ const disablePaystackSubscription = (options, path = "/paystack/disable-subscrip
 					value: subscriptionCode
 				}]
 			});
-			if (sub) await ctx.context.adapter.update({
+			if (sub !== void 0 && sub !== null) await ctx.context.adapter.update({
 				model: "subscription",
 				update: {
-					status: "active",
-					cancelAtPeriodEnd: true,
+					status: atPeriodEnd === false ? "canceled" : "active",
+					cancelAtPeriodEnd: atPeriodEnd !== false,
 					periodEnd,
 					updatedAt: /* @__PURE__ */ new Date()
 				},
@@ -1103,7 +1346,7 @@ const disablePaystackSubscription = (options, path = "/paystack/disable-subscrip
 			ctx.context.logger.error("Failed to disable subscription", error);
 			throw new APIError("BAD_REQUEST", {
 				code: "FAILED_TO_DISABLE_SUBSCRIPTION",
-				message: error?.message ?? PAYSTACK_ERROR_CODES.FAILED_TO_DISABLE_SUBSCRIPTION
+				message: error?.message ?? PAYSTACK_ERROR_CODES.FAILED_TO_DISABLE_SUBSCRIPTION.message
 			});
 		}
 	});
@@ -1124,13 +1367,13 @@ const enablePaystackSubscription = (options, path = "/paystack/enable-subscripti
 			let emailToken = ctx.body.emailToken;
 			if (emailToken === void 0 || emailToken === null || emailToken === "") try {
 				const fetchRes = unwrapSdkResult(await paystack.subscriptionFetch(subscriptionCode));
-				emailToken = (fetchRes !== null && fetchRes !== void 0 && typeof fetchRes === "object" && "status" in fetchRes && "data" in fetchRes ? fetchRes.data : fetchRes?.data !== void 0 ? fetchRes.data : fetchRes)?.email_token;
+				emailToken = (fetchRes?.data ?? fetchRes)?.email_token;
 			} catch {}
 			if (emailToken === void 0 || emailToken === null || emailToken === "") try {
 				const linkRes = unwrapSdkResult(await paystack.subscriptionManageLink(subscriptionCode));
-				const data = linkRes !== null && linkRes !== void 0 && "status" in linkRes && "data" in linkRes ? linkRes.data : linkRes?.data !== void 0 ? linkRes.data : linkRes;
-				const link = typeof data === "string" ? data : data?.link;
-				if (link !== void 0 && link !== null && link !== "") emailToken = tryGetEmailTokenFromSubscriptionManageLink(link);
+				const data = linkRes?.data ?? linkRes;
+				const link = typeof data === "string" ? data : data.link;
+				if (typeof link === "string" && link !== "") emailToken = tryGetEmailTokenFromSubscriptionManageLink(link);
 			} catch {}
 			if (emailToken === void 0 || emailToken === null || emailToken === "") throw new APIError("BAD_REQUEST", { message: "Could not retrieve email_token for subscription enable." });
 			await paystack.subscriptionEnable({
@@ -1153,7 +1396,7 @@ const enablePaystackSubscription = (options, path = "/paystack/enable-subscripti
 			ctx.context.logger.error("Failed to enable subscription", error);
 			throw new APIError("BAD_REQUEST", {
 				code: "FAILED_TO_ENABLE_SUBSCRIPTION",
-				message: error?.message ?? PAYSTACK_ERROR_CODES.FAILED_TO_ENABLE_SUBSCRIPTION
+				message: error?.message ?? PAYSTACK_ERROR_CODES.FAILED_TO_ENABLE_SUBSCRIPTION.message
 			});
 		}
 	});
@@ -1174,9 +1417,9 @@ const getSubscriptionManageLink = (options, path = "/paystack/get-subscription-m
 		const paystack = getPaystackOps(options.paystackClient);
 		try {
 			const res = unwrapSdkResult(await paystack.subscriptionManageLink(subscriptionCode));
-			const data = res !== null && res !== void 0 && typeof res === "object" && "status" in res && "data" in res ? res.data : res?.data !== void 0 ? res.data : res;
-			const link = typeof data === "string" ? data : data?.link;
-			return ctx.json({ link });
+			const data = res?.data ?? res;
+			const link = typeof data === "string" ? data : data.link;
+			return ctx.json({ link: typeof link === "string" ? link : null });
 		} catch (error) {
 			ctx.context.logger.error("Failed to get subscription manage link", error);
 			throw new APIError("BAD_REQUEST", { message: error?.message ?? "Failed to get subscription manage link" });
@@ -1195,16 +1438,14 @@ const syncProducts = (options) => {
 		disableBody: true,
 		use: [sessionMiddleware]
 	}, async (ctx) => {
-		console.error("DEBUG: syncProducts endpoint hit!");
 		const paystack = getPaystackOps(options.paystackClient);
 		try {
-			const res = unwrapSdkResult(await paystack.productList());
-			const productsData = res !== null && typeof res === "object" && "status" in res && "data" in res ? res.data : res?.data ?? res;
-			if (!Array.isArray(productsData)) return ctx.json({
-				status: "success",
-				count: 0
-			});
-			for (const product of productsData) {
+			const dataRaw = unwrapSdkResult(await paystack.productList());
+			const productsDataRaw = dataRaw?.data ?? dataRaw;
+			if (!Array.isArray(productsDataRaw)) return ctx.json({ products: [] });
+			const productsData = productsDataRaw;
+			for (const productRaw of productsData) {
+				const product = productRaw;
 				const paystackId = String(product.id);
 				const existing = await ctx.context.adapter.findOne({
 					model: "paystackProduct",
@@ -1213,21 +1454,21 @@ const syncProducts = (options) => {
 						value: paystackId
 					}]
 				});
-				const productData = {
-					name: product.name,
-					description: product.description,
-					price: product.price,
-					currency: product.currency,
-					quantity: product.quantity,
-					unlimited: product.unlimited,
+				const productFields = {
+					name: typeof product.name === "string" ? product.name : "",
+					description: typeof product.description === "string" ? product.description : "",
+					price: typeof product.price === "number" ? product.price : 0,
+					currency: typeof product.currency === "string" ? product.currency : "",
+					quantity: typeof product.quantity === "number" ? product.quantity : 0,
+					unlimited: product.unlimited === true,
 					paystackId,
-					slug: product.slug ?? product.name.toLowerCase().replace(/\s+/g, "-"),
-					metadata: product.metadata ? JSON.stringify(product.metadata) : void 0,
+					slug: typeof product.slug === "string" && product.slug !== "" ? product.slug : typeof product.name === "string" ? product.name.toLowerCase().replace(/\s+/g, "-") : "",
+					metadata: product.metadata !== void 0 && product.metadata !== null ? JSON.stringify(product.metadata) : void 0,
 					updatedAt: /* @__PURE__ */ new Date()
 				};
-				if (existing) await ctx.context.adapter.update({
+				if (existing !== null && existing !== void 0) await ctx.context.adapter.update({
 					model: "paystackProduct",
-					update: productData,
+					update: productFields,
 					where: [{
 						field: "id",
 						value: existing.id
@@ -1236,7 +1477,7 @@ const syncProducts = (options) => {
 				else await ctx.context.adapter.create({
 					model: "paystackProduct",
 					data: {
-						...productData,
+						...productFields,
 						createdAt: /* @__PURE__ */ new Date()
 					}
 				});
@@ -1270,7 +1511,7 @@ const syncPlans = (options) => {
 		const paystack = getPaystackOps(options.paystackClient);
 		try {
 			const res = unwrapSdkResult(await paystack.planList());
-			const plansData = res !== null && typeof res === "object" && "status" in res && "data" in res ? res.data : res?.data ?? res;
+			const plansData = res?.data ?? res;
 			if (!Array.isArray(plansData)) return ctx.json({
 				status: "success",
 				count: 0
@@ -1292,10 +1533,10 @@ const syncPlans = (options) => {
 					interval: plan.interval,
 					planCode: plan.plan_code,
 					paystackId,
-					metadata: plan.metadata ? JSON.stringify(plan.metadata) : void 0,
+					metadata: plan.metadata !== void 0 && plan.metadata !== null ? JSON.stringify(plan.metadata) : void 0,
 					updatedAt: /* @__PURE__ */ new Date()
 				};
-				if (existing) await ctx.context.adapter.update({
+				if (existing !== void 0 && existing !== null) await ctx.context.adapter.update({
 					model: "paystackPlan",
 					update: planData,
 					where: [{
@@ -1365,10 +1606,10 @@ const chargeRecurringSubscription = (options) => {
 				value: subscriptionId
 			}]
 		});
-		if (subscription === null || subscription === void 0) throw new APIError("NOT_FOUND", { message: "Subscription not found" });
+		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((p) => p.name.toLowerCase() === subscription.plan.toLowerCase());
-		if (plan === void 0 || plan === null) throw new APIError("NOT_FOUND", { message: "Plan not found" });
+		if (!plan) throw new APIError("NOT_FOUND", { message: "Plan not found" });
 		const amount = bodyAmount ?? plan.amount;
 		if (amount === void 0 || amount === null) throw new APIError("BAD_REQUEST", { message: "Plan amount is not defined" });
 		let email;
@@ -1407,7 +1648,7 @@ const chargeRecurringSubscription = (options) => {
 			message: `Amount ${amount} is less than the minimum required for ${finalCurrency}.`,
 			status: 400
 		});
-		const data = unwrapSdkResult(await getPaystackOps(options.paystackClient).transactionChargeAuthorization({
+		const dataRaw = unwrapSdkResult(await getPaystackOps(options.paystackClient).transactionChargeAuthorization({
 			email,
 			amount,
 			authorization_code: subscription.paystackAuthorizationCode,
@@ -1418,8 +1659,8 @@ const chargeRecurringSubscription = (options) => {
 				plan: plan.name
 			}
 		}));
-		const chargeData = data?.data ?? data;
-		if (chargeData?.status === "success") {
+		const chargeData = dataRaw?.data ?? dataRaw;
+		if (chargeData?.status === "success" || dataRaw?.status === "success") {
 			const now = /* @__PURE__ */ new Date();
 			const nextPeriodEnd = getNextPeriodEnd(now, plan.interval ?? "monthly");
 			await ctx.context.adapter.update({
@@ -1428,7 +1669,7 @@ const chargeRecurringSubscription = (options) => {
 					periodStart: now,
 					periodEnd: nextPeriodEnd,
 					updatedAt: now,
-					paystackTransactionReference: chargeData.reference
+					paystackTransactionReference: chargeData?.reference ?? dataRaw?.reference
 				},
 				where: [{
 					field: "id",
@@ -1446,7 +1687,6 @@ const chargeRecurringSubscription = (options) => {
 		}, { status: 400 });
 	});
 };
-
 //#endregion
 //#region src/schema.ts
 const transactions = { paystackTransaction: { fields: {
@@ -1568,6 +1808,10 @@ const subscriptions = { subscription: { fields: {
 	seats: {
 		type: "number",
 		required: false
+	},
+	pendingPlan: {
+		type: "string",
+		required: false
 	}
 } } };
 const user = { user: { fields: { paystackCustomerCode: {
@@ -1705,45 +1949,9 @@ const getSchema = (options) => {
 	}
 	return mergeSchema(baseSchema, options.schema);
 };
-
-//#endregion
-//#region src/limits.ts
-const getOrganizationSubscription = async (ctx, organizationId) => {
-	return await ctx.context.adapter.findOne({
-		model: "subscription",
-		where: [{
-			field: "referenceId",
-			value: organizationId
-		}]
-	});
-};
-const checkSeatLimit = async (ctx, organizationId, seatsToAdd = 1) => {
-	const subscription = await getOrganizationSubscription(ctx, organizationId);
-	if (subscription?.seats === void 0 || subscription.seats === null) return true;
-	const members = await ctx.context.adapter.findMany({
-		model: "member",
-		where: [{
-			field: "organizationId",
-			value: organizationId
-		}]
-	});
-	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}` });
-	return true;
-};
-
 //#endregion
 //#region src/index.ts
-const INTERNAL_ERROR_CODES = defineErrorCodes({ ...PAYSTACK_ERROR_CODES });
+const INTERNAL_ERROR_CODES = defineErrorCodes({ ...Object.fromEntries(Object.entries(PAYSTACK_ERROR_CODES).map(([key, value]) => [key, typeof value === "string" ? value : value.message])) });
 const paystack = (options) => {
 	const routeOptions = options;
 	return {
@@ -1774,14 +1982,14 @@ const paystack = (options) => {
 			return { options: {
 				databaseHooks: {
 					user: { create: { async after(user, hookCtx) {
-						if (hookCtx === void 0 || hookCtx === null || options.createCustomerOnSignUp !== true) return;
+						if (!hookCtx || options.createCustomerOnSignUp !== true || user.email === null || user.email === void 0 || user.email === "") return;
 						const sdkRes = unwrapSdkResult(await getPaystackOps(options.paystackClient).customerCreate({
 							email: user.email,
 							first_name: user.name ?? void 0,
 							metadata: { userId: user.id }
 						}));
 						const customerCode = sdkRes?.customer_code ?? (sdkRes?.data)?.customer_code;
-						if (customerCode === void 0 || customerCode === null) return;
+						if (customerCode === "" || customerCode === null || customerCode === void 0) return;
 						await ctx.adapter.update({
 							model: "user",
 							where: [{
@@ -1806,7 +2014,7 @@ const paystack = (options) => {
 										value: "owner"
 									}]
 								});
-								if (ownerMember !== null && ownerMember !== void 0) targetEmail = (await ctx.adapter.findOne({
+								if (ownerMember) targetEmail = (await ctx.adapter.findOne({
 									model: "user",
 									where: [{
 										field: "id",
@@ -1822,7 +2030,7 @@ const paystack = (options) => {
 							}, extraCreateParams);
 							const sdkRes = unwrapSdkResult(await getPaystackOps(options.paystackClient).customerCreate(params));
 							const customerCode = sdkRes?.customer_code ?? (sdkRes?.data)?.customer_code;
-							if (customerCode === void 0 || customerCode === null) return;
+							if (customerCode === "" || customerCode === null || customerCode === void 0 || sdkRes === null || sdkRes === void 0) return;
 							await ctx.internalAdapter.updateOrganization(org.id, { paystackCustomerCode: customerCode });
 							await options.organization?.onCustomerCreate?.({
 								paystackCustomer: sdkRes,
@@ -1836,17 +2044,37 @@ const paystack = (options) => {
 						}
 					} } } : void 0
 				},
-				member: { create: { before: async (member, ctx) => {
-					if (options.subscription?.enabled === true && member.organizationId && ctx !== null && ctx !== void 0) await checkSeatLimit(ctx, member.organizationId);
-				} } },
-				invitation: { create: { before: async (invitation, ctx) => {
-					if (options.subscription?.enabled === true && invitation.organizationId && ctx !== null && ctx !== void 0) await checkSeatLimit(ctx, invitation.organizationId);
-				} } },
+				member: {
+					create: {
+						before: async (member, ctx) => {
+							if (options.subscription?.enabled === true && member.organizationId && ctx !== null && ctx !== void 0) await checkSeatLimit(ctx, member.organizationId);
+						},
+						after: async (member, ctx) => {
+							if (options.subscription?.enabled === true && typeof member?.organizationId === "string" && ctx) await syncSubscriptionSeats(ctx, member.organizationId, routeOptions);
+						}
+					},
+					delete: { after: async (member, ctx) => {
+						if (options.subscription?.enabled === true && typeof member?.organizationId === "string" && ctx) await syncSubscriptionSeats(ctx, member.organizationId, routeOptions);
+					} }
+				},
+				invitation: {
+					create: {
+						before: async (invitation, ctx) => {
+							if (options.subscription?.enabled === true && invitation.organizationId && ctx !== null && ctx !== void 0) await checkSeatLimit(ctx, invitation.organizationId);
+						},
+						after: async (invitation, ctx) => {
+							if (options.subscription?.enabled === true && typeof invitation?.organizationId === "string" && ctx) await syncSubscriptionSeats(ctx, invitation.organizationId, routeOptions);
+						}
+					},
+					delete: { after: async (invitation, ctx) => {
+						if (options.subscription?.enabled === true && typeof invitation?.organizationId === "string" && ctx) await syncSubscriptionSeats(ctx, invitation.organizationId, routeOptions);
+					} }
+				},
 				team: { create: { before: async (team, ctx) => {
-					if (options.subscription?.enabled === true && team.organizationId && ctx !== null && ctx !== void 0) {
+					if (options.subscription?.enabled === true && team.organizationId && ctx) {
 						const subscription = await getOrganizationSubscription(ctx, team.organizationId);
-						if (subscription !== null && subscription !== void 0) {
-							const maxTeams = ((await getPlanByName(options, subscription.plan))?.limits)?.teams;
+						if (subscription) {
+							const maxTeams = ((await getPlanByName(routeOptions, subscription.plan))?.limits)?.teams;
 							if (typeof maxTeams === "number") await checkTeamLimit(ctx, team.organizationId, maxTeams);
 						}
 					}
@@ -1856,7 +2084,7 @@ const paystack = (options) => {
 		$ERROR_CODES: INTERNAL_ERROR_CODES
 	};
 };
-
 //#endregion
 export { paystack };
+
 //# sourceMappingURL=index.mjs.map