chore: updated the checkout function

wilburx9 · wilburx9 · commit a1dea54ce940 · 2020-08-23T22:31:27.000+01:00
diff --git a/example/lib/main.dart b/example/lib/main.dart
@@ -152,7 +152,7 @@ class _HomePageState extends State<HomePage> {
                     primaryColorLight: Colors.white,
                     primaryColorDark: navyBlue,
                     textTheme: Theme.of(context).textTheme.copyWith(
-                      bodyText2: TextStyle(
+                          bodyText2: TextStyle(
                             color: lightBlue,
                           ),
                         ),
@@ -311,40 +311,24 @@ class _HomePageState extends State<HomePage> {
     }
   }
 
-  _chargeCard(Charge charge) {
-    // This is called only before requesting OTP
-    // Save reference so you may send to server if error occurs with OTP
-    handleBeforeValidate(Transaction transaction) {
-      _updateStatus(transaction.reference, 'validating...');
-    }
+  _chargeCard(Charge charge) async {
+    final response = await PaystackPlugin.chargeCard(context, charge: charge);
 
-    handleOnError(Object e, Transaction transaction) {
-      // If an access code has expired, simply ask your server for a new one
-      // and restart the charge instead of displaying error
-      if (e is ExpiredAccessCodeException) {
-        _startAfreshCharge();
-        _chargeCard(charge);
-        return;
-      }
-
-      if (transaction.reference != null) {
-        _verifyOnServer(transaction.reference);
-      } else {
-        setState(() => _inProgress = false);
-        _updateStatus(transaction.reference, e.toString());
-      }
-    }
+    final reference = response.reference;
 
-    // This is called only after transaction is successful
-    handleOnSuccess(Transaction transaction) {
-      _verifyOnServer(transaction.reference);
+    // Checking if the transaction is successful
+    if (response.status) {
+      _verifyOnServer(reference);
+      return;
     }
 
-    PaystackPlugin.chargeCard(context,
-        charge: charge,
-        beforeValidate: (transaction) => handleBeforeValidate(transaction),
-        onSuccess: (transaction) => handleOnSuccess(transaction),
-        onError: (error, transaction) => handleOnError(error, transaction));
+    // The transaction failed. Checking if we should verify the transaction
+    if (response.verify) {
+      _verifyOnServer(reference);
+    } else {
+      setState(() => _inProgress = false);
+      _updateStatus(reference, response.message);
+    }
   }
 
   String _getReference() {
diff --git a/lib/src/common/paystack.dart b/lib/src/common/paystack.dart
@@ -80,6 +80,12 @@ class PaystackPlugin {
   static void _performChecks() {
     //validate that sdk has been initialized
     Utils.validateSdkInitialized();
+    //check for null value, and length and starts with pk_
+    if (_publicKey == null ||
+        _publicKey.isEmpty ||
+        !_publicKey.startsWith("pk_")) {
+      throw new AuthenticationException(Utils.getKeyErrorMsg('public'));
+    }
   }
 
   /// Make payment by charging the user's card
@@ -93,16 +99,22 @@ class PaystackPlugin {
   /// [onSuccess] - Called when the payment is completes successfully
   ///
   /// [onError] - Called when the payment completes with an unrecoverable error
-  static chargeCard(BuildContext context,
-      {@required Charge charge,
-      @required OnTransactionChange<Transaction> beforeValidate,
-      @required OnTransactionChange<Transaction> onSuccess,
-      @required OnTransactionError<Object, Transaction> onError}) {
-    assert(context != null, 'context must not be null');
+  ///
 
+  static Future<CheckoutResponse> chargeCard(
+      BuildContext context,
+      {@required
+          Charge charge,
+      @Deprecated("Use the CheckoutResponse from this function instead. Will be removed in 1.1.0")
+          OnTransactionChange<Transaction> beforeValidate,
+      @Deprecated("Use the CheckoutResponse from this function instead. Will be removed in 1.1.0")
+          OnTransactionChange<Transaction> onSuccess,
+      @Deprecated("Use the CheckoutResponse from this function instead. Will be removed in 1.1.0")
+          OnTransactionError<Object, Transaction> onError}) {
+    assert(context != null, 'context must not be null');
     _performChecks();
 
-    _Paystack(publicKey).chargeCard(
+    return _Paystack().chargeCard(
         context: context,
         charge: charge,
         beforeValidate: beforeValidate,
@@ -158,10 +170,10 @@ class PaystackPlugin {
         method != null,
         'method must not be null. You can pass CheckoutMethod.selectable if you want '
         'the user to select the checkout option');
-    assert(fullscreen != null, 'fillscreen must not be null');
+    assert(fullscreen != null, 'fullscreen must not be null');
     assert(hideAmount != null, 'hideAmount must not be null');
     assert(hideEmail != null, 'hideEmail must not be null');
-    return _Paystack(publicKey).checkout(
+    return _Paystack().checkout(
       context,
       charge: charge,
       method: method,
@@ -173,40 +185,66 @@ class PaystackPlugin {
   }
 }
 
+// TODO: Remove beforeValidate, onSuccess, and onError in v1.1.0
 class _Paystack {
-  String _publicKey;
-
-  _Paystack(this._publicKey);
-
-  chargeCard(
+  Future<CheckoutResponse> chargeCard(
       {@required BuildContext context,
       @required Charge charge,
-      @required OnTransactionChange<Transaction> beforeValidate,
-      @required OnTransactionChange<Transaction> onSuccess,
-      @required OnTransactionError<Object, Transaction> onError}) {
+      OnTransactionChange<Transaction> beforeValidate,
+      OnTransactionChange<Transaction> onSuccess,
+      OnTransactionError<Object, Transaction> onError}) {
+    final completer = Completer<CheckoutResponse>();
     try {
-      //check for null value, and length and starts with pk_
-      if (_publicKey == null ||
-          _publicKey.isEmpty ||
-          !_publicKey.startsWith("pk_")) {
-        throw new AuthenticationException(Utils.getKeyErrorMsg('public'));
-      }
+      final manager = new CardTransactionManager(
+          service: CardService(),
+          charge: charge,
+          context: context,
+          beforeValidate: (t) {
+            if (beforeValidate != null) beforeValidate(t);
+          },
+          onSuccess: (t) {
+            completer.complete(CheckoutResponse(
+                message: t.message,
+                reference: t.reference,
+                status: true,
+                card: charge.card..nullifyNumber(),
+                method: CheckoutMethod.card,
+                verify: true));
+
+            if (onSuccess != null) onSuccess(t);
+            t?.message;
+          },
+          onError: (o, t) {
+            completer.complete(CheckoutResponse(
+                message: o.toString(),
+                reference: t.reference,
+                status: false,
+                card: charge.card..nullifyNumber(),
+                method: CheckoutMethod.card,
+                verify: !(o is PaystackException)));
+
+            if (onError != null) onError(o, t);
+          });
 
-      new CardTransactionManager(
-              service: CardService(),
-              charge: charge,
-              context: context,
-              beforeValidate: beforeValidate,
-              onSuccess: onSuccess,
-              onError: onError)
-          .chargeCard();
+      manager.chargeCard();
     } catch (e) {
-      if (e is AuthenticationException) {
-        rethrow;
+      final message = e is PaystackException ? e.message : Strings.sthWentWrong;
+      completer.complete(CheckoutResponse(
+          message: message,
+          reference: charge.reference,
+          status: false,
+          card: charge.card..nullifyNumber(),
+          method: CheckoutMethod.card,
+          verify: !(e is PaystackException)));
+
+      if (onError != null) {
+        if (e is AuthenticationException) {
+          rethrow;
+        }
+        onError(e, null);
       }
-      assert(onError != null);
-      onError(e, null);
     }
+    return completer.future;
   }
 
   Future<CheckoutResponse> checkout(
diff --git a/lib/src/models/checkout_response.dart b/lib/src/models/checkout_response.dart
@@ -27,8 +27,10 @@ class CheckoutResponse {
   /// The means of payment. It may return [CheckoutMethod.bank] or [CheckoutMethod.card]
   CheckoutMethod method;
 
-  /// If the transaction should be verified. See https://developers.paystack.co/v2.0/reference#verify-transaction
-  /// This might return true regardless whether a transaction fails or not.
+  /// If the transaction should be verified. See https://developers.paystack.co/v2.0/reference#verify-transaction.
+  /// This is usually false for transactions that didn't reach Paystack before terminating
+  ///
+  /// It might return true regardless whether a transaction fails or not.
   bool verify;
 
   CheckoutResponse.defaults() {
