use open api for checking card is same country funding in

Author: taiwoadebayo

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

@@ -32,9 +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 BARTER_STAGING_URL = "https://pilot-barter-staging.azurewebsites.net";
-    public static String UserId = "4444444444";
-    public static String MerchSecret = "5555555555";
+    public static String CARD_CHECK_URL = "https://lookup.binlist.net";
     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,7 +198,7 @@ public void checkCard(String cardFirstSix, final Payload body, final Boolean isD
             public void onSuccess(CheckCardResponse response) {
                 mCardInteractor.showProgressIndicator(false);
 
-                if (response.getData().getCountry().getCurrency().equalsIgnoreCase(body.getCurrency())){
+                if (response.getCountry().getCurrency().equalsIgnoreCase(body.getCurrency())){
 
                     if (isDisplayFee) {
                         fetchFee(body);

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

@@ -30,11 +30,8 @@ public interface ApiService {
 //    Call<ChargeResponse> charge(@Body ChargeRequestBody body);
     Call<String> charge(@Body ChargeRequestBody body);
 
-    @GET("/api/v1/barter/cards/get-details-by-bin/{card-first-six}")
-    Call<String> checkCard(@Path("card-first-six") String cardFirstSix,
-                                      @Header("CustomerReference") String CustomerReference,
-                                      @Header("UserId") String UserId,
-                                      @Header("Hash")String Hash);
+    @GET("/{card-first-six}")
+    Call<String> checkCard(@Path("card-first-six") String cardFirstSix);
 
     @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/Hasher.java

@@ -44,9 +44,6 @@
 import static com.flutterwave.raveandroid.rave_java_commons.RaveConstants.tokenExpired;
 import static com.flutterwave.raveandroid.rave_java_commons.RaveConstants.tokenNotFound;
 
-/**
- * Created by hamzafetuga on 18/07/2017.
- */
 @Singleton
 public class RemoteRepository {
 
@@ -84,10 +81,8 @@ public void charge(ChargeRequestBody body, final ResultCallback callback) {
 
     public void checkCard(String cardFirstSix, final ResultCallback callback) {
 
-        AuthCredValue authCredValue = fetchAuthCred();
 
-        executor.execute(barterService.checkCard(cardFirstSix, authCredValue.authCred.customerRef,
-                authCredValue.authCred.userId, authCredValue.authCred.hash),
+        executor.execute(barterService.checkCard(cardFirstSix),
                 new TypeToken<CheckCardResponse>() {
                 }.getType(),
                 new GenericNetworkCallback<CheckCardResponse>(callback)
@@ -444,44 +439,4 @@ public void onCallFailure(String exceptionMessage) {
             callback.onError(exceptionMessage, exceptionMessage);
         }
     }
-
-    private AuthCredValue fetchAuthCred() {
-        AuthCred authCred = generateAuthCred();
-        Token tokens = new Token();
-        AuthCredValue authCredValue = new AuthCredValue();
-        authCredValue.authCred = authCred;
-        authCredValue.token = tokens;
-        return authCredValue;
-    }
-
-    private AuthCred generateAuthCred() {
-        String customerRef = fetchCustomerRef();
-        String valueToHash = customerRef + RaveConstants.UserId + RaveConstants.MerchSecret;
-        String hashValue = Hasher.sha(valueToHash, "SHA-256");
-
-        AuthCred authCred = new AuthCred();
-        authCred.customerRef = customerRef;
-        authCred.userId = RaveConstants.UserId;
-        authCred.hash = hashValue;
-        return authCred;
-    }
-
-    private static String fetchCustomerRef() {
-        long random = Double.valueOf(Math.random()).longValue();
-        return "ML_ANDROID_" + "deviceId" + System.currentTimeMillis() + random;
-    }
-
-    static class AuthCred {
-        String customerRef;
-        String userId;
-        String hash;
-    }
-
-    static class Token {
-    }
-
-    static class AuthCredValue {
-        AuthCred authCred;
-        Token token;
-    }
 }

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

@@ -71,7 +71,7 @@ public Retrofit providesBarterRetrofit() {
                 .writeTimeout(60, TimeUnit.SECONDS).build();
 
         barterRetrofit = new Retrofit.Builder()
-                .baseUrl(RaveConstants.BARTER_STAGING_URL)
+                .baseUrl(RaveConstants.CARD_CHECK_URL)
                 .client(okHttpClient)
                 .addConverterFactory(ScalarsConverterFactory.create())
                 .addConverterFactory(GsonConverterFactory.create())

rave_remote/src/main/java/com/flutterwave/raveandroid/rave_remote/di/RemoteModule.java

@@ -2,135 +2,72 @@
 
 public class CheckCardResponse {
 
-    String Status;
-    String Message;
-    Data Data;
-    Reference Reference;
-
-    public Reference getReference() {
-        return Reference;
+    Number number;
+    String scheme;
+    String type;
+    String brand;
+    boolean prepaid;
+    Country country;
+    Bank bank;
+
+    public Number getNumber() {
+        return number;
     }
 
-    public void setReference(Reference reference) {
-        this.Reference = reference;
+    public void setNumber(Number number) {
+        this.number = number;
     }
 
-    public String getStatus() {
-        return Status;
+    public String getScheme() {
+        return scheme;
     }
 
-    public void setStatus(String status) {
-        this.Status = status;
+    public void setScheme(String scheme) {
+        this.scheme = scheme;
     }
 
-    public String getMessage() {
-        return Message;
+    public String getType() {
+        return type;
     }
 
-    public void setMessage(String message) {
-        this.Message = message;
+    public void setType(String type) {
+        this.type = type;
     }
 
-    public Data getData() {
-        return Data;
+    public String getBrand() {
+        return brand;
     }
 
-    public void setData(Data data) {
-        this.Data = data;
+    public void setBrand(String brand) {
+        this.brand = brand;
     }
 
-    public static class Data {
-
-        Number number;
-        String scheme;
-        String type;
-        String brand;
-        String prepaid;
-        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 String getPrepaid() {
-            return prepaid;
-        }
-
-        public void setPrepaid(String prepaid) {
-            this.prepaid = prepaid;
-        }
-
-        public Country getCountry() {
-            return country;
-        }
-
-        public void setCountry(Country country) {
-            this.country = country;
-        }
-
-        public Bank getBank() {
-            return bank;
-        }
-
-        public void setBank(Bank bank) {
-            this.bank = bank;
-        }
+    public boolean getPrepaid() {
+        return prepaid;
     }
 
-    public static class Reference {
-
+    public void setPrepaid(boolean prepaid) {
+        this.prepaid = prepaid;
     }
 
-    public static class Bank {
-        String name;
-        String phone;
-
-        public String getName() {
-            return name;
-        }
+    public Country getCountry() {
+        return country;
+    }
 
-        public void setName(String name) {
-            this.name = name;
-        }
+    public void setCountry(Country country) {
+        this.country = country;
+    }
 
-        public String getPhone() {
-            return phone;
-        }
+    public Bank getBank() {
+        return bank;
+    }
 
-        public void setPhone(String phone) {
-            this.phone = phone;
-        }
+    public void setBank(Bank bank) {
+        this.bank = bank;
     }
 
+    public static class Bank { }
+
     public static class Number {
         int length;
         boolean luhn;
@@ -169,4 +106,6 @@ public void setCurrency(String currency) {
             this.currency = currency;
         }
     }
+
 }
+