BREAKING: rename ApplePayShippingContact to Platformpayshipping contact

flutter-stripe · Dec 11, 2023 · cfd1567 · cfd1567
1 parent 9eb7985
commit cfd1567
Show file tree

Hide file tree

Showing 13 changed files with 572 additions and 309 deletions.
diff --git a/example/lib/screens/wallets/apple_pay_create_payment_method.dart b/example/lib/screens/wallets/apple_pay_create_payment_method.dart
@@ -1,13 +1,15 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_stripe/flutter_stripe.dart';
 import 'package:stripe_example/widgets/example_scaffold.dart';
+import 'package:stripe_example/widgets/response_card.dart';
 
 class ApplePayCreatePaymentMethodScreen extends StatefulWidget {
   @override
   _ApplePayScreenState createState() => _ApplePayScreenState();
 }
 
 class _ApplePayScreenState extends State<ApplePayCreatePaymentMethodScreen> {
+  PlatformPayPaymentMethod? response;
   @override
   void initState() {
     Stripe.instance.isPlatformPaySupportedListenable.addListener(update);
@@ -37,6 +39,10 @@ class _ApplePayScreenState extends State<ApplePayCreatePaymentMethodScreen> {
           )
         else
           Text('Apple Pay is not available in this device'),
+        SizedBox(
+          height: 50,
+        ),
+        ResponseCard(response: response?.toString() ?? ''),
       ],
     );
   }
@@ -76,8 +82,12 @@ class _ApplePayScreenState extends State<ApplePayCreatePaymentMethodScreen> {
       ),
     );
 
+    setState(() {
+      response = paymentMethod;
+    });
+
     ScaffoldMessenger.of(context).showSnackBar(SnackBar(
         content: Text(
-            'Success!: The payment method with id: ${paymentMethod.id} was created successfully,')));
+            'Success!: The payment method with id: ${paymentMethod.paymentMethod.id} was created successfully,')));
   }
 }
diff --git a/packages/stripe/lib/src/stripe.dart b/packages/stripe/lib/src/stripe.dart
@@ -144,7 +144,7 @@ class Stripe {
   /// Creating payment method does not return a token by default. Use `usesDeprecatedTokenFlow` instead.
   ///
   /// throws [StripeError] in case creating payment method is failing.
-  Future<PaymentMethod> createPlatformPayPaymentMethod({
+  Future<PlatformPayPaymentMethod> createPlatformPayPaymentMethod({
     required PlatformPayPaymentMethodParams params,
     bool usesDeprecatedTokenFlow = false,
   }) async {

diff --git a/packages/stripe/lib/src/widgets/apple_pay_button.dart b/packages/stripe/lib/src/widgets/apple_pay_button.dart
@@ -17,7 +17,7 @@ class ApplePayButton extends StatelessWidget {
     Key? key,
     this.style = PlatformButtonStyle.automatic,
     this.type = PlatformButtonType.plain,
-    this.cornerRadius=4,
+    this.cornerRadius = 4,
     this.onPressed,
     double? width,
     double? height = _kApplePayButtonDefaultHeight,
@@ -242,8 +242,8 @@ class _UiKitApplePayButtonState extends State<_UiKitApplePayButton> {
 }
 
 // For some reason json serializable cannot be cast
-ApplePayShippingContact _convertShippingContact(dynamic json) =>
-    ApplePayShippingContact(
+PlatformPayShippingContact _convertShippingContact(dynamic json) =>
+    PlatformPayShippingContact(
       phoneNumber: json['phoneNumber'],
       name: ApplePayContactName(
         familyName: json['name']['familyName'],

diff --git a/packages/stripe_platform_interface/lib/src/method_channel_stripe.dart b/packages/stripe_platform_interface/lib/src/method_channel_stripe.dart
@@ -568,7 +568,7 @@ class MethodChannelStripe extends StripePlatform {
   }
 
   @override
-  Future<PaymentMethod> platformPayCreatePaymentMethod({
+  Future<PlatformPayPaymentMethod> platformPayCreatePaymentMethod({
     required PlatformPayPaymentMethodParams params,
     bool usesDeprecatedTokenFlow = false,
   }) async {
@@ -596,9 +596,11 @@ class MethodChannelStripe extends StripePlatform {
       'usesDeprecatedTokenFlow': usesDeprecatedTokenFlow,
     });
 
-    return ResultParser<PaymentMethod>(
-            parseJson: (json) => PaymentMethod.fromJson(json))
-        .parse(result: result!, successResultKey: 'paymentMethod');
+    if (result!.containsKey('error')) {
+      throw ResultParser<void>(parseJson: (json) => {}).parseError(result);
+    }
+
+    return PlatformPayPaymentMethod.fromJson(result);
   }
 
   @override

diff --git a/packages/stripe_platform_interface/lib/src/models/apple_pay.dart b/packages/stripe_platform_interface/lib/src/models/apple_pay.dart
@@ -1,6 +1,7 @@
 import 'dart:async';
 
 import 'package:freezed_annotation/freezed_annotation.dart';
+import 'package:stripe_platform_interface/src/models/platform_pay.dart';
 
 part 'apple_pay.freezed.dart';
 part 'apple_pay.g.dart';
@@ -202,28 +203,7 @@ class ApplePayErrorAddressField with _$ApplePayErrorAddressField {
       _$ApplePayErrorAddressFieldFromJson(json);
 }
 
-@freezed
-
-/// Entered Shipping contact data
-class ApplePayShippingContact with _$ApplePayShippingContact {
-  @JsonSerializable(explicitToJson: true)
-  const factory ApplePayShippingContact({
-    /// Email address of the shipping contact
-    String? emailAddress,
-
-    /// Name of shipping contact
-    required ApplePayContactName name,
 
-    /// Postal address of shipping contact
-    required ApplePayPostalAddress postalAddress,
-
-    ///Phone Number of the shipping contact
-    String? phoneNumber,
-  }) = _ApplePayShippingContact;
-
-  factory ApplePayShippingContact.fromJson(Map<String, dynamic> json) =>
-      _$ApplePayShippingContactFromJson(json);
-}
 
 @freezed
 
@@ -264,7 +244,7 @@ class ApplePayPostalAddress with _$ApplePayPostalAddress {
 }
 
 typedef OnDidSetShippingContact = FutureOr<void> Function(
-    ApplePayShippingContact contact);
+    PlatformPayShippingContact contact);
 typedef OnDidSetShippingMethod = FutureOr<void> Function(
     ApplePayShippingMethod method);
 typedef OnCouponCodeEntered = FutureOr<void> Function(String couponCode);