fidel-react-native 1.6.0 → 1.6.3

package/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Fidel React Native bridge library change log
 
+## 1.6.2
+- Update Fidel API logo
+
+## 1.6.1
+- Always provide the `scheme` field in Android, after successful card enrollments.
+- Provide support for `resConfigs` optimization parameter in Android.
+
 ## 1.6.0
 - Added the `defaultSelectedCountry` property which sets the country that will be selected by default, when opening the card enrollment screen.
 

package/android/build.gradle

@@ -1,11 +1,12 @@
 
 buildscript {
     repositories {
-        jcenter()
+        google()
+        mavenCentral()
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:1.3.1'
+        classpath 'com.android.tools.build:gradle:7.2.1'
     }
 }
 
@@ -20,7 +21,7 @@ android {
         minSdkVersion 21
         targetSdkVersion 30
         versionCode 1
-        versionName "1.6.0"
+        versionName "1.6.3"
     }
     lintOptions {
         abortOnError false
@@ -39,10 +40,10 @@ repositories {
 
 dependencies {
     implementation 'com.facebook.react:react-native:+'
-    implementation 'com.github.FidelLimited:android-sdk:1.7.0'
+    implementation 'com.github.FidelLimited:android-sdk:1.7.4'
 
     testImplementation 'junit:junit:4.13.2'
-    testImplementation 'androidx.test.ext:junit:1.1.2'
+    testImplementation 'androidx.test.ext:junit:1.1.3'
     testImplementation 'org.assertj:assertj-core:3.13.2'
     testImplementation 'org.robolectric:robolectric:4.5.1'
 }

package/android/src/main/java/com/fidelreactlibrary/adapters/WritableMapDataConverter.java

@@ -1,7 +1,6 @@
 package com.fidelreactlibrary.adapters;
 
 import com.facebook.react.bridge.WritableMap;
-import com.fidel.sdk.LinkResultError;
 import com.fidel.sdk.LinkResultErrorCode;
 import com.fidelreactlibrary.adapters.abstraction.DataConverter;
 import com.fidelreactlibrary.adapters.abstraction.ObjectFactory;
@@ -14,7 +13,7 @@ import java.util.Iterator;
 
 public final class WritableMapDataConverter implements DataConverter<Object, WritableMap> {
 
-    private ObjectFactory<WritableMap> writableMapFactory;
+    private final ObjectFactory<WritableMap> writableMapFactory;
     public WritableMapDataConverter(ObjectFactory<WritableMap> writableMapFactory) {
         this.writableMapFactory = writableMapFactory;
     }
@@ -24,32 +23,44 @@ public final class WritableMapDataConverter implements DataConverter<Object, Wri
             return null;
         }
         WritableMap map = writableMapFactory.create();
-        try {
-            for (Field field: data.getClass().getDeclaredFields()) {
-                if (field.getType() == String.class) {
-                    map.putString(field.getName(), (String)field.get(data));
+
+        for (Field field: data.getClass().getDeclaredFields()) {
+            if (field.getType() == String.class) {
+                try {
+                    map.putString(field.getName(), (String) field.get(data));
+                } catch (Exception e) {
+                    map.putNull(field.getName());
                 }
-                else if (field.getType() == boolean.class || field.getType() == Boolean.class) {
-                    map.putBoolean(field.getName(), (boolean)field.get(data));
+            } else if (field.getType() == boolean.class || field.getType() == Boolean.class) {
+                try {
+                    map.putBoolean(field.getName(), field.getBoolean(data));
+                } catch (Exception e) {
+                    map.putBoolean(field.getName(), false);
                 }
-                else if (field.getType() == int.class) {
-                    map.putInt(field.getName(), (int)field.get(data));
+            } else if (field.getType() == int.class) {
+                try {
+                    map.putInt(field.getName(), field.getInt(data));
+                } catch (Exception e) {
+                    map.putInt(field.getName(), -1);
                 }
-                else if (field.getType() == LinkResultErrorCode.class) {
+            } else if (field.getType() == LinkResultErrorCode.class) {
+                String displayFieldName = field.getName().equals("errorCode") ? "code" : field.getName();
+                try {
                     LinkResultErrorCode errorCode = (LinkResultErrorCode)field.get(data);
-                    String displayFieldName = field.getName() == "errorCode" ? "code" : field.getName();
                     map.putString(displayFieldName, errorCode.toString().toLowerCase());
+                } catch (Exception e) {
+                    map.putNull(displayFieldName);
                 }
-                else if (field.getType() == JSONObject.class) {
+            } else if (field.getType() == JSONObject.class) {
+                try {
                     WritableMap mapToPut = this.getMapFor((JSONObject)field.get(data));
                     map.putMap(field.getName(), mapToPut);
+                } catch (Exception e) {
+                    map.putNull(field.getName());
                 }
             }
-            return map;
-        }
-        catch (Exception e) {
-            return map;
         }
+        return map;
     }
 
     private WritableMap getMapFor(JSONObject json) {
@@ -59,14 +70,14 @@ public final class WritableMapDataConverter implements DataConverter<Object, Wri
             String key = jsonKeyIterator.next();
             try {
                 Object value = json.get(key);
-                Class valueClass = value.getClass();
+                Class<?> valueClass = value.getClass();
                 if (valueClass == String.class) {
                     map.putString(key, (String)value);
                 }
-                else if (valueClass == boolean.class || valueClass == Boolean.class) {
+                else if (valueClass == Boolean.class) {
                     map.putBoolean(key, (boolean)value);
                 }
-                else if (valueClass == int.class || valueClass == Integer.class) {
+                else if (valueClass == Integer.class) {
                     map.putInt(key, (int)value);
                 }
                 else if (valueClass == JSONObject.class) {

package/android/src/test/java/com/fidelreactlibrary/WritableMapDataConverterTests.java

@@ -53,6 +53,43 @@ public class WritableMapDataConverterTests {
         assertNull(sut.getConvertedDataFor(null));
     }
 
+    @Test
+    public void test_WhenExpectedNonNullStringFieldContainsNullValueInLinkResult_ReturnMapWithNullValueForIt() {
+        LinkResult linkResult = new LinkResult(TEST_CARD_ID);
+        setFieldsFor(linkResult);
+        linkResult.accountId = null;
+        WritableMap receivedMap = sut.getConvertedDataFor(linkResult);
+        assertNull(receivedMap.getString("accountId"));
+    }
+
+    @Test
+    public void test_WhenExpectedNonNullBooleanFieldContainsNullValueInLinkResult_ReturnMapWithFalseValueForIt() {
+        LinkResult linkResult = new LinkResult(TEST_CARD_ID);
+        setFieldsFor(linkResult);
+        linkResult.live = null;
+        WritableMap receivedMap = sut.getConvertedDataFor(linkResult);
+        assertFalse(receivedMap.getBoolean("live"));
+    }
+
+    @Test
+    public void test_WhenExpectedLinkResultWithNullMetaData_ReturnMapWithNullMetaData() {
+        LinkResult linkResult = new LinkResult(TEST_CARD_ID);
+        setFieldsFor(linkResult);
+        linkResult.metaData = null;
+        WritableMap receivedMap = sut.getConvertedDataFor(linkResult);
+        assertNull(receivedMap.getMap("metaData"));
+    }
+
+    @Test
+    public void test_WhenConvertingLinkResultWithError_AndErrorCodeIsUnknown_SetNullErrorCodeField() {
+        LinkResult linkResult = new LinkResult(null, TEST_ERROR_MESSAGE, "2021-05-19T12:37:55.278Z");
+        Object objectToConvert = linkResult.getError();
+
+        WritableMap receivedMap = sut.getConvertedDataFor(objectToConvert);
+        assertNotNull(receivedMap);
+        assertNull(receivedMap.getString("code"));
+    }
+
     @Test
     public void test_WhenConvertingValidLinkResult_IncludeAllObjectFields() throws IllegalAccessException {
         LinkResult linkResult = new LinkResult(TEST_CARD_ID);
@@ -98,7 +135,7 @@ public class WritableMapDataConverterTests {
                 assertEquals(receivedString, field.get(objectToConvert));
             }
             else if (field.getType() == LinkResultErrorCode.class) {
-                String displayFieldName = field.getName() == "errorCode" ? "code" : field.getName();
+                String displayFieldName = field.getName().equals("errorCode") ? "code" : field.getName();
                 String receivedErrorCodeString = receivedMap.getString(displayFieldName);
                 LinkResultErrorCode expectedErrorCode = (LinkResultErrorCode) field.get(objectToConvert);
                 String expectedErrorCodeString = expectedErrorCode.toString().toLowerCase();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fidel-react-native",
-  "version": "1.6.0",
+  "version": "1.6.3",
   "description": "Fidel's React Native bridge library for iOS and Android.",
   "main": "index.js",
   "nativePackage": true,
@@ -45,7 +45,8 @@
   },
   "homepage": "https://github.com/FidelLimited/rn-sdk#readme",
   "peerDependencies": {
-    "react-native": "^0.41.2"
+    "react": "*",
+    "react-native": "*"
   },
   "dependencies": {}
 }