wip

Author: panteliselef

packages/clerk-js/src/core/modules/billing/namespace.ts

@@ -29,7 +29,7 @@ import {
 
 export class Billing implements BillingNamespace {
   static readonly #pathRoot = '/billing';
-  static path(subPath: string, param?: { orgId?: string }): string {
+  static path(subPath: string, param?: { orgId?: string | null }): string {
     const { orgId } = param || {};
     const prefix = orgId ? `/organizations/${orgId}` : '/me';
     return `${prefix}${Billing.#pathRoot}${subPath}`;

packages/clerk-js/src/core/resources/BillingPayment.ts

@@ -18,7 +18,7 @@ export class BillingPayment extends BaseResource implements BillingPaymentResour
   failedAt?: Date;
   paidAt?: Date;
   updatedAt!: Date;
-  paymentMethod!: BillingPaymentMethodResource;
+  paymentMethod: BillingPaymentMethodResource | null = null;
   subscriptionItem!: BillingSubscriptionItemResource;
   chargeType!: BillingPaymentChargeType;
   status!: BillingPaymentStatus;
@@ -38,7 +38,7 @@ export class BillingPayment extends BaseResource implements BillingPaymentResour
     this.paidAt = data.paid_at ? unixEpochToDate(data.paid_at) : undefined;
     this.failedAt = data.failed_at ? unixEpochToDate(data.failed_at) : undefined;
     this.updatedAt = unixEpochToDate(data.updated_at);
-    this.paymentMethod = new BillingPaymentMethod(data.payment_method);
+    this.paymentMethod = data.payment_method ? new BillingPaymentMethod(data.payment_method) : null;
     this.subscriptionItem = new BillingSubscriptionItem(data.subscription_item);
     this.chargeType = data.charge_type;
     this.status = data.status;

packages/clerk-js/src/core/resources/BillingSubscription.ts

@@ -60,7 +60,6 @@ export class BillingSubscription extends BaseResource implements BillingSubscrip
 
 export class BillingSubscriptionItem extends BaseResource implements BillingSubscriptionItemResource {
   id!: string;
-  paymentMethodId!: string;
   plan!: BillingPlan;
   planPeriod!: BillingSubscriptionPlanPeriod;
   status!: BillingSubscriptionStatus;
@@ -87,7 +86,6 @@ export class BillingSubscriptionItem extends BaseResource implements BillingSubs
     }
 
     this.id = data.id;
-    this.paymentMethodId = data.payment_method_id;
     this.plan = new BillingPlan(data.plan);
     this.planPeriod = data.plan_period;
     this.status = data.status;

packages/shared/src/types/billing.ts

@@ -407,7 +407,7 @@ export interface BillingPaymentResource extends ClerkResource {
   /**
    * The payment method being used for the payment, such as credit card or bank account.
    */
-  paymentMethod: BillingPaymentMethodResource;
+  paymentMethod: BillingPaymentMethodResource | null;
   /**
    * The subscription item being paid for.
    */
@@ -506,11 +506,6 @@ export interface BillingSubscriptionItemResource extends ClerkResource {
    * The unique identifier for the subscription item.
    */
   id: string;
-  /**
-   * The unique identifier for the payment method being used for the subscription item.
-   */
-  //TODO(@COMMERCE): should this be nullable ?
-  paymentMethodId: string;
   /**
    * The plan associated with the subscription item.
    */
@@ -700,6 +695,7 @@ export interface BillingCheckoutTotals {
  *
  * @experimental This is an experimental API for the Billing feature that is available under a public beta, and the API is subject to change. It is advised to [pin](https://clerk.com/docs/pinning) the SDK version and the clerk-js version to avoid breaking changes.
  */
+// eslint-disable-next-line @typescript-eslint/no-empty-object-type
 export interface BillingStatementTotals extends Omit<BillingCheckoutTotals, 'totalDueNow' | 'totalDueAfterFreeTrial'> {}
 
 /**

packages/shared/src/types/json.ts

@@ -865,6 +865,10 @@ export interface ApiKeyJSON extends ClerkResourceJSON {
   expiration: number | null;
   created_by: string | null;
   description: string | null;
+  /**
+   * This property is only present in the response from `create()`.
+   */
+  secret?: string;
   last_used_at: number | null;
   created_at: number;
   updated_at: number;