@alexasomba/better-auth-paystack 1.2.1 → 2.2.0

package/dist/index.mjs

@@ -3,127 +3,83 @@ 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 { z } from "zod";
+import { PaystackResponse } from "@alexasomba/paystack-node";
 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);
+/**
+* Interface for checking if a result is a PaystackResponse from the SDK v1.9.1+
+*/
+function IsPaystackResponse(value) {
+	return value instanceof PaystackResponse;
 }
+/**
+* Unwraps a Paystack SDK result, extracting the data or throwing an APIError if the request failed.
+* Leverages the native .unwrap() method in SDK v1.9.1+ if available.
+*/
 function unwrapSdkResult(result) {
-	if (isOpenApiFetchResponse(result)) {
-		if (result.error !== void 0 && result.error !== null) throw new Error(typeof result.error === "string" ? result.error : JSON.stringify(result.error));
-		return result.data ?? result;
+	if (IsPaystackResponse(result)) try {
+		return result.unwrap();
+	} catch (e) {
+		throw new APIError("BAD_REQUEST", { message: e?.message ?? "Paystack API error" });
 	}
-	if (result !== null && result !== void 0 && typeof result === "object" && "data" in result) {
-		const data = result.data;
-		if (data !== null && typeof data === "object" && "data" in data) return data.data;
-		return data;
+	let current = result;
+	while (current !== null && current !== void 0 && typeof current === "object") {
+		const body = current;
+		if (body.status === false) throw new APIError("BAD_REQUEST", { message: body.message ?? "Paystack API error" });
+		if ("authorization_url" in body || "reference" in body || "customer_code" in body) break;
+		if ("data" in body && body.data !== void 0 && body.data !== null && typeof body.data === "object") {
+			current = body.data;
+			continue;
+		}
+		break;
 	}
-	return result;
+	return current;
 }
-function getPaystackOps(paystackClient) {
-	return {
-		customerCreate: (params) => {
-			if (paystackClient?.customer_create !== void 0) return paystackClient.customer_create({ body: params });
-			return paystackClient?.customer?.create?.(params);
-		},
-		customerUpdate: (code, params) => {
-			if (paystackClient?.customer_update !== void 0) return paystackClient.customer_update({
-				params: { path: { code } },
-				body: params
-			});
-			return paystackClient?.customer?.update?.(code, params);
-		},
-		transactionInitialize: (body) => {
-			if (paystackClient?.transaction_initialize !== void 0) return paystackClient.transaction_initialize({ body });
-			return paystackClient?.transaction?.initialize?.(body);
-		},
-		transactionVerify: (reference) => {
-			if (paystackClient?.transaction_verify !== void 0) return paystackClient.transaction_verify({ params: { path: { reference } } });
-			return paystackClient?.transaction?.verify?.(reference);
-		},
-		subscriptionCreate: (body) => {
-			if (paystackClient?.subscription_create !== void 0) return paystackClient.subscription_create({ body });
-			return paystackClient?.subscription?.create?.(body);
-		},
-		subscriptionDisable: (body) => {
-			if (paystackClient?.subscription_disable !== void 0) return paystackClient.subscription_disable({ body });
-			return paystackClient?.subscription?.disable?.(body);
-		},
-		subscriptionEnable: (body) => {
-			if (paystackClient?.subscription_enable !== void 0) return paystackClient.subscription_enable({ body });
-			return paystackClient?.subscription?.enable?.(body);
-		},
-		subscriptionFetch: async (idOrCode) => {
-			if (paystackClient?.subscription_fetch !== void 0) try {
-				return await paystackClient.subscription_fetch({ params: { path: { code: idOrCode } } });
-			} catch {
-				const compatFetch = paystackClient.subscription_fetch;
-				return compatFetch({ params: { path: { id_or_code: idOrCode } } });
-			}
-			return paystackClient?.subscription?.fetch?.(idOrCode);
-		},
-		subscriptionManageLink: (code) => {
-			if (paystackClient?.subscription_manageLink !== void 0) return paystackClient.subscription_manageLink({ params: { path: { code } } });
-			if (paystackClient?.subscription_manage_link !== void 0) return paystackClient.subscription_manage_link({ params: { path: { code } } });
-			return paystackClient?.subscription?.manage?.link?.(code);
-		},
-		subscriptionManageEmail: (code, email) => {
-			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);
-		},
-		productList: () => {
-			if (paystackClient?.product_list !== void 0) return paystackClient.product_list();
-			return paystackClient?.product?.list?.();
-		},
-		productFetch: (idOrCode) => {
-			if (paystackClient?.product_fetch !== void 0) return paystackClient.product_fetch({ params: { path: { id_or_code: idOrCode } } });
-			return paystackClient?.product?.fetch?.(idOrCode);
-		},
-		productCreate: (params) => {
-			if (paystackClient?.product_create !== void 0) return paystackClient.product_create({ body: params });
-			return paystackClient?.product?.create?.(params);
-		},
-		productUpdate: (idOrCode, params) => {
-			if (paystackClient?.product_update !== void 0) return paystackClient.product_update({
-				params: { path: { id_or_code: idOrCode } },
-				body: params
-			});
-			return paystackClient?.product?.update?.(idOrCode, params);
-		},
-		productDelete: (idOrCode) => {
-			if (paystackClient?.product_delete !== void 0) return paystackClient.product_delete({ params: { path: { id_or_code: idOrCode } } });
-			return paystackClient?.product?.delete?.(idOrCode);
-		},
-		planList: () => {
-			if (paystackClient?.plan_list !== void 0) return paystackClient.plan_list();
-			return paystackClient?.plan?.list?.();
-		}
-	};
+/**
+* Returns the operations object from a Paystack client.
+* For v1.9.1+, the client itself uses the grouped structure.
+*/
+function getPaystackOps(client) {
+	return client;
 }
 //#endregion
 //#region src/utils.ts
+function getPlanSeatAmount(plan) {
+	if (plan.seatAmount !== void 0) {
+		if (typeof plan.seatAmount === "number" && Number.isFinite(plan.seatAmount)) return plan.seatAmount;
+		throw new Error(`Invalid seatAmount for plan '${plan.name}'. Expected a finite number.`);
+	}
+	if (plan.seatPriceId === void 0 || plan.seatPriceId === null || plan.seatPriceId === "") return;
+	const parsed = typeof plan.seatPriceId === "string" ? Number(plan.seatPriceId) : plan.seatPriceId;
+	if (typeof parsed === "number" && Number.isFinite(parsed)) return parsed;
+	throw new Error(`Invalid seatPriceId for plan '${plan.name}'. Expected a numeric amount in the smallest currency unit.`);
+}
+function calculatePlanAmount(plan, quantity) {
+	return (plan.amount ?? 0) + quantity * (getPlanSeatAmount(plan) ?? 0);
+}
+function isLocalSubscriptionCode(subscriptionCode) {
+	return typeof subscriptionCode === "string" && (subscriptionCode.startsWith("LOC_") || subscriptionCode.startsWith("sub_local_"));
+}
+function isLocallyManagedSubscription(subscription) {
+	if (isLocalSubscriptionCode(subscription.paystackSubscriptionCode)) return true;
+	if (typeof subscription.paystackSubscriptionCode === "string" && subscription.paystackSubscriptionCode !== "") return false;
+	return subscription.paystackPlanCode === void 0 || subscription.paystackPlanCode === null || subscription.paystackPlanCode === "";
+}
+function assertLocallyManagedSubscription(subscription, action) {
+	if (!isLocallyManagedSubscription(subscription)) throw new Error(`Paystack-managed subscriptions do not support ${action}. Use local billing for seat-based or prorated subscription changes.`);
+}
 async function getPlans(subscriptionOptions) {
 	if (subscriptionOptions?.enabled === true) return typeof subscriptionOptions.plans === "function" ? subscriptionOptions.plans() : subscriptionOptions.plans;
 	throw new Error("Subscriptions are not enabled in the Paystack options.");
 }
 async function getPlanByName(options, name) {
-	if (options.subscription?.enabled === true) return (await getPlans(options.subscription)).find((plan) => plan.name.toLowerCase() === name.toLowerCase()) ?? null;
+	if (typeof name !== "string" || name.trim() === "") return null;
+	if (options.subscription?.enabled === true) {
+		const plans = await getPlans(options.subscription);
+		const normalizedName = name.toLowerCase();
+		return plans.find((plan) => typeof plan.name === "string" && plan.name.toLowerCase() === normalizedName) ?? null;
+	}
 	return null;
 }
 async function getProducts(productOptions) {
@@ -131,7 +87,7 @@ async function getProducts(productOptions) {
 	return [];
 }
 async function getProductByName(options, name) {
-	return await getProducts(options.products).then((products) => products?.find((product) => product.name.toLowerCase() === name.toLowerCase()) ?? null);
+	return await getProducts(options.products).then((products) => products !== void 0 && products !== null ? products.find((product) => product.name.toLowerCase() === name.toLowerCase()) ?? null : null);
 }
 function getNextPeriodEnd(startDate, interval) {
 	const date = new Date(startDate);
@@ -189,7 +145,7 @@ async function syncProductQuantityFromPaystack(ctx, productName, paystackClient)
 		}]
 	});
 	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({
+		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,
@@ -203,8 +159,10 @@ async function syncProductQuantityFromPaystack(ctx, productName, paystackClient)
 		return;
 	}
 	try {
-		const remoteQuantity = unwrapSdkResult(await getPaystackOps(paystackClient).productFetch(localProduct.paystackId))?.quantity;
-		if (remoteQuantity !== void 0) await ctx.context.adapter.update({
+		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,
@@ -216,7 +174,7 @@ async function syncProductQuantityFromPaystack(ctx, productName, paystackClient)
 			}]
 		});
 	} catch {
-		if (localProduct !== null && localProduct.unlimited !== true && typeof localProduct.quantity === "number" && localProduct.quantity > 0) await ctx.context.adapter.update({
+		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,
@@ -240,9 +198,10 @@ async function syncSubscriptionSeats(ctx, organizationId, options) {
 		}]
 	});
 	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) return;
-	if (plan.seatAmount === void 0 && plan.seatPlanCode === void 0) return;
+	if (plan === null || plan === void 0) return;
+	if (getPlanSeatAmount(plan) === void 0) return;
 	const quantity = (await adapter.findMany({
 		model: "member",
 		where: [{
@@ -250,14 +209,8 @@ async function syncSubscriptionSeats(ctx, organizationId, options) {
 			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
-		});
+		assertLocallyManagedSubscription(subscription, "automatic seat sync");
 		await adapter.update({
 			model: "subscription",
 			where: [{
@@ -271,7 +224,7 @@ async function syncSubscriptionSeats(ctx, organizationId, options) {
 		});
 	} catch (e) {
 		const log = ctx.context.logger;
-		if (log !== void 0 && log !== null) log.error("Failed to sync subscription seats with Paystack", e);
+		if (log !== void 0 && log !== null) log.error("Failed to sync subscription seats", e);
 	}
 }
 //#endregion
@@ -284,7 +237,7 @@ const referenceMiddleware = (options, action) => createAuthMiddleware(async (ctx
 	const referenceId = body.referenceId ?? query.referenceId ?? session.user.id;
 	const subscriptionOptions = options.subscription;
 	if (referenceId === session.user.id) return { referenceId };
-	if (subscriptionOptions?.enabled === true && "authorizeReference" in subscriptionOptions && subscriptionOptions.authorizeReference) {
+	if (subscriptionOptions?.enabled === true && "authorizeReference" in subscriptionOptions && typeof subscriptionOptions.authorizeReference === "function") {
 		if (await subscriptionOptions.authorizeReference({
 			user: session.user,
 			session: session.session,
@@ -325,7 +278,7 @@ const getOrganizationSubscription = async (ctx, organizationId) => {
 };
 const checkSeatLimit = async (ctx, organizationId, seatsToAdd = 1) => {
 	const subscription = await getOrganizationSubscription(ctx, organizationId);
-	if (subscription?.seats === void 0 || subscription.seats === null) return true;
+	if (subscription?.seats === null) return true;
 	const members = await ctx.context.adapter.findMany({
 		model: "member",
 		where: [{
@@ -333,6 +286,7 @@ const checkSeatLimit = async (ctx, organizationId, seatsToAdd = 1) => {
 			value: 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;
 };
@@ -356,8 +310,17 @@ const PAYSTACK_ERROR_CODES = defineErrorCodes({
 	FAILED_TO_VERIFY_TRANSACTION: "Failed to verify transaction",
 	FAILED_TO_DISABLE_SUBSCRIPTION: "Failed to disable subscription",
 	FAILED_TO_ENABLE_SUBSCRIPTION: "Failed to enable subscription",
-	EMAIL_VERIFICATION_REQUIRED: "Email verification is required before you can subscribe to a plan"
+	EMAIL_VERIFICATION_REQUIRED: "Email verification is required before you can subscribe to a plan",
+	SUBSCRIPTION_PAYMENT_CHANNEL_NOT_ALLOWED: "This subscription only supports specific payment channels"
 });
+function getAllowedSubscriptionChannels(options) {
+	const channels = options.subscription?.allowedPaymentChannels;
+	return Array.isArray(channels) && channels.length > 0 ? channels : void 0;
+}
+function isAllowedSubscriptionChannel(channel, allowedChannels) {
+	if (allowedChannels === void 0) return true;
+	return channel !== void 0 && channel !== null && allowedChannels.includes(channel);
+}
 async function hmacSha512Hex(secret, message) {
 	const encoder = new TextEncoder();
 	const keyData = encoder.encode(secret);
@@ -375,8 +338,8 @@ async function hmacSha512Hex(secret, message) {
 	const { createHmac } = await import("node:crypto");
 	return createHmac("sha512", secret).update(message).digest("hex");
 }
-const paystackWebhook = (options) => {
-	return createAuthEndpoint("/paystack/webhook", {
+const paystackWebhook = (options, path = "/webhook") => {
+	return createAuthEndpoint(path, {
 		method: "POST",
 		metadata: {
 			...HIDE_METADATA,
@@ -388,12 +351,25 @@ const paystackWebhook = (options) => {
 		const request = ctx.requestClone ?? ctx.request;
 		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");
+		const headers = ctx.headers ?? ctx.request?.headers;
+		const signature = headers?.get("x-paystack-signature");
+		if (options.webhook?.verifyIP === true) {
+			const trustedIPs = options.webhook.trustedIPs ?? [
+				"52.31.139.75",
+				"52.49.173.169",
+				"52.214.14.220"
+			];
+			const clientIP = headers?.get("x-forwarded-for")?.split(",")[0]?.trim() ?? headers?.get("x-real-ip") ?? ctx.request.ip;
+			if (clientIP !== void 0 && clientIP !== null && trustedIPs.includes(clientIP) === false) throw new APIError("UNAUTHORIZED", {
+				message: `Forbidden IP: ${clientIP}`,
+				status: 401
+			});
+		}
 		if (signature === void 0 || signature === null || signature === "") throw new APIError("UNAUTHORIZED", {
 			message: "Missing x-paystack-signature header",
 			status: 401
 		});
-		if (await hmacSha512Hex(options.paystackWebhookSecret, payload) !== signature) throw new APIError("UNAUTHORIZED", {
+		if (await hmacSha512Hex(options.webhook?.secret ?? options.paystackWebhookSecret ?? options.secretKey, payload) !== signature) throw new APIError("UNAUTHORIZED", {
 			message: "Invalid Paystack webhook signature",
 			status: 401
 		});
@@ -402,7 +378,8 @@ const paystackWebhook = (options) => {
 		const data = event.data;
 		if (eventName === "charge.success") {
 			const reference = data?.reference;
-			const paystackId = data?.id !== void 0 && data?.id !== null ? String(data.id) : void 0;
+			const paystackIdRaw = data?.id;
+			const paystackId = paystackIdRaw !== void 0 && paystackIdRaw !== null ? String(paystackIdRaw) : void 0;
 			if (reference !== void 0 && reference !== null && reference !== "") {
 				try {
 					await ctx.context.adapter.update({
@@ -428,7 +405,9 @@ const paystackWebhook = (options) => {
 							value: reference
 						}]
 					});
-					if (transaction?.product !== void 0 && transaction.product !== null && transaction.product !== "") await syncProductQuantityFromPaystack(ctx, transaction.product, options.paystackClient);
+					if (transaction !== void 0 && transaction !== null && transaction.product !== void 0 && transaction.product !== null && transaction.product !== "") {
+						if (options.paystackClient !== void 0 && options.paystackClient !== null) await syncProductQuantityFromPaystack(ctx, transaction.product, options.paystackClient);
+					}
 				} catch (e) {
 					ctx.context.logger.warn("Failed to sync product quantity", e);
 				}
@@ -454,19 +433,20 @@ const paystackWebhook = (options) => {
 		}
 		if (options.subscription?.enabled === true) try {
 			if (eventName === "subscription.create") {
-				const payloadData = data;
-				const subscriptionCode = payloadData?.subscription_code ?? payloadData?.subscription?.subscription_code ?? payloadData?.code;
-				const customerCode = payloadData?.customer?.customer_code ?? payloadData?.customer_code ?? payloadData?.customer?.code;
-				const planCode = payloadData?.plan?.plan_code ?? payloadData?.plan_code ?? payloadData?.plan;
-				let metadata = payloadData?.metadata;
+				const subscriptionData = data;
+				const subscriptionCode = subscriptionData.subscription_code ?? "";
+				const customerCode = subscriptionData.customer?.customer_code;
+				const planCode = subscriptionData.plan?.plan_code;
+				let metadata = subscriptionData.metadata;
 				if (typeof metadata === "string") try {
 					metadata = JSON.parse(metadata);
 				} catch {}
-				const referenceIdFromMetadata = typeof metadata === "object" && metadata !== null ? metadata.referenceId : void 0;
-				let planNameFromMetadata = typeof metadata === "object" && metadata !== null ? metadata.plan : void 0;
+				const metadataObj = metadata !== void 0 && metadata !== null && typeof metadata === "object" ? metadata : {};
+				const referenceIdFromMetadata = typeof metadataObj.referenceId === "string" ? metadataObj.referenceId : void 0;
+				let planNameFromMetadata = typeof metadataObj.plan === "string" ? metadataObj.plan : void 0;
 				if (typeof planNameFromMetadata === "string") planNameFromMetadata = planNameFromMetadata.toLowerCase();
 				const plans = await getPlans(options.subscription);
-				const planFromCode = planCode !== void 0 && planCode !== null && planCode !== "" ? plans.find((p) => p.planCode !== void 0 && p.planCode !== null && p.planCode === planCode) : void 0;
+				const planFromCode = planCode !== void 0 && planCode !== null && planCode !== "" ? plans.find((p) => p.planCode === planCode) : void 0;
 				const planPart = planFromCode?.name ?? planNameFromMetadata;
 				const planName = planPart !== void 0 && planPart !== null && planPart !== "" ? planPart.toLowerCase() : void 0;
 				if (subscriptionCode !== void 0 && subscriptionCode !== null && subscriptionCode !== "") {
@@ -495,7 +475,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: subscriptionData.next_payment_date !== void 0 && subscriptionData.next_payment_date !== null ? new Date(subscriptionData.next_payment_date) : void 0
 								},
 								where: [{
 									field: "id",
@@ -528,9 +508,9 @@ const paystackWebhook = (options) => {
 				}
 			}
 			if (eventName === "subscription.disable" || eventName === "subscription.not_renew") {
-				const payloadData = data;
-				const subscriptionCode = payloadData?.subscription_code ?? payloadData?.subscription?.subscription_code ?? payloadData?.code;
-				if (subscriptionCode !== void 0 && subscriptionCode !== null && subscriptionCode !== "") {
+				const subscriptionData = data;
+				const subscriptionCode = subscriptionData.subscription_code ?? "";
+				if (subscriptionCode !== "") {
 					const existing = await ctx.context.adapter.findOne({
 						model: "subscription",
 						where: [{
@@ -539,9 +519,9 @@ const paystackWebhook = (options) => {
 						}]
 					});
 					let newStatus = "canceled";
-					const nextPaymentDate = data?.next_payment_date;
-					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";
+					const nextPaymentDate = subscriptionData.next_payment_date;
+					const periodEnd = nextPaymentDate !== void 0 && nextPaymentDate !== null && nextPaymentDate !== "" ? new Date(nextPaymentDate) : existing?.periodEnd !== void 0 && existing.periodEnd !== null ? new Date(existing.periodEnd) : void 0;
+					if (periodEnd !== void 0 && periodEnd.getTime() > Date.now()) newStatus = "active";
 					await ctx.context.adapter.update({
 						model: "subscription",
 						update: {
@@ -555,7 +535,7 @@ const paystackWebhook = (options) => {
 							value: subscriptionCode
 						}]
 					});
-					if (existing !== void 0 && existing !== null) await options.subscription.onSubscriptionCancel?.({
+					if (existing !== null && existing !== void 0) await options.subscription.onSubscriptionCancel?.({
 						event,
 						subscription: {
 							...existing,
@@ -565,9 +545,9 @@ const paystackWebhook = (options) => {
 				}
 			}
 			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 subscriptionCodeRaw = (data?.subscription)?.subscription_code ?? data?.subscription_code;
+				const subscriptionCode = subscriptionCodeRaw !== void 0 && subscriptionCodeRaw !== null && subscriptionCodeRaw !== "" ? subscriptionCodeRaw : void 0;
+				if (subscriptionCode !== void 0) {
 					const existingSub = await ctx.context.adapter.findOne({
 						model: "subscription",
 						where: [{
@@ -575,7 +555,7 @@ const paystackWebhook = (options) => {
 							value: subscriptionCode
 						}]
 					});
-					if (existingSub?.pendingPlan !== void 0 && existingSub.pendingPlan !== null && existingSub.pendingPlan !== "") await ctx.context.adapter.update({
+					if (existingSub !== void 0 && existingSub !== null && existingSub.pendingPlan !== void 0 && existingSub.pendingPlan !== null && existingSub.pendingPlan !== "") await ctx.context.adapter.update({
 						model: "subscription",
 						update: {
 							plan: existingSub.pendingPlan,
@@ -610,7 +590,7 @@ const initializeTransactionBodySchema = z.object({
 	cancelAtPeriodEnd: z.boolean().optional(),
 	prorateAndCharge: z.boolean().optional()
 });
-const initializeTransaction = (options, path = "/paystack/initialize-transaction") => {
+const initializeTransaction = (options, path = "/initialize-transaction") => {
 	const subscriptionOptions = options.subscription;
 	return createAuthEndpoint(path, {
 		method: "POST",
@@ -626,23 +606,22 @@ const initializeTransaction = (options, path = "/paystack/initialize-transaction
 		if (callbackURL !== void 0 && callbackURL !== null && callbackURL !== "") {
 			const checkTrusted = () => {
 				try {
-					if (callbackURL === void 0 || callbackURL === null || callbackURL === "") return false;
-					if (callbackURL.startsWith("/")) return true;
+					if (callbackURL?.startsWith("/") === true) return true;
 					const baseUrl = ctx.context?.baseURL ?? ctx.request?.url ?? "";
-					if (!baseUrl) return false;
+					if (baseUrl === "") return false;
 					const baseOrigin = new URL(baseUrl).origin;
 					return new URL(callbackURL).origin === baseOrigin;
 				} catch {
 					return false;
 				}
 			};
-			if (checkTrusted() !== true) throw new APIError("FORBIDDEN", {
+			if (checkTrusted() === false) throw new APIError("FORBIDDEN", {
 				message: "callbackURL is not a trusted origin.",
 				status: 403
 			});
 		}
 		const session = await getSessionFromCtx(ctx);
-		if (!session) throw new APIError("UNAUTHORIZED");
+		if (session === void 0 || session === null) throw new APIError("UNAUTHORIZED");
 		const user = session.user;
 		if (subscriptionOptions?.enabled === true && subscriptionOptions.requireEmailVerification === true && user.emailVerified !== true) throw new APIError("BAD_REQUEST", {
 			code: "EMAIL_VERIFICATION_REQUIRED",
@@ -653,7 +632,7 @@ const initializeTransaction = (options, path = "/paystack/initialize-transaction
 		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 === null || plan === void 0) {
+			if (plan === void 0 || plan === null) try {
 				const nativePlan = await ctx.context.adapter.findOne({
 					model: "paystackPlan",
 					where: [{
@@ -669,15 +648,17 @@ const initializeTransaction = (options, path = "/paystack/initialize-transaction
 						value: planName
 					}]
 				}) ?? void 0;
+			} catch {
+				plan = void 0;
 			}
-			if (plan === null || plan === void 0) throw new APIError("BAD_REQUEST", {
+			if (plan === void 0 || plan === null) throw new APIError("BAD_REQUEST", {
 				code: "SUBSCRIPTION_PLAN_NOT_FOUND",
 				message: PAYSTACK_ERROR_CODES.SUBSCRIPTION_PLAN_NOT_FOUND.message,
 				status: 400
 			});
 		} else if (productName !== void 0 && productName !== null && productName !== "") {
 			if (typeof productName === "string") {
-				product ??= await getProductByName(options, productName) ?? void 0;
+				product = await getProductByName(options, productName) ?? void 0;
 				product ??= await ctx.context.adapter.findOne({
 					model: "paystackProduct",
 					where: [{
@@ -686,19 +667,19 @@ const initializeTransaction = (options, path = "/paystack/initialize-transaction
 					}]
 				}) ?? void 0;
 			}
-			if (product === null || product === void 0) throw new APIError("BAD_REQUEST", {
+			if (product === void 0 || product === null) throw new APIError("BAD_REQUEST", {
 				message: `Product '${productName}' not found.`,
 				status: 400
 			});
-		} else if (bodyAmount === void 0 || bodyAmount === null || bodyAmount === 0) throw new APIError("BAD_REQUEST", {
+		} else if (bodyAmount === void 0 || bodyAmount === null) throw new APIError("BAD_REQUEST", {
 			message: "Either 'plan', 'product', or 'amount' is required to initialize a transaction.",
 			status: 400
 		});
-		let amount = bodyAmount ?? product?.price;
-		const finalCurrency = currency ?? product?.currency ?? plan?.currency ?? "NGN";
+		let amount = bodyAmount ?? product?.price ?? product?.amount;
+		const finalCurrency = currency ?? product?.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 referenceId = ctx.body.referenceId ?? referenceIdFromCtx ?? session.user.id;
+		if (plan !== void 0 && scheduleAtPeriodEnd === true) {
 			const existingSub = await getOrganizationSubscription(ctx, referenceId);
 			if (existingSub?.status === "active") {
 				await ctx.context.adapter.update({
@@ -740,40 +721,45 @@ const initializeTransaction = (options, path = "/paystack/initialize-transaction
 				});
 			}
 		}
-		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);
+		if (plan !== void 0) try {
+			if (getPlanSeatAmount(plan) !== void 0) {
+				const members = await ctx.context.adapter.findMany({
+					model: "member",
+					where: [{
+						field: "organizationId",
+						value: referenceId
+					}]
+				});
+				const seatCount = members.length > 0 ? members.length : 1;
+				amount = calculatePlanAmount(plan, quantity ?? seatCount);
+			}
+		} catch (error) {
+			throw new APIError("BAD_REQUEST", { message: error instanceof Error ? error.message : "Invalid seat configuration for plan." });
 		}
 		let url;
 		let reference;
 		let accessCode;
 		let trialStart;
 		let trialEnd;
-		if (plan?.freeTrial?.days !== void 0 && plan.freeTrial.days !== null && plan.freeTrial.days > 0) {
-			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") !== true) {
-				trialStart = /* @__PURE__ */ new Date();
-				trialEnd = /* @__PURE__ */ new Date();
-				trialEnd.setDate(trialEnd.getDate() + plan.freeTrial.days);
-			}
-		}
+		const requestedTrialDays = plan?.freeTrial?.days !== void 0 && plan.freeTrial.days > 0 ? plan.freeTrial.days : 0;
+		const trialRequested = requestedTrialDays > 0;
+		let trialGranted = false;
+		let trialDeniedReason;
+		if (trialRequested) 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") === false) {
+			trialStart = /* @__PURE__ */ new Date();
+			trialEnd = /* @__PURE__ */ new Date();
+			trialEnd.setDate(trialEnd.getDate() + requestedTrialDays);
+			trialGranted = true;
+		} else trialDeniedReason = "already_used";
 		try {
-			let targetEmail = email !== void 0 && email !== null && email !== "" ? email : user.email;
-			let paystackCustomerCode = user.paystackCustomerCode;
-			if (options.organization?.enabled === true && referenceId !== void 0 && referenceId !== null && referenceId !== "" && referenceId !== user.id) {
+			let targetEmail = email ?? user.email;
+			if (options.organization?.enabled === true && referenceId !== void 0 && referenceId !== null && referenceId !== user.id) {
 				const org = await ctx.context.adapter.findOne({
 					model: "organization",
 					where: [{
@@ -782,8 +768,8 @@ const initializeTransaction = (options, path = "/paystack/initialize-transaction
 					}]
 				});
 				if (org !== void 0 && org !== null) {
-					if (org.paystackCustomerCode !== void 0 && org.paystackCustomerCode !== null && org.paystackCustomerCode !== "") paystackCustomerCode = org.paystackCustomerCode;
-					if (org.email !== void 0 && org.email !== null && org.email !== "") targetEmail = org.email;
+					const orgWithEmail = org;
+					if (orgWithEmail.email !== void 0 && orgWithEmail.email !== null && orgWithEmail.email !== "") targetEmail = orgWithEmail.email;
 					else {
 						const ownerMember = await ctx.context.adapter.findOne({
 							model: "member",
@@ -803,110 +789,177 @@ const initializeTransaction = (options, path = "/paystack/initialize-transaction
 									value: ownerMember.userId
 								}]
 							});
-							if (ownerUser?.email !== void 0 && ownerUser?.email !== null && ownerUser?.email !== "") targetEmail = ownerUser.email;
+							if (ownerUser !== void 0 && ownerUser !== null && ownerUser.email !== void 0 && ownerUser.email !== null && ownerUser.email !== "") targetEmail = ownerUser.email;
 						}
 					}
 				}
 			}
+			const allowedSubscriptionChannels = plan ? getAllowedSubscriptionChannels(options) : void 0;
 			const metadata = JSON.stringify({
 				referenceId,
 				userId: user.id,
-				plan: plan?.name.toLowerCase(),
-				product: product?.name.toLowerCase(),
-				isTrial: trialStart !== void 0 && trialStart !== null,
-				trialEnd: trialEnd?.toISOString(),
-				...extraMetadata
+				plan: plan !== void 0 ? plan.name.toLowerCase() : void 0,
+				product: product !== void 0 ? product.name.toLowerCase() : void 0,
+				...extraMetadata,
+				isTrial: trialStart !== void 0,
+				trialRequested,
+				trialGranted,
+				trialDeniedReason,
+				trialEnd: trialEnd !== void 0 ? trialEnd.toISOString() : void 0
 			});
 			const initBody = {
 				email: targetEmail,
-				callback_url: callbackURL,
+				callback_url: callbackURL ?? void 0,
 				metadata,
 				currency: finalCurrency,
 				quantity
 			};
-			if (paystackCustomerCode !== void 0 && paystackCustomerCode !== null && paystackCustomerCode !== "") try {
-				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 !== void 0 && plan !== null && prorateAndCharge === true) {
+			if (allowedSubscriptionChannels !== void 0) initBody.channels = allowedSubscriptionChannels;
+			if (plan !== void 0 && 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);
+				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;
-					if (plan.seatAmount !== void 0 || plan.seatPriceId !== void 0) {
-						const members = await ctx.context.adapter.findMany({
-							model: "member",
+						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: "organizationId",
-								value: referenceId
-							}]
+								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
 						});
-						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;
+			if (plan !== void 0) if (trialStart !== void 0) initBody.amount = 5e3;
 			else {
 				initBody.plan = plan.planCode;
 				initBody.invoice_limit = plan.invoiceLimit;
@@ -918,37 +971,37 @@ const initializeTransaction = (options, path = "/paystack/initialize-transaction
 				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" });
+				if (amount === void 0 || amount === null) throw new APIError("BAD_REQUEST", { message: "Amount is required for one-time payments" });
 				initBody.amount = Math.round(amount);
 			}
-			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;
+			const sdkRes = unwrapSdkResult(await paystack?.transaction?.initialize({ body: initBody }));
+			url = sdkRes?.authorization_url;
+			reference = sdkRes?.reference;
+			accessCode = sdkRes?.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
+				message: error instanceof Error ? error.message : PAYSTACK_ERROR_CODES.FAILED_TO_INITIALIZE_TRANSACTION.message
 			});
 		}
 		await ctx.context.adapter.create({
 			model: "paystackTransaction",
 			data: {
-				reference,
+				reference: reference ?? "",
 				referenceId,
 				userId: user.id,
 				amount: amount ?? 0,
 				currency: plan?.currency ?? currency ?? "NGN",
 				status: "pending",
-				plan: plan?.name.toLowerCase(),
-				product: product?.name.toLowerCase(),
-				metadata: extraMetadata !== void 0 && extraMetadata !== null && Object.keys(extraMetadata).length > 0 ? JSON.stringify(extraMetadata) : void 0,
+				plan: plan !== void 0 ? plan.name.toLowerCase() : void 0,
+				product: product !== void 0 ? product.name.toLowerCase() : void 0,
+				metadata: extraMetadata !== void 0 && Object.keys(extraMetadata).length > 0 ? JSON.stringify(extraMetadata) : void 0,
 				createdAt: /* @__PURE__ */ new Date(),
 				updatedAt: /* @__PURE__ */ new Date()
 			}
 		});
-		if (plan !== void 0 && plan !== null) {
+		if (plan !== void 0) {
 			let storedCustomerCode = user.paystackCustomerCode;
 			if (options.organization?.enabled === true && referenceId !== user.id) {
 				const org = await ctx.context.adapter.findOne({
@@ -958,22 +1011,34 @@ const initializeTransaction = (options, path = "/paystack/initialize-transaction
 						value: referenceId
 					}]
 				});
-				if (org?.paystackCustomerCode !== void 0 && org.paystackCustomerCode !== null && org.paystackCustomerCode !== "") storedCustomerCode = org.paystackCustomerCode;
+				if (org !== void 0 && org !== null) {
+					const paystackOrg = org;
+					if (paystackOrg.paystackCustomerCode !== void 0 && paystackOrg.paystackCustomerCode !== null && paystackOrg.paystackCustomerCode !== "") storedCustomerCode = paystackOrg.paystackCustomerCode;
+				}
 			}
 			const newSubscription = await ctx.context.adapter.create({
 				model: "subscription",
 				data: {
 					plan: plan.name.toLowerCase(),
 					referenceId,
-					paystackCustomerCode: storedCustomerCode,
-					paystackTransactionReference: reference,
-					status: trialStart !== void 0 && trialStart !== null ? "trialing" : "incomplete",
-					seats: quantity,
+					userId: user.id,
+					paystackCustomerCode: storedCustomerCode ?? "",
+					paystackSubscriptionCode: "",
+					paystackPlanCode: plan.planCode,
+					paystackAuthorizationCode: "",
+					paystackTransactionReference: reference ?? "",
+					status: trialStart !== void 0 ? "trialing" : "incomplete",
+					seats: quantity ?? 1,
+					periodStart: /* @__PURE__ */ new Date(),
+					periodEnd: new Date(Date.now() + 720 * 60 * 60 * 1e3),
+					cancelAtPeriodEnd: false,
 					trialStart,
-					trialEnd
+					trialEnd,
+					createdAt: /* @__PURE__ */ new Date(),
+					updatedAt: /* @__PURE__ */ new Date()
 				}
 			});
-			if (trialStart !== void 0 && trialStart !== null && newSubscription !== null && plan.freeTrial?.onTrialStart !== void 0 && plan.freeTrial?.onTrialStart !== null) await plan.freeTrial.onTrialStart(newSubscription);
+			if (trialStart !== void 0 && newSubscription !== void 0 && newSubscription !== null && plan.freeTrial?.onTrialStart !== void 0) await plan.freeTrial.onTrialStart(newSubscription);
 		}
 		return ctx.json({
 			url,
@@ -983,15 +1048,11 @@ const initializeTransaction = (options, path = "/paystack/initialize-transaction
 		});
 	});
 };
-const createSubscription = (options) => initializeTransaction(options, "/paystack/create-subscription");
-const upgradeSubscription = (options) => initializeTransaction(options, "/paystack/upgrade-subscription");
-const restoreSubscription = (options) => {
-	return enablePaystackSubscription(options, "/paystack/restore-subscription");
-};
-const cancelSubscription = (options) => {
-	return disablePaystackSubscription(options, "/paystack/cancel-subscription");
-};
-const verifyTransaction = (options, path = "/paystack/verify-transaction") => {
+const createSubscription = (options, path = "/create-subscription") => initializeTransaction(options, path);
+const upgradeSubscription = (options, path = "/upgrade-subscription") => initializeTransaction(options, path);
+const cancelSubscription = (options, path = "/cancel-subscription") => disablePaystackSubscription(options, path);
+const restoreSubscription = (options, path = "/restore-subscription") => enablePaystackSubscription(options, path);
+const verifyTransaction = (options, path = "/verify-transaction") => {
 	const verifyBodySchema = z.object({ reference: z.string() });
 	const subscriptionOptions = options.subscription;
 	return createAuthEndpoint(path, {
@@ -1004,56 +1065,76 @@ const verifyTransaction = (options, path = "/paystack/verify-transaction") => {
 		] : [sessionMiddleware, originCheck]
 	}, async (ctx) => {
 		const paystack = getPaystackOps(options.paystackClient);
-		let verifyRes;
+		let data;
 		try {
-			verifyRes = unwrapSdkResult(await paystack.transactionVerify(ctx.body.reference));
+			data = unwrapSdkResult(await paystack?.transaction?.verify(ctx.body.reference));
 		} catch (error) {
 			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
+				message: error instanceof Error ? error.message : PAYSTACK_ERROR_CODES.FAILED_TO_VERIFY_TRANSACTION.message
 			});
 		}
-		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;
-		const authorizationCode = (data?.authorization)?.authorization_code;
+		if (data === void 0 || data === null) throw new APIError("BAD_REQUEST", { message: "Failed to fetch transaction data from Paystack." });
+		const status = data.status ?? "failed";
+		const reference = data.reference ?? ctx.body.reference;
+		const paystackIdRaw = data.id;
+		const paystackId = paystackIdRaw !== void 0 && paystackIdRaw !== null ? String(paystackIdRaw) : void 0;
+		const authorizationCode = data.authorization?.authorization_code;
+		const allowedSubscriptionChannels = getAllowedSubscriptionChannels(options);
 		if (status === "success") {
 			const session = await getSessionFromCtx(ctx);
-			const referenceId = (await ctx.context.adapter.findOne({
+			const txRecord = await ctx.context.adapter.findOne({
 				model: "paystackTransaction",
 				where: [{
 					field: "reference",
 					value: reference
 				}]
-			}))?.referenceId ?? (session?.user)?.id;
-			if (session !== null && session !== void 0 && referenceId !== session.user.id) {
+			});
+			const referenceId = txRecord !== void 0 && txRecord !== null && txRecord.referenceId !== void 0 && txRecord.referenceId !== null && txRecord.referenceId !== "" ? txRecord.referenceId : session !== void 0 && session !== null ? session.user.id : void 0;
+			if ((txRecord?.plan !== void 0 && txRecord.plan !== null && txRecord.plan !== "" || Boolean(data.plan)) && isAllowedSubscriptionChannel(data.channel ?? void 0, allowedSubscriptionChannels) === false) {
+				await ctx.context.adapter.update({
+					model: "paystackTransaction",
+					update: {
+						status: "failed",
+						paystackId,
+						amount: data.amount,
+						currency: data.currency,
+						updatedAt: /* @__PURE__ */ new Date()
+					},
+					where: [{
+						field: "reference",
+						value: reference
+					}]
+				});
+				throw new APIError("BAD_REQUEST", {
+					code: "SUBSCRIPTION_PAYMENT_CHANNEL_NOT_ALLOWED",
+					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) authorized = await authRef({
+				if (authRef !== void 0 && authRef !== null) authorized = await authRef({
 					user: session.user,
-					session,
+					session: session.session,
 					referenceId,
 					action: "verify-transaction"
 				}, ctx);
-				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 === 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) throw new APIError("UNAUTHORIZED");
+				if (authorized === false) throw new APIError("UNAUTHORIZED");
 			}
 			try {
 				await ctx.context.adapter.update({
@@ -1061,8 +1142,8 @@ const verifyTransaction = (options, path = "/paystack/verify-transaction") => {
 					update: {
 						status: "success",
 						paystackId,
-						...data?.amount !== void 0 && data?.amount !== null ? { amount: data.amount } : {},
-						...data?.currency !== void 0 && data?.currency !== null && data?.currency !== "" ? { currency: data.currency } : {},
+						amount: data.amount,
+						currency: data.currency,
 						updatedAt: /* @__PURE__ */ new Date()
 					},
 					where: [{
@@ -1070,11 +1151,10 @@ const verifyTransaction = (options, path = "/paystack/verify-transaction") => {
 						value: reference
 					}]
 				});
-				const customer = data?.customer;
-				const paystackCustomerCodeFromPaystack = customer !== void 0 && customer !== null && typeof customer === "object" ? customer.customer_code : void 0;
+				const paystackCustomerCodeFromPaystack = data.customer?.customer_code;
 				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) {
+					if (isOrg === false && options.organization?.enabled === true) {
 						const org = await ctx.context.adapter.findOne({
 							model: "organization",
 							where: [{
@@ -1082,9 +1162,9 @@ const verifyTransaction = (options, path = "/paystack/verify-transaction") => {
 								value: referenceId
 							}]
 						});
-						isOrg = org !== null && org !== void 0;
+						isOrg = org !== void 0 && org !== null;
 					}
-					if (isOrg === true) await ctx.context.adapter.update({
+					if (isOrg) await ctx.context.adapter.update({
 						model: "organization",
 						update: { paystackCustomerCode: paystackCustomerCodeFromPaystack },
 						where: [{
@@ -1108,45 +1188,64 @@ const verifyTransaction = (options, path = "/paystack/verify-transaction") => {
 						value: reference
 					}]
 				});
-				if (transaction?.product !== void 0 && transaction?.product !== null && transaction?.product !== "") await syncProductQuantityFromPaystack(ctx, transaction.product, options.paystackClient);
+				if (transaction !== void 0 && transaction !== null && transaction.product !== void 0 && transaction.product !== null && transaction.product !== "" && options.paystackClient !== void 0 && options.paystackClient !== null) await syncProductQuantityFromPaystack(ctx, transaction.product, options.paystackClient);
 				let isTrial = false;
 				let trialEnd;
 				let targetPlan;
-				if (data?.metadata !== void 0 && data?.metadata !== null) {
-					const metaRaw = data.metadata;
-					const meta = typeof metaRaw === "string" ? JSON.parse(metaRaw) : metaRaw;
-					isTrial = meta.isTrial === true || meta.isTrial === "true";
-					trialEnd = meta.trialEnd;
-					targetPlan = meta.plan;
+				let metadataObj = {};
+				if (data.metadata !== void 0 && data.metadata !== null && data.metadata !== "") {
+					metadataObj = typeof data.metadata === "string" ? JSON.parse(data.metadata) : data.metadata;
+					isTrial = metadataObj.isTrial === true || metadataObj.isTrial === "true";
+					trialEnd = metadataObj.trialEnd;
+					targetPlan = metadataObj.plan;
+				}
+				if (metadataObj.type === "proration") {
+					const subscriptionId = metadataObj.subscriptionId;
+					const newPlan = metadataObj.newPlan;
+					const newSeatCount = metadataObj.newSeatCount;
+					if (subscriptionId !== void 0 && subscriptionId !== "" && newPlan !== void 0 && newPlan !== "") await ctx.context.adapter.update({
+						model: "subscription",
+						update: {
+							plan: newPlan,
+							...typeof newSeatCount === "number" ? { seats: newSeatCount } : {},
+							paystackTransactionReference: reference,
+							...authorizationCode !== void 0 && authorizationCode !== null ? { paystackAuthorizationCode: authorizationCode } : {},
+							updatedAt: /* @__PURE__ */ new Date()
+						},
+						where: [{
+							field: "id",
+							value: subscriptionId
+						}]
+					});
+					return ctx.json({
+						status,
+						reference,
+						data
+					});
 				}
 				let paystackSubscriptionCode;
-				if (isTrial === true && targetPlan !== void 0 && targetPlan !== null && targetPlan !== "" && trialEnd !== void 0 && trialEnd !== null && trialEnd !== "") {
+				if (isTrial && targetPlan !== void 0 && trialEnd !== void 0) {
 					const email = data.customer?.email;
 					const planConfig = (await getPlans(subscriptionOptions)).find((p) => p.name.toLowerCase() === targetPlan?.toLowerCase());
 					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 = (subRes?.data ?? subRes)?.subscription_code;
-					}
-				} else if (isTrial !== true) {
-					const planCodeFromPaystack = (data?.plan)?.plan_code;
+					if (authorizationCode !== void 0 && authorizationCode !== null && email !== void 0 && email !== null && email !== "" && planConfig?.planCode !== void 0 && planConfig.planCode !== null && planConfig.planCode !== "") paystackSubscriptionCode = unwrapSdkResult(await paystack?.subscription?.create({ body: {
+						customer: email,
+						plan: planConfig.planCode,
+						authorization: authorizationCode,
+						start_date: trialEnd
+					} }))?.subscription_code;
+				} else if (isTrial === false) {
+					const planCodeFromPaystack = data.plan?.plan_code;
 					if (planCodeFromPaystack === void 0 || planCodeFromPaystack === null || planCodeFromPaystack === "") paystackSubscriptionCode = `LOC_${reference}`;
-					else paystackSubscriptionCode = (data?.subscription)?.subscription_code;
+					else paystackSubscriptionCode = data.subscription?.subscription_code ?? void 0;
 				}
-				const existingSubs = await ctx.context.adapter.findMany({
+				const targetSub = (await ctx.context.adapter.findMany({
 					model: "subscription",
 					where: [{
 						field: "paystackTransactionReference",
 						value: reference
 					}]
-				});
-				let targetSub;
-				if (existingSubs !== null && existingSubs !== void 0 && existingSubs.length > 0) targetSub = existingSubs.find((s) => referenceId === void 0 || referenceId === null || referenceId === "" || s.referenceId === referenceId);
+				}))?.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",
@@ -1154,22 +1253,22 @@ const verifyTransaction = (options, path = "/paystack/verify-transaction") => {
 						status: isTrial ? "trialing" : "active",
 						periodStart: /* @__PURE__ */ new Date(),
 						updatedAt: /* @__PURE__ */ new Date(),
-						...isTrial === true && trialEnd !== void 0 && trialEnd !== null ? {
+						...isTrial && trialEnd !== void 0 ? {
 							trialStart: /* @__PURE__ */ new Date(),
 							trialEnd: new Date(trialEnd),
 							periodEnd: new Date(trialEnd)
 						} : {},
-						...paystackSubscriptionCode !== void 0 && paystackSubscriptionCode !== null && paystackSubscriptionCode !== "" ? { paystackSubscriptionCode } : {},
-						...authorizationCode !== void 0 && authorizationCode !== null && authorizationCode !== "" ? { paystackAuthorizationCode: authorizationCode } : {}
+						...paystackSubscriptionCode !== void 0 ? { paystackSubscriptionCode } : {},
+						...authorizationCode !== void 0 && authorizationCode !== null ? { paystackAuthorizationCode: authorizationCode } : {}
 					},
 					where: [{
 						field: "id",
 						value: targetSub.id
 					}]
 				});
-				if (updatedSubscription && subscriptionOptions?.enabled === true && "onSubscriptionComplete" in subscriptionOptions && typeof subscriptionOptions.onSubscriptionComplete === "function") {
+				if (updatedSubscription !== void 0 && updatedSubscription !== null && subscriptionOptions?.onSubscriptionComplete !== void 0) {
 					const plan = (await getPlans(subscriptionOptions)).find((p) => p.name.toLowerCase() === updatedSubscription.plan.toLowerCase());
-					if (plan) await subscriptionOptions.onSubscriptionComplete({
+					if (plan !== void 0) await subscriptionOptions.onSubscriptionComplete({
 						event: data,
 						subscription: updatedSubscription,
 						plan
@@ -1186,10 +1285,10 @@ const verifyTransaction = (options, path = "/paystack/verify-transaction") => {
 		});
 	});
 };
-const listSubscriptions = (options) => {
+const listSubscriptions = (options, path = "/list-subscriptions") => {
 	const listQuerySchema = z.object({ referenceId: z.string().optional() });
 	const subscriptionOptions = options.subscription;
-	return createAuthEndpoint("/paystack/list-subscriptions", {
+	return createAuthEndpoint(path, {
 		method: "GET",
 		query: listQuerySchema,
 		use: subscriptionOptions?.enabled === true ? [
@@ -1200,7 +1299,7 @@ const listSubscriptions = (options) => {
 	}, async (ctx) => {
 		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) throw new APIError("UNAUTHORIZED");
+		if (session === void 0 || session === null) throw new APIError("UNAUTHORIZED");
 		const referenceIdPart = ctx.context.referenceId;
 		const queryRefId = ctx.query?.referenceId;
 		const referenceId = referenceIdPart ?? queryRefId ?? session.user.id;
@@ -1214,7 +1313,7 @@ const listSubscriptions = (options) => {
 		return ctx.json({ subscriptions: res });
 	});
 };
-const listTransactions = (options, path = "/paystack/list-transactions") => {
+const listTransactions = (options, path = "/list-transactions") => {
 	return createAuthEndpoint(path, {
 		method: "GET",
 		query: z.object({ referenceId: z.string().optional() }),
@@ -1225,15 +1324,17 @@ const listTransactions = (options, path = "/paystack/list-transactions") => {
 		] : [sessionMiddleware, originCheck]
 	}, async (ctx) => {
 		const session = await getSessionFromCtx(ctx);
-		if (!session) throw new APIError("UNAUTHORIZED");
-		const referenceId = ctx.context.referenceId ?? ctx.query?.referenceId ?? session.user.id;
+		if (session === void 0 || session === null) throw new APIError("UNAUTHORIZED");
+		const referenceIdPart = ctx.context.referenceId;
+		const queryRefId = ctx.query?.referenceId;
+		const referenceId = referenceIdPart ?? queryRefId ?? session.user.id;
 		const sorted = (await ctx.context.adapter.findMany({
 			model: "paystackTransaction",
 			where: [{
 				field: "referenceId",
 				value: referenceId
 			}]
-		})).sort((a, b) => new Date(b.createdAt).getTime() - new Date(a.createdAt).getTime());
+		})).sort((a, b) => b.createdAt.getTime() - a.createdAt.getTime());
 		return ctx.json({ transactions: sorted });
 	});
 };
@@ -1246,8 +1347,10 @@ const enableDisableBodySchema = z.object({
 function decodeBase64UrlToString(value) {
 	const normalized = value.replace(/-/g, "+").replace(/_/g, "/");
 	const padded = normalized + "===".slice((normalized.length + 3) % 4);
-	if (typeof globalThis.atob === "function") return globalThis.atob(padded);
-	return Buffer.from(padded, "base64").toString("utf8");
+	const binaryString = atob(padded);
+	const bytes = new Uint8Array(binaryString.length);
+	for (let i = 0; i < binaryString.length; i++) bytes[i] = binaryString.charCodeAt(i);
+	return new TextDecoder().decode(bytes);
 }
 function tryGetEmailTokenFromSubscriptionManageLink(link) {
 	try {
@@ -1257,12 +1360,12 @@ function tryGetEmailTokenFromSubscriptionManageLink(link) {
 		if (parts.length < 2) return void 0;
 		const payloadJson = decodeBase64UrlToString(parts[1]);
 		const payload = JSON.parse(payloadJson);
-		return typeof payload?.email_token === "string" ? payload.email_token : void 0;
+		return typeof payload.email_token === "string" ? payload.email_token : void 0;
 	} catch {
 		return;
 	}
 }
-const disablePaystackSubscription = (options, path = "/paystack/disable-subscription") => {
+const disablePaystackSubscription = (options, path = "/disable-subscription") => {
 	return createAuthEndpoint(path, {
 		method: "POST",
 		body: enableDisableBodySchema,
@@ -1275,7 +1378,7 @@ const disablePaystackSubscription = (options, path = "/paystack/disable-subscrip
 		const { subscriptionCode, atPeriodEnd } = ctx.body;
 		const paystack = getPaystackOps(options.paystackClient);
 		try {
-			if (subscriptionCode.startsWith("LOC_")) {
+			if (isLocalSubscriptionCode(subscriptionCode)) {
 				const sub = await ctx.context.adapter.findOne({
 					model: "subscription",
 					where: [{
@@ -1303,22 +1406,21 @@ const disablePaystackSubscription = (options, path = "/paystack/disable-subscrip
 			let emailToken = ctx.body.emailToken;
 			let nextPaymentDate;
 			try {
-				const fetchRes = unwrapSdkResult(await paystack.subscriptionFetch(subscriptionCode));
-				const data = fetchRes?.data ?? fetchRes;
-				if (emailToken === void 0 || emailToken === null || emailToken === "") emailToken = data?.email_token;
-				nextPaymentDate = data?.next_payment_date;
+				const fetchRes = unwrapSdkResult(await paystack?.subscription?.fetch(subscriptionCode));
+				if (fetchRes !== void 0 && fetchRes !== null) {
+					emailToken ??= fetchRes.email_token ?? void 0;
+					nextPaymentDate = fetchRes.next_payment_date ?? void 0;
+				}
 			} catch {}
 			if (emailToken === void 0 || emailToken === null || emailToken === "") try {
-				const linkRes = unwrapSdkResult(await paystack.subscriptionManageLink(subscriptionCode));
-				const data = linkRes?.data ?? linkRes;
-				const link = typeof data === "string" ? data : data.link;
-				if (typeof link === "string" && link !== "") emailToken = tryGetEmailTokenFromSubscriptionManageLink(link);
+				const link = unwrapSdkResult(await paystack?.subscription?.manageLink(subscriptionCode))?.link;
+				if (link !== void 0 && link !== null && 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({
+			await paystack?.subscription?.disable({ body: {
 				code: subscriptionCode,
 				token: emailToken
-			});
+			} });
 			const periodEnd = nextPaymentDate !== void 0 && nextPaymentDate !== null && nextPaymentDate !== "" ? new Date(nextPaymentDate) : void 0;
 			const sub = await ctx.context.adapter.findOne({
 				model: "subscription",
@@ -1346,12 +1448,12 @@ 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
+				message: error instanceof Error ? error.message : PAYSTACK_ERROR_CODES.FAILED_TO_DISABLE_SUBSCRIPTION.message
 			});
 		}
 	});
 };
-const enablePaystackSubscription = (options, path = "/paystack/enable-subscription") => {
+const enablePaystackSubscription = (options, path = "/enable-subscription") => {
 	return createAuthEndpoint(path, {
 		method: "POST",
 		body: enableDisableBodySchema,
@@ -1366,20 +1468,18 @@ const enablePaystackSubscription = (options, path = "/paystack/enable-subscripti
 		try {
 			let emailToken = ctx.body.emailToken;
 			if (emailToken === void 0 || emailToken === null || emailToken === "") try {
-				const fetchRes = unwrapSdkResult(await paystack.subscriptionFetch(subscriptionCode));
-				emailToken = (fetchRes?.data ?? fetchRes)?.email_token;
+				const fetchRes = unwrapSdkResult(await paystack?.subscription?.fetch(subscriptionCode));
+				if (fetchRes !== void 0 && fetchRes !== null) emailToken = fetchRes.email_token ?? void 0;
 			} catch {}
 			if (emailToken === void 0 || emailToken === null || emailToken === "") try {
-				const linkRes = unwrapSdkResult(await paystack.subscriptionManageLink(subscriptionCode));
-				const data = linkRes?.data ?? linkRes;
-				const link = typeof data === "string" ? data : data.link;
-				if (typeof link === "string" && link !== "") emailToken = tryGetEmailTokenFromSubscriptionManageLink(link);
+				const link = unwrapSdkResult(await paystack?.subscription?.manageLink(subscriptionCode))?.link;
+				if (link !== void 0 && link !== null && 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({
+			await paystack?.subscription?.enable({ body: {
 				code: subscriptionCode,
 				token: emailToken
-			});
+			} });
 			await ctx.context.adapter.update({
 				model: "subscription",
 				update: {
@@ -1396,12 +1496,12 @@ 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
+				message: error instanceof Error ? error.message : PAYSTACK_ERROR_CODES.FAILED_TO_ENABLE_SUBSCRIPTION.message
 			});
 		}
 	});
 };
-const getSubscriptionManageLink = (options, path = "/paystack/get-subscription-manage-link") => {
+const getSubscriptionManageLink = (options, path = "/subscription-manage-link") => {
 	const manageLinkQuerySchema = z.object({ subscriptionCode: z.string() });
 	const useMiddlewares = options.subscription?.enabled === true ? [
 		sessionMiddleware,
@@ -1410,19 +1510,17 @@ const getSubscriptionManageLink = (options, path = "/paystack/get-subscription-m
 	] : [sessionMiddleware, originCheck];
 	const handler = async (ctx) => {
 		const { subscriptionCode } = ctx.query;
-		if (subscriptionCode.startsWith("LOC_") || subscriptionCode.startsWith("sub_local_")) return ctx.json({
+		if (isLocalSubscriptionCode(subscriptionCode)) return ctx.json({
 			link: null,
 			message: "Local subscriptions cannot be managed on Paystack"
 		});
 		const paystack = getPaystackOps(options.paystackClient);
 		try {
-			const res = unwrapSdkResult(await paystack.subscriptionManageLink(subscriptionCode));
-			const data = res?.data ?? res;
-			const link = typeof data === "string" ? data : data.link;
-			return ctx.json({ link: typeof link === "string" ? link : null });
+			const res = unwrapSdkResult(await paystack?.subscription?.manageLink(subscriptionCode));
+			return ctx.json({ link: res?.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" });
+			throw new APIError("BAD_REQUEST", { message: error instanceof Error ? error.message : "Failed to get subscription manage link" });
 		}
 	};
 	return createAuthEndpoint(path, {
@@ -1431,69 +1529,8 @@ const getSubscriptionManageLink = (options, path = "/paystack/get-subscription-m
 		use: useMiddlewares
 	}, handler);
 };
-const syncProducts = (options) => {
-	return createAuthEndpoint("/paystack/sync-products", {
-		method: "POST",
-		metadata: { ...HIDE_METADATA },
-		disableBody: true,
-		use: [sessionMiddleware]
-	}, async (ctx) => {
-		const paystack = getPaystackOps(options.paystackClient);
-		try {
-			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",
-					where: [{
-						field: "paystackId",
-						value: paystackId
-					}]
-				});
-				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: 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 !== null && existing !== void 0) await ctx.context.adapter.update({
-					model: "paystackProduct",
-					update: productFields,
-					where: [{
-						field: "id",
-						value: existing.id
-					}]
-				});
-				else await ctx.context.adapter.create({
-					model: "paystackProduct",
-					data: {
-						...productFields,
-						createdAt: /* @__PURE__ */ new Date()
-					}
-				});
-			}
-			return ctx.json({
-				status: "success",
-				count: productsData.length
-			});
-		} catch (error) {
-			ctx.context.logger.error("Failed to sync products", error);
-			throw new APIError("BAD_REQUEST", { message: error?.message ?? "Failed to sync products" });
-		}
-	});
-};
-const listProducts = (_options) => {
-	return createAuthEndpoint("/paystack/list-products", {
+const listProducts = (_options, path = "/list-products") => {
+	return createAuthEndpoint(path, {
 		method: "GET",
 		metadata: { openapi: { operationId: "listPaystackProducts" } }
 	}, async (ctx) => {
@@ -1501,69 +1538,8 @@ const listProducts = (_options) => {
 		return ctx.json({ products: sorted });
 	});
 };
-const syncPlans = (options) => {
-	return createAuthEndpoint("/paystack/sync-plans", {
-		method: "POST",
-		metadata: { ...HIDE_METADATA },
-		disableBody: true,
-		use: [sessionMiddleware]
-	}, async (ctx) => {
-		const paystack = getPaystackOps(options.paystackClient);
-		try {
-			const res = unwrapSdkResult(await paystack.planList());
-			const plansData = res?.data ?? res;
-			if (!Array.isArray(plansData)) return ctx.json({
-				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,
-					amount: plan.amount,
-					currency: plan.currency,
-					interval: plan.interval,
-					planCode: plan.plan_code,
-					paystackId,
-					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()
-					}
-				});
-			}
-			return ctx.json({
-				status: "success",
-				count: plansData.length
-			});
-		} catch (error) {
-			ctx.context.logger.error("Failed to sync plans", error);
-			throw new APIError("BAD_REQUEST", { message: error?.message ?? "Failed to sync plans" });
-		}
-	});
-};
-const listPlans = (_options) => {
-	return createAuthEndpoint("/paystack/list-plans", {
+const listPlans = (_options, path = "/list-plans") => {
+	return createAuthEndpoint(path, {
 		method: "GET",
 		metadata: { ...HIDE_METADATA },
 		use: [sessionMiddleware]
@@ -1573,12 +1549,12 @@ const listPlans = (_options) => {
 			return ctx.json({ plans });
 		} catch (error) {
 			ctx.context.logger.error("Failed to list plans", error);
-			throw new APIError("BAD_REQUEST", { message: error?.message ?? "Failed to list plans" });
+			throw new APIError("BAD_REQUEST", { message: error instanceof Error ? error.message : "Failed to list plans" });
 		}
 	});
 };
-const getConfig = (options) => {
-	return createAuthEndpoint("/paystack/get-config", {
+const getConfig = (options, path = "/get-config") => {
+	return createAuthEndpoint(path, {
 		method: "GET",
 		metadata: { openapi: { operationId: "getPaystackConfig" } }
 	}, async (ctx) => {
@@ -1590,103 +1566,6 @@ const getConfig = (options) => {
 		});
 	});
 };
-const chargeRecurringSubscription = (options) => {
-	return createAuthEndpoint("/paystack/charge-recurring", {
-		method: "POST",
-		body: z.object({
-			subscriptionId: z.string(),
-			amount: z.number().optional()
-		})
-	}, async (ctx) => {
-		const { subscriptionId, amount: bodyAmount } = ctx.body;
-		const subscription = await ctx.context.adapter.findOne({
-			model: "subscription",
-			where: [{
-				field: "id",
-				value: 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((p) => p.name.toLowerCase() === subscription.plan.toLowerCase());
-		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;
-		if (subscription.referenceId !== void 0 && subscription.referenceId !== null && subscription.referenceId !== "") {
-			const user = await ctx.context.adapter.findOne({
-				model: "user",
-				where: [{
-					field: "id",
-					value: subscription.referenceId
-				}]
-			});
-			if (user !== void 0 && user !== null) email = user.email;
-			else if (options.organization?.enabled === true) {
-				const ownerMember = await ctx.context.adapter.findOne({
-					model: "member",
-					where: [{
-						field: "organizationId",
-						value: subscription.referenceId
-					}, {
-						field: "role",
-						value: "owner"
-					}]
-				});
-				if (ownerMember !== void 0 && ownerMember !== null) email = (await ctx.context.adapter.findOne({
-					model: "user",
-					where: [{
-						field: "id",
-						value: ownerMember.userId
-					}]
-				}))?.email;
-			}
-		}
-		if (email === void 0 || email === null || email === "") throw new APIError("NOT_FOUND", { message: "User email not found" });
-		const finalCurrency = plan.currency ?? "NGN";
-		if (!validateMinAmount(amount, finalCurrency)) throw new APIError("BAD_REQUEST", {
-			message: `Amount ${amount} is less than the minimum required for ${finalCurrency}.`,
-			status: 400
-		});
-		const dataRaw = unwrapSdkResult(await getPaystackOps(options.paystackClient).transactionChargeAuthorization({
-			email,
-			amount,
-			authorization_code: subscription.paystackAuthorizationCode,
-			currency: plan.currency,
-			metadata: {
-				subscriptionId,
-				referenceId: subscription.referenceId,
-				plan: plan.name
-			}
-		}));
-		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({
-				model: "subscription",
-				update: {
-					periodStart: now,
-					periodEnd: nextPeriodEnd,
-					updatedAt: now,
-					paystackTransactionReference: chargeData?.reference ?? dataRaw?.reference
-				},
-				where: [{
-					field: "id",
-					value: subscription.id
-				}]
-			});
-			return ctx.json({
-				status: "success",
-				data: chargeData
-			});
-		}
-		return ctx.json({
-			status: "failed",
-			data: chargeData
-		}, { status: 400 });
-	});
-};
 //#endregion
 //#region src/schema.ts
 const transactions = { paystackTransaction: { fields: {
@@ -1950,32 +1829,259 @@ const getSchema = (options) => {
 	return mergeSchema(baseSchema, options.schema);
 };
 //#endregion
+//#region src/operations.ts
+async function syncPaystackProducts(ctx, options) {
+	const paystack = getPaystackOps(options.paystackClient);
+	try {
+		const productsData = unwrapSdkResult(await paystack?.product?.list({}));
+		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 ?? "",
+				price: product.price ?? 0,
+				currency: product.currency ?? "",
+				quantity: product.quantity ?? 0,
+				unlimited: product.unlimited !== void 0 && product.unlimited !== null && product.unlimited !== false,
+				paystackId,
+				slug: product.slug ?? 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 !== 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()
+				}
+			});
+		}
+		return {
+			status: "success",
+			count: productsData.length
+		};
+	} catch (error) {
+		ctx.context.logger.error("Failed to sync products", error);
+		throw new APIError("BAD_REQUEST", { message: error instanceof Error ? error.message : "Failed to sync products" });
+	}
+}
+async function syncPaystackPlans(ctx, options) {
+	const paystack = getPaystackOps(options.paystackClient);
+	try {
+		const plansData = unwrapSdkResult(await paystack?.plan?.list());
+		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 ?? "",
+				amount: plan.amount ?? 0,
+				currency: plan.currency ?? "",
+				interval: plan.interval ?? "",
+				planCode: plan.plan_code ?? "",
+				paystackId,
+				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()
+				}
+			});
+		}
+		return {
+			status: "success",
+			count: plansData.length
+		};
+	} catch (error) {
+		ctx.context.logger.error("Failed to sync plans", error);
+		throw new APIError("BAD_REQUEST", { message: error instanceof Error ? error.message : "Failed to sync plans" });
+	}
+}
+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
+		}]
+	});
+	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());
+	if (plan === void 0 || plan === null) 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;
+	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
+			}]
+		});
+		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"
+				}]
+			});
+			if (ownerMember !== void 0 && ownerMember !== null) {
+				const ownerUser = await ctx.context.adapter.findOne({
+					model: "user",
+					where: [{
+						field: "id",
+						value: ownerMember.userId
+					}]
+				});
+				email = ownerUser?.email;
+				billingUserId = ownerUser?.id ?? ownerMember.userId;
+			}
+		}
+	}
+	if (email === void 0 || email === null || email === "") throw new APIError("NOT_FOUND", { message: "User email not found" });
+	const finalCurrency = plan.currency ?? "NGN";
+	if (!validateMinAmount(amount, finalCurrency)) throw new APIError("BAD_REQUEST", {
+		message: `Amount ${amount} is less than the minimum required for ${finalCurrency}.`,
+		status: 400
+	});
+	const chargeData = unwrapSdkResult(await getPaystackOps(options.paystackClient)?.transaction?.chargeAuthorization({ body: {
+		email,
+		amount,
+		authorization_code: subscription.paystackAuthorizationCode,
+		reference: `rec_${subscription.id}_${Date.now()}`,
+		metadata: JSON.stringify({
+			subscriptionId,
+			referenceId
+		})
+	} }));
+	if (chargeData?.status === "success" && chargeData.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 ctx.context.adapter.update({
+			model: "subscription",
+			update: {
+				periodStart: now,
+				periodEnd: nextPeriodEnd,
+				updatedAt: now,
+				paystackTransactionReference: chargeData.reference
+			},
+			where: [{
+				field: "id",
+				value: subscription.id
+			}]
+		});
+		return {
+			status: "success",
+			data: chargeData
+		};
+	}
+	return {
+		status: "failed",
+		data: chargeData
+	};
+}
+//#endregion
 //#region src/index.ts
-const INTERNAL_ERROR_CODES = defineErrorCodes({ ...Object.fromEntries(Object.entries(PAYSTACK_ERROR_CODES).map(([key, value]) => [key, typeof value === "string" ? value : value.message])) });
+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;
+	const routeOptions = {
+		...options,
+		webhook: {
+			...options.webhook,
+			secret: options.webhook?.secret ?? options.paystackWebhookSecret
+		}
+	};
 	return {
 		id: "paystack",
 		endpoints: {
-			initializeTransaction: initializeTransaction(routeOptions),
-			verifyTransaction: verifyTransaction(routeOptions),
-			listSubscriptions: listSubscriptions(routeOptions),
-			paystackWebhook: paystackWebhook(routeOptions),
-			listTransactions: listTransactions(routeOptions),
-			getConfig: getConfig(routeOptions),
-			disableSubscription: disablePaystackSubscription(routeOptions),
-			enableSubscription: enablePaystackSubscription(routeOptions),
-			getSubscriptionManageLink: getSubscriptionManageLink(routeOptions),
+			initializeTransaction: initializeTransaction(routeOptions, "/paystack/initialize-transaction"),
+			verifyTransaction: verifyTransaction(routeOptions, "/paystack/verify-transaction"),
+			listSubscriptions: listSubscriptions(routeOptions, "/paystack/list-subscriptions"),
+			paystackWebhook: paystackWebhook(routeOptions, "/paystack/webhook"),
+			listTransactions: listTransactions(routeOptions, "/paystack/list-transactions"),
+			getConfig: getConfig(routeOptions, "/paystack/config"),
+			disableSubscription: disablePaystackSubscription(routeOptions, "/paystack/disable-subscription"),
+			enableSubscription: enablePaystackSubscription(routeOptions, "/paystack/enable-subscription"),
+			getSubscriptionManageLink: getSubscriptionManageLink(routeOptions, "/paystack/subscription-manage-link"),
 			subscriptionManageLink: getSubscriptionManageLink(routeOptions, "/paystack/subscription/manage-link"),
-			createSubscription: createSubscription(routeOptions),
-			upgradeSubscription: upgradeSubscription(routeOptions),
-			cancelSubscription: cancelSubscription(routeOptions),
-			restoreSubscription: restoreSubscription(routeOptions),
-			chargeRecurringSubscription: chargeRecurringSubscription(routeOptions),
-			syncProducts: syncProducts(routeOptions),
-			listProducts: listProducts(routeOptions),
-			syncPlans: syncPlans(routeOptions),
-			listPlans: listPlans(routeOptions)
+			createSubscription: createSubscription(routeOptions, "/paystack/create-subscription"),
+			upgradeSubscription: upgradeSubscription(routeOptions, "/paystack/upgrade-subscription"),
+			cancelSubscription: cancelSubscription(routeOptions, "/paystack/cancel-subscription"),
+			restoreSubscription: restoreSubscription(routeOptions, "/paystack/restore-subscription"),
+			listProducts: listProducts(routeOptions, "/paystack/list-products"),
+			listPlans: listPlans(routeOptions, "/paystack/list-plans")
 		},
 		schema: getSchema(options),
 		init: (ctx) => {
@@ -1983,25 +2089,39 @@ const paystack = (options) => {
 				databaseHooks: {
 					user: { create: { async after(user, hookCtx) {
 						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 === "" || customerCode === null || customerCode === void 0) return;
-						await ctx.adapter.update({
-							model: "user",
-							where: [{
-								field: "id",
-								value: user.id
-							}],
-							update: { paystackCustomerCode: customerCode }
-						});
+						try {
+							const paystackOps = getPaystackOps(options.paystackClient);
+							if (!paystackOps) return;
+							const sdkRes = unwrapSdkResult(await paystackOps.customer?.create({ body: {
+								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 }
+								});
+								if (typeof options.onCustomerCreate === "function") await options.onCustomerCreate({
+									paystackCustomer: sdkRes,
+									user: {
+										...user,
+										paystackCustomerCode: customerCode
+									}
+								}, hookCtx);
+							}
+						} catch (error) {
+							ctx.logger.error("Failed to create Paystack customer for user", error);
+						}
 					} } },
 					organization: options.organization?.enabled === true ? { create: { async after(org, hookCtx) {
 						try {
-							const extraCreateParams = options.organization?.getCustomerCreateParams ? await options.organization.getCustomerCreateParams(org, hookCtx) : {};
+							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({
@@ -2014,7 +2134,7 @@ const paystack = (options) => {
 										value: "owner"
 									}]
 								});
-								if (ownerMember) targetEmail = (await ctx.adapter.findOne({
+								if (ownerMember !== null && ownerMember !== void 0) targetEmail = (await ctx.adapter.findOne({
 									model: "user",
 									where: [{
 										field: "id",
@@ -2026,19 +2146,29 @@ const paystack = (options) => {
 							const params = defu({
 								email: targetEmail,
 								first_name: org.name,
-								metadata: { organizationId: org.id }
+								metadata: JSON.stringify({ organizationId: org.id })
 							}, extraCreateParams);
-							const sdkRes = unwrapSdkResult(await getPaystackOps(options.paystackClient).customerCreate(params));
-							const customerCode = sdkRes?.customer_code ?? (sdkRes?.data)?.customer_code;
-							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,
-								organization: {
-									...org,
-									paystackCustomerCode: customerCode
-								}
-							}, hookCtx);
+							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 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 }
+								});
+								if (typeof options.organization?.onCustomerCreate === "function") await options.organization.onCustomerCreate({
+									paystackCustomer: sdkRes,
+									organization: {
+										...org,
+										paystackCustomerCode: customerCode
+									}
+								}, hookCtx);
+							}
 						} catch (error) {
 							ctx.logger.error("Failed to create Paystack customer for organization", error);
 						}
@@ -2073,7 +2203,7 @@ const paystack = (options) => {
 				team: { create: { before: async (team, ctx) => {
 					if (options.subscription?.enabled === true && team.organizationId && ctx) {
 						const subscription = await getOrganizationSubscription(ctx, team.organizationId);
-						if (subscription) {
+						if (subscription !== null && subscription !== void 0) {
 							const maxTeams = ((await getPlanByName(routeOptions, subscription.plan))?.limits)?.teams;
 							if (typeof maxTeams === "number") await checkTeamLimit(ctx, team.organizationId, maxTeams);
 						}
@@ -2081,10 +2211,11 @@ const paystack = (options) => {
 				} } }
 			} };
 		},
-		$ERROR_CODES: INTERNAL_ERROR_CODES
+		$ERROR_CODES: INTERNAL_ERROR_CODES,
+		options
 	};
 };
 //#endregion
-export { paystack };
+export { chargeSubscriptionRenewal, paystack, syncPaystackPlans, syncPaystackProducts };
 
 //# sourceMappingURL=index.mjs.map