Merge branch 'ghMomoFlowUpdate'

Author: bolaware

rave_android/src/main/java/com/flutterwave/raveandroid/ghmobilemoney/GhMobileMoneyFragment.java

@@ -33,6 +33,7 @@
 import com.flutterwave.raveandroid.rave_java_commons.RaveConstants;
 import com.flutterwave.raveandroid.rave_logger.events.StartTypingEvent;
 import com.flutterwave.raveandroid.rave_presentation.data.events.ErrorEvent;
+import com.flutterwave.raveutils.verification.RaveVerificationUtils;
 import com.google.android.material.textfield.TextInputEditText;
 import com.google.android.material.textfield.TextInputLayout;
 
@@ -41,6 +42,7 @@
 import javax.inject.Inject;
 
 import static android.view.View.GONE;
+import static com.flutterwave.raveandroid.rave_java_commons.RaveConstants.WEB_VERIFICATION_REQUEST_CODE;
 
 /**
  * A simple {@link Fragment} subclass.
@@ -224,6 +226,30 @@ public void onPhoneValidated(String phoneToSet, boolean isEditable) {
         phoneEt.setEnabled(isEditable);
     }
 
+    @Override
+    public void showWebPage(String authenticationUrl
+//            , String flwRef
+    ) {
+
+//        this.flwRef = flwRef;
+        new RaveVerificationUtils(this, ravePayInitializer.isStaging(), ravePayInitializer.getPublicKey(), ravePayInitializer.getTheme())
+                .showWebpageVerificationScreen(authenticationUrl);
+    }
+
+
+    @Override
+    public void onActivityResult(int requestCode, int resultCode, Intent data) {
+        if (resultCode == RavePayActivity.RESULT_SUCCESS) {
+            //just to be sure this v sent the receiving intent
+            if (requestCode == WEB_VERIFICATION_REQUEST_CODE) {
+                presenter.requeryTx(ravePayInitializer.getPublicKey());
+            }
+        } else {
+            super.onActivityResult(requestCode, resultCode, data);
+        }
+    }
+
+
     private void showInstructionsAndVoucher(boolean show) {
 
         if (show) {

rave_android/src/main/java/com/flutterwave/raveandroid/ghmobilemoney/NullGhMobileMoneyView.java

@@ -66,4 +66,9 @@ public void onValidationSuccessful(HashMap<String, ViewObject> dataHashMap) {
     public void onPaymentSuccessful(String status, String flwRef, String responseAsString) {
 
     }
+
+    @Override
+    public void showWebPage(String captchaLink) {
+
+    }
 }

rave_presentation/src/main/java/com/flutterwave/raveandroid/rave_presentation/ghmobilemoney/GhMobileMoneyContract.java

@@ -16,6 +16,7 @@ interface Interactor {
         void onPaymentFailed(String message, String responseAsJSONString);
         void onPaymentSuccessful(String status, String flwRef, String responseAsString);
 
+        void showWebPage(String captchaLink);
     }
 
     interface Handler {
@@ -25,5 +26,7 @@ interface Handler {
         void logEvent(Event event, String publicKey);
 
         void cancelPolling();
+
+        void requeryTx(String publicKey);
     }
 }

rave_presentation/src/main/java/com/flutterwave/raveandroid/rave_presentation/ghmobilemoney/GhMobileMoneyHandler.java

@@ -38,6 +38,7 @@ public class GhMobileMoneyHandler implements GhMobileMoneyContract.Handler {
     PayloadEncryptor payloadEncryptor;
     private GhMobileMoneyContract.Interactor mInteractor;
     private boolean pollingCancelled = false;
+    private String txRef = null;
 
     @Inject
     public GhMobileMoneyHandler(GhMobileMoneyContract.Interactor mInteractor) {
@@ -78,6 +79,7 @@ public void onError(String message) {
 
     @Override
     public void chargeGhMobileMoney(final Payload payload, final String encryptionKey) {
+        txRef = payload.getTxRef();
         String cardRequestBodyAsString = Utils.convertChargeRequestPayloadToJson(payload);
         String encryptedCardRequestBody = payloadEncryptor.getEncryptedData(cardRequestBodyAsString, encryptionKey).trim().replaceAll("\\n", "");
 
@@ -96,11 +98,16 @@ public void chargeGhMobileMoney(final Payload payload, final String encryptionKe
             public void onSuccess(MobileMoneyChargeResponse response) {
 
                 mInteractor.showProgressIndicator(false);
-
-                if (response.getData() != null) {
-                    String flwRef = response.getData().getFlwRef();
-                    String txRef = response.getData().getTx_ref();
-                    requeryTx(flwRef, txRef, payload.getPBFPubKey());
+                MobileMoneyChargeResponse.Data data = response.getData();
+                if (data != null) {
+                    if (data.getCode() != null && data.getCode().equals("02")
+                            && data.getCaptchaLink() != null) {
+                        mInteractor.showWebPage(data.getCaptchaLink());
+                    } else {
+                        String flwRef = data.getFlwRef();
+                        String txRef = data.getTx_ref();
+                        requeryTx(flwRef, txRef, payload.getPBFPubKey());
+                    }
                 } else {
                     mInteractor.onPaymentError(noResponse);
                 }
@@ -115,11 +122,17 @@ public void onError(String message) {
         });
     }
 
+    @Override
+    public void requeryTx(final String publicKey) {
+        requeryTx(null, txRef, publicKey);
+    }
+
     @Override
     public void requeryTx(final String flwRef, final String txRef, final String publicKey) {
 
         RequeryRequestBody body = new RequeryRequestBody();
         body.setFlw_ref(flwRef);
+        body.setTx_ref(txRef);
         body.setPBFPubKey(publicKey);
 
         mInteractor.showPollingIndicator(true);

rave_presentation/src/main/java/com/flutterwave/raveandroid/rave_presentation/ghmobilemoney/GhMobileMoneyInteractorImpl.java

@@ -50,6 +50,11 @@ public void onPaymentSuccessful(String status, String flwRef, String responseAsS
         callback.onSuccessful(flwRef);
     }
 
+    @Override
+    public void showWebPage(String captchaLink) {
+        callback.showAuthenticationWebPage(captchaLink);
+    }
+
     @Override
     public void showFetchFeeFailed(String errorMessage) {
         feeCheckListener.onFetchFeeError(errorMessage);

rave_presentation/src/main/java/com/flutterwave/raveandroid/rave_presentation/ghmobilemoney/GhanaMobileMoneyPaymentCallback.java

@@ -8,4 +8,6 @@ public interface GhanaMobileMoneyPaymentCallback {
     void onError(String errorMessage, @Nullable String flwRef);
 
     void onSuccessful(String flwRef);
+
+    void showAuthenticationWebPage(String url);
 }

rave_presentation/src/main/java/com/flutterwave/raveandroid/rave_presentation/ghmobilemoney/GhanaMobileMoneyPaymentManager.java

@@ -39,6 +39,10 @@ public void chargeVodafone(String voucher) {
         charge(vodafone, voucher);
     }
 
+    public void onWebpageAuthenticationComplete() {
+        paymentHandler.requeryTx(manager.getPublicKey());
+    }
+
     private void charge(String network, String voucher) {
         Payload payload = createPayload(network, voucher);
 

rave_presentation/src/main/java/com/flutterwave/raveandroid/rave_presentation/ghmobilemoney/NullGhMobileMoneyPaymentCallback.java

@@ -19,4 +19,9 @@ public void onSuccessful(String flwRef) {
 
     }
 
+    @Override
+    public void showAuthenticationWebPage(String url) {
+
+    }
+
 }

rave_remote/src/main/java/com/flutterwave/raveandroid/rave_remote/requests/RequeryRequestBody.java

@@ -8,6 +8,12 @@ public class RequeryRequestBody {
 
     private String order_ref;
 
+    private String tx_ref;
+
+    public void setTx_ref(String tx_ref) {
+        this.tx_ref = tx_ref;
+    }
+
     public String getPBFPubKey() {
         return PBFPubKey;
     }

rave_remote/src/main/java/com/flutterwave/raveandroid/rave_remote/responses/MobileMoneyChargeResponse.java

@@ -1,5 +1,7 @@
 package com.flutterwave.raveandroid.rave_remote.responses;
 
+import com.google.gson.annotations.SerializedName;
+
 /**
  * Created by hamzafetuga on 18/07/2017.
  */
@@ -38,6 +40,14 @@ public static class Data {
         String chargeResponseCode;
         String authModelUsed;
         String flwRef;
+        String txRef;
+        String chargeResponseMessage;
+        String authurl;
+        String redirectUrl;
+        @SerializedName("link")
+        String captchaLink;
+        String code;
+
 
         public void setFlwRef(String flwRef) {
             this.flwRef = flwRef;
@@ -55,10 +65,6 @@ public void setTx_ref(String txRef) {
             this.txRef = txRef;
         }
 
-        String txRef;
-        String chargeResponseMessage;
-        String authurl;
-
         public String getRedirectUrl() {
             return redirectUrl;
         }
@@ -67,7 +73,6 @@ public void setChargeResponseCode(String chargeResponseCode) {
             this.chargeResponseCode = chargeResponseCode;
         }
 
-        String redirectUrl;
 
         public String getAuthurl() {
             return authurl;
@@ -94,5 +99,18 @@ public String getSuggested_auth() {
             return suggested_auth;
         }
 
+
+        public String getTxRef() {
+            return txRef;
+        }
+
+        public String getCaptchaLink() {
+            return captchaLink;
+        }
+
+        public String getCode() {
+            return code;
+        }
+
     }
 }