@kuvarpay/sdk 1.2.1 → 1.3.0

package/index.js

@@ -221,13 +221,14 @@ class KuvarPayServer {
     const payload = Object.assign({}, checkoutSessionData, {
       businessId: checkoutSessionData.businessId || this.businessId,
     });
-    // payload can include 'subaccount' (string) or 'split_code' (string)
-    // Guide says /api/v1/checkout-sessions
     const data = await this._post('/api/v1/checkout-sessions', payload);
+    const body = data.data || data.checkoutSession || data;
     return {
-      sessionId: data?.sessionId || data?.id || data?.checkoutSession?.id || data?.data?.sessionId,
-      authToken: data?.authToken || data?.data?.authToken,
-      approvalUrl: data?.approvalUrl || data?.approval_url || data?.checkoutSession?.approval_url || data?.data?.approval_url,
+      sessionId: body.sessionId || body.id || body.uid,
+      amount: body.amount,
+      currency: body.currency,
+      authToken: body.authToken,
+      approvalUrl: body.approvalUrl || body.approval_url,
       raw: data,
     };
   }
@@ -274,15 +275,12 @@ class KuvarPayServer {
 
     const session = await this.createCheckoutSession(sessionData);
 
-    // 2. Create Transaction using the new Session ID
+    // 2. Create Transaction using the session. We omit toAmount/toCurrency 
+    // to let the API use the values already locked into the session.
     const transactionData = {
       checkoutSessionId: session.sessionId,
       fromCurrency: data.fromCurrency,
       fromNetwork: data.fromNetwork,
-      toCurrency: data.toCurrency || data.currency,
-      toAmount: data.toAmount || data.amount,
-      subaccountCode: data.subaccountCode || data.subaccount,
-      splitCode: data.splitCode || data.split_code,
       description: data.description,
       metadata: data.metadata,
     };
@@ -391,9 +389,19 @@ class KuvarPayServer {
       businessId: subscriptionData?.businessId || this.businessId,
     }, subscriptionData);
     const data = await this._post('/api/v1/subscriptions/checkout-sessions', payload);
+    const body = data.data || data.checkoutSession || data;
+    const approvalUrl = body.approvalUrl || body.approval_url || body.approvalUrl;
+    
+    // Fallback: Extract ID from approval URL if missing (e.g., .../subscriptions/ID)
+    let sessionId = body.sessionId || body.id || body.uid;
+    if (!sessionId && approvalUrl) {
+      const parts = approvalUrl.split('/');
+      sessionId = parts[parts.length - 1];
+    }
+
     return {
-      sessionId: data?.sessionId || data?.id || data?.checkoutSession?.id || data?.checkoutSession?.uid,
-      approvalUrl: data?.approvalUrl || data?.approval_url || data?.checkoutSession?.approval_url,
+      sessionId,
+      approvalUrl,
       raw: data,
     };
   }
@@ -474,10 +482,9 @@ class KuvarPayServer {
    */
   async createDirectSubscription(data) {
     const payload = Object.assign({
-      billingMode: data.billingMode || 'FIXED',
+      billingMode: data.amount ? 'METERED' : (data.billingMode || 'FIXED'),
     }, data);
 
-    // If amount/currency is provided but expectedUsage is not, map it
     if (data.amount && data.currency && !data.expectedUsage) {
       payload.expectedUsage = {
         amount: data.amount,

package/index.mjs

@@ -164,12 +164,14 @@ export class KuvarPayServer {
     const payload = Object.assign({}, checkoutSessionData, {
       businessId: checkoutSessionData.businessId || this.businessId,
     });
-    // payload can include 'subaccount' (string) or 'split_code' (string)
     const data = await this._post('/api/v1/checkout-sessions', payload);
+    const body = data.data || data.checkoutSession || data;
     return {
-      sessionId: data?.sessionId || data?.id || data?.checkoutSession?.id || data?.data?.sessionId,
-      authToken: data?.authToken || data?.data?.authToken,
-      approvalUrl: data?.approvalUrl || data?.approval_url || data?.checkoutSession?.approval_url || data?.data?.approval_url,
+      sessionId: body.sessionId || body.id || body.uid,
+      amount: body.amount,
+      currency: body.currency,
+      authToken: body.authToken,
+      approvalUrl: body.approvalUrl || body.approval_url,
       raw: data,
     };
   }
@@ -208,10 +210,6 @@ export class KuvarPayServer {
       checkoutSessionId: session.sessionId,
       fromCurrency: data.fromCurrency,
       fromNetwork: data.fromNetwork,
-      toCurrency: data.toCurrency || data.currency,
-      toAmount: data.toAmount || data.amount,
-      subaccountCode: data.subaccountCode || data.subaccount,
-      splitCode: data.splitCode || data.split_code,
       description: data.description,
       metadata: data.metadata,
     };
@@ -276,9 +274,18 @@ export class KuvarPayServer {
       businessId: subscriptionData?.businessId || this.businessId,
     }, subscriptionData);
     const data = await this._post('/api/v1/subscriptions/checkout-sessions', payload);
+    const body = data.data || data.checkoutSession || data;
+    const approvalUrl = body.approvalUrl || body.approval_url || body.approvalUrl;
+    
+    let sessionId = body.sessionId || body.id || body.uid;
+    if (!sessionId && approvalUrl) {
+      const parts = approvalUrl.split('/');
+      sessionId = parts[parts.length - 1];
+    }
+
     return {
-      sessionId: data?.sessionId || data?.id || data?.checkoutSession?.id || data?.checkoutSession?.uid,
-      approvalUrl: data?.approvalUrl || data?.approval_url || data?.checkoutSession?.approval_url,
+      sessionId,
+      approvalUrl,
       raw: data,
     };
   }
@@ -330,7 +337,7 @@ export class KuvarPayServer {
 
   async createDirectSubscription(data) {
     const payload = Object.assign({
-      billingMode: data.billingMode || 'FIXED',
+      billingMode: data.amount ? 'METERED' : (data.billingMode || 'FIXED'),
     }, data);
 
     if (data.amount && data.currency && !data.expectedUsage) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kuvarpay/sdk",
-  "version": "1.2.1",
+  "version": "1.3.0",
   "description": "Official KuvarPay Server SDK for Node.js",
   "main": "index.js",
   "module": "index.mjs",