Update card checks

Author: jeremiahAI

rave_java_commons/src/main/java/com/flutterwave/raveandroid/rave_java_commons/RaveConstants.java

@@ -32,7 +32,7 @@ public class RaveConstants {
 //    public static String LIVE_URL = "https://raveapi.azurewebsites.net";
     public static String STAGING_URL = "https://ravesandboxapi.flutterwave.com";
     public static String LIVE_URL = "https://api.ravepay.co";
-    public static String CARD_CHECK_URL = "https://lookup.binlist.net";
+    public static String CARD_CHECK_URL = "https://9wd5x7szl1.execute-api.eu-west-2.amazonaws.com";
     public static String EVENT_LOGGING_URL = "https://kgelfdz7mf.execute-api.us-east-1.amazonaws.com/";
     public static String FLUTTERWAVE_UK_ACCOUNT = "43271228";
     public static String FLUTTERWAVE_UK_SORT_CODE = "04-00-53";

rave_presentation/src/main/java/com/flutterwave/raveandroid/rave_presentation/card/CardPaymentHandler.java

@@ -198,23 +198,24 @@ public void checkCard(String cardFirstSix, final Payload body, final Boolean isD
             public void onSuccess(CheckCardResponse response) {
                 mCardInteractor.showProgressIndicator(false);
 
-                if (response != null && response.getCountry() != null && response.getCountry().getAlpha2() != null) {
-                    if (response.getCountry().getAlpha2().equalsIgnoreCase(barterCountry)) {
+                try{
+                    if (response.getCountry().split(" ")[1].equalsIgnoreCase(barterCountry)){
                         continueCharge( isDisplayFee,  body,  encryptionKey);
                     } else {
                         mCardInteractor.onPaymentError(cardNotAllowed);
                     }
 
-                } else {
+                } catch (Exception ignored){
                     continueCharge(isDisplayFee, body, encryptionKey);
                 }
 
             }
 
             @Override
             public void onError(String message) {
-                mCardInteractor.showProgressIndicator(false);
-                mCardInteractor.onPaymentError(message);
+                continueCharge(isDisplayFee, body, encryptionKey);
+//                mCardInteractor.showProgressIndicator(false);
+//                mCardInteractor.onPaymentError(message);
             }
         });
 

rave_remote/src/main/java/com/flutterwave/raveandroid/rave_remote/ApiService.java

@@ -2,6 +2,7 @@
 
 
 import com.flutterwave.raveandroid.rave_java_commons.Payload;
+import com.flutterwave.raveandroid.rave_remote.requests.CardCheckRequest;
 import com.flutterwave.raveandroid.rave_remote.requests.ChargeRequestBody;
 import com.flutterwave.raveandroid.rave_remote.requests.LookupSavedCardsRequestBody;
 import com.flutterwave.raveandroid.rave_remote.requests.RemoveSavedCardRequestBody;
@@ -30,8 +31,8 @@ public interface ApiService {
 //    Call<ChargeResponse> charge(@Body ChargeRequestBody body);
     Call<String> charge(@Body ChargeRequestBody body);
 
-    @GET("/{card-first-six}")
-    Call<String> checkCard(@Path("card-first-six") String cardFirstSix);
+    @POST("/binapi/bin/details")
+    Call<String> checkCard(@Body() CardCheckRequest body);
 
     @POST("/flwv3-pug/getpaidx/api/charge?use_polling=1")
 //    Call<ChargeResponse> charge(@Body ChargeRequestBody body);

rave_remote/src/main/java/com/flutterwave/raveandroid/rave_remote/RemoteRepository.java

@@ -7,6 +7,7 @@
 import com.flutterwave.raveandroid.rave_java_commons.NetworkRequestExecutor;
 import com.flutterwave.raveandroid.rave_java_commons.Payload;
 import com.flutterwave.raveandroid.rave_java_commons.RaveConstants;
+import com.flutterwave.raveandroid.rave_remote.requests.CardCheckRequest;
 import com.flutterwave.raveandroid.rave_remote.requests.ChargeRequestBody;
 import com.flutterwave.raveandroid.rave_remote.requests.LookupSavedCardsRequestBody;
 import com.flutterwave.raveandroid.rave_remote.requests.RemoveSavedCardRequestBody;
@@ -81,8 +82,7 @@ public void charge(ChargeRequestBody body, final ResultCallback callback) {
 
     public void checkCard(String cardFirstSix, final ResultCallback callback) {
 
-
-        executor.execute(barterService.checkCard(cardFirstSix),
+        executor.execute(barterService.checkCard(new CardCheckRequest(cardFirstSix)),
                 new TypeToken<CheckCardResponse>() {
                 }.getType(),
                 new GenericNetworkCallback<CheckCardResponse>(callback)

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

@@ -0,0 +1,10 @@
+package com.flutterwave.raveandroid.rave_remote.requests;
+
+public class CardCheckRequest {
+    String cardbin;
+
+    public CardCheckRequest(String cardbin){
+        this.cardbin = cardbin;
+    }
+
+}

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

@@ -1,125 +1,58 @@
 package com.flutterwave.raveandroid.rave_remote.responses;
 
-import androidx.annotation.Nullable;
+import com.google.gson.annotations.Expose;
+import com.google.gson.annotations.SerializedName;
 
 public class CheckCardResponse {
 
-    Number number;
-    String scheme;
-    String type;
-    String brand;
-    boolean prepaid;
-    @Nullable
-    Country country;
-    Bank bank;
-
-    public Number getNumber() {
-        return number;
-    }
-
-    public void setNumber(Number number) {
-        this.number = number;
-    }
-
-    public String getScheme() {
-        return scheme;
-    }
-
-    public void setScheme(String scheme) {
-        this.scheme = scheme;
-    }
-
-    public String getType() {
-        return type;
-    }
-
-    public void setType(String type) {
-        this.type = type;
-    }
-
-    public String getBrand() {
-        return brand;
-    }
-
-    public void setBrand(String brand) {
-        this.brand = brand;
-    }
-
-    public boolean getPrepaid() {
-        return prepaid;
-    }
-
-    public void setPrepaid(boolean prepaid) {
-        this.prepaid = prepaid;
-    }
-
-    @Nullable
-    public Country getCountry() {
+    @Expose
+    @SerializedName("transactionReference")
+    private String transactionreference;
+    @Expose
+    @SerializedName("responseMessage")
+    private String responsemessage;
+    @Expose
+    @SerializedName("responseCode")
+    private String responsecode;
+    @Expose
+    @SerializedName("country")
+    private String country;
+    @Expose
+    @SerializedName("nigeriancard")
+    private boolean isNigerianCard;
+    @Expose
+    @SerializedName("cardName")
+    private String cardname;
+    @Expose
+    @SerializedName("cardBin")
+    private String cardbin;
+
+    public String getTransactionreference() {
+        return transactionreference;
+    }
+
+    public String getResponsemessage() {
+        return responsemessage;
+    }
+
+    public String getResponsecode() {
+        return responsecode;
+    }
+
+    public String getCountry() {
         return country;
     }
 
-    public void setCountry(@Nullable Country country) {
-        this.country = country;
+    public boolean getNigerianCard() {
+        return isNigerianCard;
     }
 
-    public Bank getBank() {
-        return bank;
+    public String getCardname() {
+        return cardname;
     }
 
-    public void setBank(Bank bank) {
-        this.bank = bank;
+    public String getCardbin() {
+        return cardbin;
     }
-
-    public static class Bank { }
-
-    public static class Number {
-        int length;
-        boolean luhn;
-
-        public int getLength() {
-            return length;
-        }
-
-        public void setLength(int length) {
-            this.length = length;
-        }
-
-        public boolean isLuhn() {
-            return luhn;
-        }
-
-        public void setLuhn(boolean luhn) {
-            this.luhn = luhn;
-        }
-    }
-
-    public static class Country {
-        String numeric;
-        String alpha2;
-        String name;
-        String emoji;
-        @Nullable
-        String currency;
-        int latitude;
-        int longitude;
-
-        @Nullable
-        public String getCurrency() {
-            return currency;
-        }
-
-        public void setCurrency(@Nullable String currency) {
-            this.currency = currency;
-        }
-
-        public String getAlpha2() {
-            return alpha2;
-        }
-
-        public void setAlpha2(String alpha2) {
-            this.alpha2 = alpha2;
-        }
-    }
-
 }