Merge branch 'release/1.0.7' of github.com:Flutterwave/Flutter_Standard into develop

FredDominant · FredDominant · commit 9e76455152b1 · 2023-02-20T09:59:11.000+01:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## [1.0.7] - February, 2023
+* Fixed iOS bug where webview couldn't close when close buttons are clicked
+* Removed required `name` and `phone number` fields in `Customer` object
+
 ## [1.0.6] - October, 2022
 * Fixed bug where transaction gets stuck after redirecting on webview
 * Fixed iOS build bug by removing inAppBrowser library
diff --git a/README.md b/README.md
@@ -34,7 +34,7 @@ Available features include:
 
 ## Installation
 
-1. Add the dependency to your project. In your `pubspec.yaml` file add: `flutterwave_standard: 1.0.5`
+1. Add the dependency to your project. In your `pubspec.yaml` file add: `flutterwave_standard: 1.0.7`
 2. Run `flutter pub get`
 
 
diff --git a/example/ios/Podfile.lock b/example/ios/Podfile.lock
@@ -1,32 +1,46 @@
 PODS:
   - Flutter (1.0.0)
+  - flutter_inappwebview (0.0.1):
+    - Flutter
+    - flutter_inappwebview/Core (= 0.0.1)
+    - OrderedSet (~> 5.0)
+  - flutter_inappwebview/Core (0.0.1):
+    - Flutter
+    - OrderedSet (~> 5.0)
   - fluttertoast (0.0.2):
     - Flutter
     - Toast
+  - OrderedSet (5.0.0)
   - Toast (4.0.0)
   - webview_flutter_wkwebview (0.0.1):
     - Flutter
 
 DEPENDENCIES:
   - Flutter (from `Flutter`)
+  - flutter_inappwebview (from `.symlinks/plugins/flutter_inappwebview/ios`)
   - fluttertoast (from `.symlinks/plugins/fluttertoast/ios`)
   - webview_flutter_wkwebview (from `.symlinks/plugins/webview_flutter_wkwebview/ios`)
 
 SPEC REPOS:
   trunk:
+    - OrderedSet
     - Toast
 
 EXTERNAL SOURCES:
   Flutter:
     :path: Flutter
+  flutter_inappwebview:
+    :path: ".symlinks/plugins/flutter_inappwebview/ios"
   fluttertoast:
     :path: ".symlinks/plugins/fluttertoast/ios"
   webview_flutter_wkwebview:
     :path: ".symlinks/plugins/webview_flutter_wkwebview/ios"
 
 SPEC CHECKSUMS:
   Flutter: 50d75fe2f02b26cc09d224853bb45737f8b3214a
+  flutter_inappwebview: bfd58618f49dc62f2676de690fc6dcda1d6c3721
   fluttertoast: 6122fa75143e992b1d3470f61000f591a798cc58
+  OrderedSet: aaeb196f7fef5a9edf55d89760da9176ad40b93c
   Toast: 91b396c56ee72a5790816f40d3a94dd357abc196
   webview_flutter_wkwebview: b7e70ef1ddded7e69c796c7390ee74180182971f
 
diff --git a/example/lib/main.dart b/example/lib/main.dart
@@ -10,6 +10,7 @@ class MyApp extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return MaterialApp(
+      debugShowCheckedModeBanner: false,
       title: 'Flutter Standard Demo',
       home: MyHomePage('Flutterwave Standard'),
     );
@@ -170,10 +171,7 @@ class _MyHomePageState extends State<MyHomePage> {
   }
 
   _handlePaymentInitialization() async {
-    final Customer customer = Customer(
-        name: "FLW Developer",
-        phoneNumber: this.phoneNumberController.text ?? "12345678",
-        email: "customer@customer.com");
+    final Customer customer = Customer(email: "customer@customer.com");
 
     final Flutterwave flutterwave = Flutterwave(
         context: context,
@@ -198,8 +196,7 @@ class _MyHomePageState extends State<MyHomePage> {
   }
 
   String getPublicKey() {
-    if (isTestMode) return "FLWPUBK_TEST--X";
-    return "FLWPUBK--X";
+    return "";
   }
 
   void _openBottomSheet() {
@@ -248,7 +245,7 @@ class _MyHomePageState extends State<MyHomePage> {
   Future<void> showLoading(String message) {
     return showDialog(
       context: this.context,
-      barrierDismissible: false,
+      barrierDismissible: true,
       builder: (BuildContext context) {
         return AlertDialog(
           content: Container(
diff --git a/example/pubspec.lock b/example/pubspec.lock
@@ -69,6 +69,13 @@ packages:
     description: flutter
     source: sdk
     version: "0.0.0"
+  flutter_inappwebview:
+    dependency: transitive
+    description:
+      name: flutter_inappwebview
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "5.7.2+3"
   flutter_test:
     dependency: "direct dev"
     description: flutter
diff --git a/example/pubspec.yaml b/example/pubspec.yaml
@@ -11,7 +11,6 @@ dependencies:
     sdk: flutter
   flutterwave_standard:
     path: "../"
-#  flutterwave_standard: ^1.0.4
   cupertino_icons: ^0.1.3
   uuid: 3.0.4
 
diff --git a/lib/core/TransactionCallBack.dart b/lib/core/TransactionCallBack.dart
@@ -1,5 +1,5 @@
+import 'package:flutterwave_standard/flutterwave.dart';
+
 abstract class TransactionCallBack {
-  onTransactionSuccess(String id, String txRef);
-  onTransactionError();
-  onCancelled();
+  onTransactionComplete(ChargeResponse? chargeResponse);
 }
diff --git a/lib/core/flutterwave.dart b/lib/core/flutterwave.dart
@@ -5,8 +5,9 @@ import 'package:flutterwave_standard/models/requests/standard_request.dart';
 import 'package:flutterwave_standard/models/responses/charge_response.dart';
 import 'package:flutterwave_standard/models/responses/standard_response.dart';
 import 'package:flutterwave_standard/models/subaccount.dart';
+import 'package:flutterwave_standard/utils.dart';
 import 'package:flutterwave_standard/view/flutterwave_style.dart';
-import 'package:flutterwave_standard/view/standard_webview.dart';
+import 'package:flutterwave_standard/view/standard_widget.dart';
 import 'package:flutterwave_standard/view/view_utils.dart';
 import 'package:http/http.dart';
 
@@ -20,11 +21,12 @@ class Flutterwave {
   String publicKey;
   String paymentOptions;
   String redirectUrl;
-  String? currency;
+  String currency;
   String? paymentPlanId;
   List<SubAccount>? subAccounts;
   Map<dynamic, dynamic>? meta;
   FlutterwaveStyle? style;
+  ChargeResponse? response;
 
   Flutterwave(
       {required this.context,
@@ -36,13 +38,13 @@ class Flutterwave {
       required this.customization,
       required this.redirectUrl,
       required this.isTestMode,
-      this.currency,
+      required this.currency,
       this.paymentPlanId,
       this.subAccounts,
       this.meta,
       this.style});
 
-  /// Starts Standard Transaction
+  /// Starts a transaction by calling the Standard service
   Future<ChargeResponse> charge() async {
     final request = StandardRequest(
         txRef: txRef,
@@ -83,24 +85,17 @@ class Flutterwave {
           txRef: request.txRef, status: "error", success: false);
     }
 
-    final transactionResult = await Navigator.push(
-      context,
-      MaterialPageRoute(
-        builder: (context) => StandardWebView(
-          url: standardResponse!.data!.link!,
+    final response = await Navigator.push(
+        context,
+        MaterialPageRoute(
+          builder: (context) => StandardPaymentWidget(
+            webUrl: standardResponse!.data!.link!,
+          ),
         ),
-      ),
-    );
+      );
 
-    if (transactionResult == null) {
-      return ChargeResponse(
-          txRef: request.txRef, status: "cancelled", success: false);
-    }
-    if (transactionResult.runtimeType == ChargeResponse().runtimeType) {
-      return transactionResult;
+    if (response != null) return response!;
+    return ChargeResponse(txRef: request.txRef, status: "cancelled", success: false);
     }
 
-    return ChargeResponse(
-        txRef: request.txRef, status: "cancelled", success: false);
-  }
 }
diff --git a/lib/models/requests/customer.dart b/lib/models/requests/customer.dart
@@ -2,17 +2,17 @@ import '../../utils.dart';
 
 class Customer {
   String email;
-  String phoneNumber;
-  String name;
+  String? phoneNumber;
+  String? name;
 
-  Customer({required this.name, required this.phoneNumber, required this.email});
+  Customer({required this.email, this.name, this.phoneNumber});
 
   /// Converts instance of Customer to json
   Map<String, dynamic> toJson() {
     final customer =  {
       "email": this.email,
-      "phonenumber": this.phoneNumber,
-      "name": this.name
+      "phonenumber": this.phoneNumber ?? "",
+      "name": this.name ?? ""
     };
     return Utils.removeKeysWithEmptyValues(customer);
   }
diff --git a/lib/utils.dart b/lib/utils.dart
@@ -3,6 +3,7 @@ class Utils {
   static const String STANDARD_PAYMENT = "payments";
   static const _DEBUG_BASE_URL =
       "https://ravesandboxapi.flutterwave.com/v3/sdkcheckout/";
+  static const DEFAULT_CURRENCY = "NGN";
 
   /// Returns base url depending on test mode
   static String getBaseUrl(final bool isTestMode) {
diff --git a/lib/view/flutterwave_in_app_browser.dart b/lib/view/flutterwave_in_app_browser.dart
@@ -0,0 +1,92 @@
+import 'dart:convert';
+
+import 'package:flutter_inappwebview/flutter_inappwebview.dart';
+import 'package:flutterwave_standard/core/TransactionCallBack.dart';
+
+import '../models/responses/charge_response.dart';
+
+class FlutterwaveInAppBrowser extends InAppBrowser {
+
+  final TransactionCallBack callBack;
+
+  FlutterwaveInAppBrowser({required this.callBack});
+
+  ChargeResponse? _chargeResponse;
+
+  @override
+  Future onLoadStart(url) async {
+    if (url != null) _processUrl(url);
+  }
+
+  @override
+  void onExit() {
+    callBack.onTransactionComplete(_chargeResponse);
+  }
+
+  _processUrl(Uri uri) {
+    if (_checkHasAppendedWithResponse(uri)) {
+      _finishWithAppendedResponse(uri);
+    } else {
+      _checkHasCompletedProcessing(uri);
+    }
+  }
+
+  _checkHasCompletedProcessing(final Uri uri) {
+    final status = uri.queryParameters["status"];
+    final txRef = uri.queryParameters["tx_ref"];
+    final id = uri.queryParameters["transaction_id"];
+    if (status != null && txRef != null) {
+      _finish(uri);
+    }
+  }
+
+  bool _checkHasAppendedWithResponse(final Uri uri) {
+    final response = uri.queryParameters["response"];
+    if (response != null) {
+      final json = jsonDecode(response);
+      final status = json["status"];
+      final txRef = json["txRef"];
+      return status != null && txRef != null;
+    }
+    return false;
+  }
+
+  _finishWithAppendedResponse(Uri uri) {
+    final response = uri.queryParameters["response"];
+    final decoded = Uri.decodeFull(response!);
+    final json = jsonDecode(decoded);
+    final status = json["status"];
+    final txRef = json["txRef"];
+    final id = json["id"];
+
+    final ChargeResponse chargeResponse = ChargeResponse(
+        status: status,
+        transactionId: "$id",
+        txRef: txRef,
+        success: status?.contains("success") == true
+    );
+    _closeTransactionScreen(chargeResponse);
+    // callBack.onTransactionComplete(chargeResponse);
+    // close();
+  }
+
+  _finish(final Uri uri) {
+    final status = uri.queryParameters["status"];
+    final txRef = uri.queryParameters["tx_ref"];
+    final id = uri.queryParameters["transaction_id"];
+    final ChargeResponse chargeResponse = ChargeResponse(
+        status: status,
+        transactionId: id,
+        txRef: txRef,
+        success: status?.contains("success") == true
+    );
+    _closeTransactionScreen(chargeResponse);
+    // callBack.onTransactionComplete(chargeResponse);
+    // close();
+  }
+
+  _closeTransactionScreen(final ChargeResponse chargeResponse) {
+    _chargeResponse = chargeResponse;
+    close();
+  }
+}
diff --git a/lib/view/standard_webview.dart b/lib/view/standard_webview.dart
@@ -10,6 +10,7 @@ import 'package:webview_flutter/webview_flutter.dart';
 
 import 'flutterwave_style.dart';
 
+@deprecated
 class StandardWebView extends StatefulWidget {
   final String url;
   final FlutterwaveStyle? style;
diff --git a/lib/view/standard_widget.dart b/lib/view/standard_widget.dart
@@ -0,0 +1,48 @@
+import 'package:flutter/material.dart';
+import 'package:flutter/widgets.dart';
+import 'package:flutter_inappwebview/flutter_inappwebview.dart';
+import 'package:flutterwave_standard/core/TransactionCallBack.dart';
+import 'package:flutterwave_standard/models/responses/charge_response.dart';
+
+import 'flutterwave_in_app_browser.dart';
+
+class StandardPaymentWidget extends StatefulWidget {
+
+  final String webUrl;
+
+  StandardPaymentWidget({ required this.webUrl });
+
+  @override
+  _StandardPaymentWidgetAppState createState() => new _StandardPaymentWidgetAppState();
+}
+
+class _StandardPaymentWidgetAppState extends State<StandardPaymentWidget> implements TransactionCallBack {
+
+  var options = InAppBrowserClassOptions(
+    crossPlatform: InAppBrowserOptions(hideUrlBar: true),
+    inAppWebViewGroupOptions: InAppWebViewGroupOptions(
+      crossPlatform: InAppWebViewOptions(javaScriptEnabled: true),
+    ),
+  );
+
+  @override
+  void initState() {
+    super.initState();
+    final browser = FlutterwaveInAppBrowser(callBack: this);
+    browser.openUrlRequest(urlRequest: URLRequest(url: Uri.parse(widget.webUrl)), options: options);
+  }
+
+  @override
+  onTransactionComplete(ChargeResponse? chargeResponse) {
+    Navigator.pop(context, chargeResponse);
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+      body: Container(),
+      backgroundColor: Colors.white,
+    );
+  }
+
+}
diff --git a/pubspec.lock b/pubspec.lock
diff --git a/pubspec.yaml b/pubspec.yaml

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
	`1`	`+import 'package:flutterwave_standard/flutterwave.dart';`
	`2`	`+`
`1`	`3`	`abstract class TransactionCallBack {`
`2`		`- onTransactionSuccess(String id, String txRef);`
`3`		`- onTransactionError();`
`4`		`- onCancelled();`
	`4`	`+ onTransactionComplete(ChargeResponse? chargeResponse);`
`5`	`5`	`}`