@forklaunch/implementation-billing-stripe 0.4.3 → 0.5.0

package/lib/services/index.mjs

@@ -57,12 +57,13 @@ var StripeBillingPortalService = class {
     });
     const session = await this.stripeClient.billingPortal.sessions.create({
       ...billingPortalDto.stripeFields,
-      customer: existingSession.customerId
+      customer: billingPortalDto.customerId || existingSession.customerId
     });
     return await this.baseBillingPortalService.updateBillingPortalSession(
       {
         ...billingPortalDto,
-        id: session.id,
+        id: existingSession.id,
+        // Use the original database ID, not the new Stripe session ID
         uri: session.url,
         expiresAt: new Date(
           Date.now() + this.billingPortalSessionExpiryDurationMs
@@ -105,6 +106,7 @@ var StripeCheckoutSessionService = class {
   async createCheckoutSession(checkoutSessionDto, ...args) {
     const session = await this.stripeClient.checkout.sessions.create({
       ...checkoutSessionDto.stripeFields,
+      mode: "subscription",
       payment_method_types: checkoutSessionDto.paymentMethods,
       currency: checkoutSessionDto.currency,
       success_url: checkoutSessionDto.successRedirectUri,
@@ -190,10 +192,10 @@ var StripePaymentLinkService = class {
       {
         ...paymentLinkDto,
         id: session.id,
-        amount: session.line_items?.data.reduce(
+        amount: paymentLinkDto.amount ?? session.line_items?.data.reduce(
           (total, item) => total + item.amount_total,
           0
-        ) ?? 0
+        )
       },
       this.em,
       session,
@@ -259,24 +261,21 @@ var StripePaymentLinkService = class {
     await this.basePaymentLinkService.handlePaymentFailure({ id });
   }
   async listPaymentLinks(idsDto) {
+    this.openTelemetryCollector.log("info", idsDto ?? "idsDto is undefined");
     const stripePaymentLinks = await this.stripeClient.paymentLinks.list({
       active: true
     });
     const databasePaymentLinks = await this.basePaymentLinkService.listPaymentLinks(idsDto);
-    return await Promise.all(
-      databasePaymentLinks.map(async (paymentLink) => {
-        const stripePaymentLink = stripePaymentLinks.data.find(
-          (sp) => sp.id === paymentLink.id
-        );
-        if (!stripePaymentLink) {
-          throw new Error(
-            `Stripe payment link not found for id: ${paymentLink.id}`
-          );
-        }
-        paymentLink.stripeFields = stripePaymentLink;
-        return paymentLink;
-      })
-    );
+    return databasePaymentLinks.map((paymentLink) => {
+      const stripePaymentLink = stripePaymentLinks.data.find(
+        (sp) => sp.id === paymentLink.id
+      );
+      if (!stripePaymentLink) {
+        return null;
+      }
+      paymentLink.stripeFields = stripePaymentLink;
+      return paymentLink;
+    }).filter((paymentLink) => paymentLink !== null);
   }
 };
 
@@ -307,6 +306,7 @@ var StripePlanService = class {
   async createPlan(planDto, em) {
     const stripePlan = await this.stripeClient.plans.create({
       ...planDto.stripeFields,
+      amount: planDto.price,
       interval: planDto.cadence,
       product: planDto.name,
       currency: planDto.currency
@@ -323,68 +323,76 @@ var StripePlanService = class {
     return plan;
   }
   async getPlan(idDto, em) {
-    const plan = await this.stripeClient.plans.retrieve(idDto.id);
-    const id = (await em?.findOne(
-      this.options?.databaseTableName ?? "plan",
-      { externalId: idDto.id }
-    ))?.id;
-    if (!id) {
+    const planEntity = await this.basePlanService.getPlan(idDto, em);
+    if (!planEntity.externalId) {
       throw new Error("Plan not found");
     }
-    const planEntity = await this.basePlanService.getPlan({ id }, em);
+    const plan = await this.stripeClient.plans.retrieve(planEntity.externalId);
     planEntity.stripeFields = plan;
     return planEntity;
   }
   async updatePlan(planDto, em) {
-    const existingPlan = await this.stripeClient.plans.retrieve(planDto.id);
-    const plan = await this.stripeClient.plans.del(planDto.id).then(
-      () => this.stripeClient.plans.create({
-        ...planDto.stripeFields,
-        interval: planDto.cadence ?? existingPlan.interval,
-        product: planDto.name,
-        currency: planDto.currency ?? existingPlan.currency
-      })
-    );
-    const planEntity = await this.basePlanService.updatePlan(
-      await this.mappers.UpdatePlanMapper.toEntity(
-        {
-          ...planDto,
-          externalId: plan.id,
-          billingProvider: "stripe"
-        },
-        em ?? this.em,
-        plan
-      ),
+    const planEntity = await this.basePlanService.getPlan(
+      {
+        id: planDto.id
+      },
       em
     );
-    planEntity.stripeFields = plan;
-    return planEntity;
+    const existingPlan = await this.stripeClient.plans.retrieve(
+      planEntity.externalId
+    );
+    const existingProduct = existingPlan.product;
+    if (!existingProduct) {
+      throw new Error("Plan product not found");
+    }
+    const productId = typeof existingProduct === "string" ? existingProduct : existingProduct.id;
+    await this.stripeClient.plans.del(planEntity.externalId);
+    const updatedPlan = await this.stripeClient.plans.create({
+      ...planDto.stripeFields,
+      interval: planDto.cadence ?? existingPlan.interval,
+      currency: planDto.currency ?? existingPlan.currency,
+      amount: planDto.price ?? existingPlan.amount ?? void 0,
+      product: productId
+    });
+    const updatedPlanEntity = await this.basePlanService.updatePlan(
+      {
+        ...planDto,
+        externalId: updatedPlan.id,
+        name: planDto.name,
+        billingProvider: "stripe"
+      },
+      em,
+      updatedPlan
+    );
+    updatedPlanEntity.stripeFields = updatedPlan;
+    return updatedPlanEntity;
   }
   async deletePlan(idDto, em) {
-    await this.stripeClient.plans.del(idDto.id);
+    const plan = await this.basePlanService.getPlan(idDto, em);
+    if (!plan.externalId) {
+      throw new Error("Plan not found");
+    }
+    await this.stripeClient.plans.del(plan.externalId);
     await this.basePlanService.deletePlan(idDto, em);
   }
   async listPlans(idsDto, em) {
-    const plans = await this.stripeClient.plans.list({
-      active: true
-    });
-    const planIds = (await em?.findAll(
-      this.options?.databaseTableName ?? "plan",
-      { where: { externalId: { $in: plans.data.map((plan) => plan.id) } } }
-    ))?.filter((s) => idsDto?.ids?.includes(s.id))?.map((s) => s.id);
-    if (!planIds) {
-      throw new Error("Plans not found");
+    const plans = await this.basePlanService.listPlans(idsDto, em);
+    if (!plans || plans.length === 0) {
+      return [];
     }
-    return await Promise.all(
-      (await this.basePlanService.listPlans({ ids: planIds }, em)).map(
-        async (plan) => ({
-          ...plan,
-          stripeFields: plans.data.find(
-            (stripePlan) => stripePlan.id === plan.externalId
-          )
-        })
-      )
+    const stripePlans = await Promise.all(
+      plans.map(async (plan) => {
+        try {
+          return await this.stripeClient.plans.retrieve(plan.externalId);
+        } catch {
+          return null;
+        }
+      })
     );
+    return plans.map((plan, index) => ({
+      ...plan,
+      stripeFields: stripePlans[index]
+    })).filter((plan) => plan.stripeFields !== null);
   }
 };
 
@@ -434,94 +442,127 @@ var StripeSubscriptionService = class {
   }
   async getSubscription(idDto, em) {
     const subscriptionEntity = await this.baseSubscriptionService.getSubscription(idDto, em);
+    if (!subscriptionEntity.externalId) {
+      throw new Error("Subscription not found");
+    }
     const stripeSubscription = await this.stripeClient.subscriptions.retrieve(
-      idDto.id
+      subscriptionEntity.externalId
     );
     subscriptionEntity.stripeFields = stripeSubscription;
     return subscriptionEntity;
   }
   async getUserSubscription(idDto, em) {
     const subscriptionEntity = await this.baseSubscriptionService.getUserSubscription(idDto, em);
+    if (!subscriptionEntity.externalId) {
+      throw new Error("Subscription not found");
+    }
     const stripeSubscription = await this.stripeClient.subscriptions.retrieve(
-      idDto.id
+      subscriptionEntity.externalId
     );
     subscriptionEntity.stripeFields = stripeSubscription;
     return subscriptionEntity;
   }
   async getOrganizationSubscription(idDto, em) {
-    const id = (await em?.findOne(
-      this.options?.databaseTableName ?? "subscription",
-      { externalId: idDto.id }
-    ))?.id;
-    if (!id) {
+    const subscriptionEntity = await this.baseSubscriptionService.getOrganizationSubscription(idDto, em);
+    if (!subscriptionEntity.externalId) {
       throw new Error("Subscription not found");
     }
-    const subscriptionEntity = await this.baseSubscriptionService.getOrganizationSubscription(
-      { id },
-      em
-    );
     const stripeSubscription = await this.stripeClient.subscriptions.retrieve(
-      idDto.id
+      subscriptionEntity.externalId
     );
     subscriptionEntity.stripeFields = stripeSubscription;
     return subscriptionEntity;
   }
   async updateSubscription(subscriptionDto, em) {
-    const subscription = await this.stripeClient.subscriptions.update(
-      subscriptionDto.id,
+    const subscriptionEntity = await this.baseSubscriptionService.getSubscription(
+      {
+        id: subscriptionDto.id
+      },
+      em
+    );
+    if (!subscriptionEntity.externalId) {
+      throw new Error("Subscription not found");
+    }
+    const existingStripeSubscription = await this.stripeClient.subscriptions.retrieve(
+      subscriptionEntity.externalId
+    );
+    const updatedSubscription = await this.stripeClient.subscriptions.update(
+      subscriptionEntity.externalId,
       {
         ...subscriptionDto.stripeFields,
-        items: [
-          {
-            plan: subscriptionDto.productId
-          }
-        ]
+        items: existingStripeSubscription.items.data.map((item) => ({
+          id: item.id,
+          plan: subscriptionDto.productId || item.plan?.id
+        }))
       }
     );
-    return await this.baseSubscriptionService.updateSubscription(
+    const updatedSubscriptionEntity = await this.baseSubscriptionService.updateSubscription(
       {
         ...subscriptionDto,
-        externalId: subscription.id,
-        billingProvider: "stripe",
-        providerFields: subscription
+        externalId: updatedSubscription.id,
+        billingProvider: "stripe"
       },
       em ?? this.em,
-      subscription
+      updatedSubscription
     );
+    updatedSubscriptionEntity.stripeFields = updatedSubscription;
+    return updatedSubscriptionEntity;
   }
   async deleteSubscription(idDto, em) {
-    await this.stripeClient.subscriptions.cancel(idDto.id);
+    const subscription = await this.baseSubscriptionService.getSubscription(
+      idDto,
+      em
+    );
+    if (!subscription.externalId) {
+      throw new Error("Subscription not found");
+    }
+    await this.stripeClient.subscriptions.cancel(subscription.externalId);
     await this.baseSubscriptionService.deleteSubscription(idDto, em);
   }
   async listSubscriptions(idsDto, em) {
-    const subscriptions = (await this.stripeClient.subscriptions.list({
-      status: "active"
-    })).data.filter((s) => idsDto.ids?.includes(s.id));
-    const ids = (await em?.findAll(
-      this.options?.databaseTableName ?? "subscription",
-      { where: { externalId: { $in: subscriptions.map((s) => s.id) } } }
-    ))?.map((s) => s.id);
-    if (!ids) {
-      throw new Error("Subscriptions not found");
+    const subscriptions = await this.baseSubscriptionService.listSubscriptions(
+      idsDto,
+      em
+    );
+    if (!subscriptions || subscriptions.length === 0) {
+      return [];
     }
-    return await Promise.all(
-      (await this.baseSubscriptionService.listSubscriptions({ ids }, em)).map(
-        async (subscription) => {
-          const stripeSubscription = subscriptions.find(
-            (s) => s.id === subscription.externalId
+    const stripeSubscriptions = await Promise.all(
+      subscriptions.map(async (subscription) => {
+        try {
+          return await this.stripeClient.subscriptions.retrieve(
+            subscription.externalId
           );
-          subscription.stripeFields = stripeSubscription;
-          return subscription;
+        } catch {
+          return null;
         }
-      )
+      })
     );
+    return subscriptions.map((subscription, index) => ({
+      ...subscription,
+      stripeFields: stripeSubscriptions[index]
+    })).filter((subscription) => subscription.stripeFields !== null);
   }
   async cancelSubscription(idDto, em) {
-    await this.stripeClient.subscriptions.cancel(idDto.id);
+    const subscription = await this.baseSubscriptionService.getSubscription(
+      idDto,
+      em
+    );
+    if (!subscription.externalId) {
+      throw new Error("Subscription not found");
+    }
+    await this.stripeClient.subscriptions.cancel(subscription.externalId);
     await this.baseSubscriptionService.cancelSubscription(idDto, em);
   }
   async resumeSubscription(idDto, em) {
-    await this.stripeClient.subscriptions.resume(idDto.id);
+    const subscription = await this.baseSubscriptionService.getSubscription(
+      idDto,
+      em
+    );
+    if (!subscription.externalId) {
+      throw new Error("Subscription not found");
+    }
+    await this.stripeClient.subscriptions.resume(subscription.externalId);
     await this.baseSubscriptionService.resumeSubscription(idDto, em);
   }
 };
@@ -727,6 +768,7 @@ var StripeWebhookService = class {
 
 // services/index.ts
 export * from "@forklaunch/interfaces-billing/interfaces";
+export * from "@forklaunch/interfaces-billing/types";
 export {
   StripeBillingPortalService,
   StripeCheckoutSessionService,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@forklaunch/implementation-billing-stripe",
-  "version": "0.4.3",
+  "version": "0.5.0",
   "description": "Stripe implementation for forklaunch billing",
   "homepage": "https://github.com/forklaunch/forklaunch-js#readme",
   "bugs": {
@@ -42,20 +42,20 @@
     "lib/**"
   ],
   "dependencies": {
-    "@forklaunch/common": "^0.6.14",
-    "@forklaunch/core": "^0.15.3",
-    "@forklaunch/internal": "^0.3.14",
-    "@forklaunch/validator": "^0.10.14",
-    "@mikro-orm/core": "^6.5.6",
+    "@forklaunch/common": "^0.6.17",
+    "@forklaunch/core": "^0.15.6",
+    "@forklaunch/internal": "^0.3.17",
+    "@forklaunch/validator": "^0.10.17",
+    "@mikro-orm/core": "^6.5.7",
     "@sinclair/typebox": "^0.34.41",
     "ajv": "^8.17.1",
-    "stripe": "^18.5.0",
-    "zod": "^4.1.11",
-    "@forklaunch/implementation-billing-base": "0.7.3",
-    "@forklaunch/interfaces-billing": "0.7.3"
+    "stripe": "^19.1.0",
+    "zod": "^4.1.12",
+    "@forklaunch/interfaces-billing": "0.8.0",
+    "@forklaunch/implementation-billing-base": "0.8.0"
   },
   "devDependencies": {
-    "@typescript/native-preview": "7.0.0-dev.20250930.1",
+    "@typescript/native-preview": "7.0.0-dev.20251007.1",
     "depcheck": "^1.4.7",
     "prettier": "^3.6.2",
     "typedoc": "^0.28.13"