Merge pull request #388 from beabee-communityrm/feat/billing-from-stripe

feat: get billing address from Stripe

src/api/controllers/SignupController.ts

@@ -69,12 +69,7 @@ export class SignupController {
     }
 
     // Merge additional data into the join form
-    if (
-      data.firstname ||
-      data.lastname ||
-      data.billingAddress ||
-      data.vatNumber
-    ) {
+    if (data.firstname || data.lastname || data.vatNumber) {
       Object.assign(joinFlow.joinForm, data);
       await getRepository(JoinFlow).save(joinFlow);
     }

src/api/dto/SignupFlowDto.ts

@@ -42,8 +42,7 @@ export class StartSignupFlowDto implements CompleteUrls {
 
 export class CompleteSignupFlowDto
   extends CompleteJoinFlowDto
-  implements
-    Pick<JoinForm, "firstname" | "lastname" | "billingAddress" | "vatNumber">
+  implements Pick<JoinForm, "firstname" | "lastname" | "vatNumber">
 {
   @IsOptional()
   @IsString()
@@ -53,11 +52,6 @@ export class CompleteSignupFlowDto
   @IsString()
   lastname?: string;
 
-  @IsOptional()
-  @ValidateNested()
-  @Type(() => UpdateAddressDto)
-  billingAddress?: UpdateAddressDto;
-
   @IsOptional()
   @IsString()
   vatNumber?: string;

src/core/providers/payment/StripeProvider.ts

@@ -81,18 +81,23 @@ export default class StripeProvider extends PaymentProvider<StripePaymentData> {
   }
 
   async updatePaymentMethod(flow: CompletedPaymentFlow): Promise<void> {
+    const paymentMethod = await stripe.paymentMethods.retrieve(flow.mandateId);
+    const address = paymentMethod.billing_details.address;
+
     const customerData: Stripe.CustomerUpdateParams = {
       invoice_settings: {
         default_payment_method: flow.mandateId
       },
-      ...(flow.joinForm.billingAddress && {
-        address: {
-          line1: flow.joinForm.billingAddress.line1,
-          line2: flow.joinForm.billingAddress.line2 || "",
-          city: flow.joinForm.billingAddress.city,
-          postal_code: flow.joinForm.billingAddress.postcode
-        }
-      })
+      address: address
+        ? {
+            line1: address.line1 || "",
+            ...(address.city && { city: address.city }),
+            ...(address.country && { country: address.country }),
+            ...(address.line2 && { line2: address.line2 }),
+            ...(address.postal_code && { postal_code: address.postal_code }),
+            ...(address.state && { state: address.state })
+          }
+        : null
     };
 
     if (this.data.customerId) {

src/migrations/1712163090314-RemoveJoinFormBillingAddress.ts

@@ -0,0 +1,19 @@
+import { MigrationInterface, QueryRunner } from "typeorm";
+
+export class RemoveJoinFormBillingAddress1712163090314
+  implements MigrationInterface
+{
+  name = "RemoveJoinFormBillingAddress1712163090314";
+
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      `ALTER TABLE "join_flow" DROP COLUMN "joinFormBillingaddress"`
+    );
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      `ALTER TABLE "join_flow" ADD "joinFormBillingaddress" jsonb`
+    );
+  }
+}

src/models/JoinForm.ts

@@ -39,9 +39,6 @@ export default class JoinForm implements PaymentForm, ReferralGiftForm {
   @Column({ type: String, nullable: true })
   lastname?: string | null;
 
-  @Column({ type: "jsonb", nullable: true })
-  billingAddress?: Address | null;
-
   @Column({ type: String, nullable: true })
   vatNumber?: string | null;