fidel-react-native 1.4.3 → 1.6.1

package/CHANGELOG.md

@@ -1,5 +1,15 @@
 # Fidel React Native bridge library change log
 
+## 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.
+
+## 1.5.0
+- Remove card scanning confirmation screen.
+
 ## 1.4.3
 - Add United Arab Emirates option as a country of issuance.
 - Country label shrinks its font size, to fit longer country names, on smaller devices.

package/README.md

@@ -81,6 +81,7 @@ const countries = [Fidel.Country.ireland, Fidel.Country.unitedStates];
 Fidel.setOptions({
   bannerImage: resolvedImage,
   allowedCountries: countries,
+  defaultSelectedCountry: Fidel.Country.unitedStates,
   supportedCardSchemes: Array.from(cardSchemes),
   autoScan: false,
   metaData: {'meta-data-1': 'value1'}, // additional data to pass with the card
@@ -183,6 +184,18 @@ Fidel.setOptions({
 
 The possible options are: `.canada`, `.ireland`, `.japan`, `.sweden`, `.unitedArabEmirates`, `.unitedKingdom`, `.unitedStates`. You can set one or multiple of these countries. If you don't set any allowed countries, the user will be able to choose any of the countries above. If you set only one country, the card linking screen will not show the country picker UI. Note that, when you set multiple countries, they will be displayed in the country picker UI in the order that you set them.
 
+### defaultSelectedCountry
+
+Use this parameter to set the country that will be selected by default when opening the card enrollment screen.
+
+```javascript
+Fidel.setOptions({
+  defaultSelectedCountry: Fidel.Country.unitedKingdom
+});
+```
+
+The possible options are: `.canada`, `.ireland`, `.japan`, `.sweden`, `.unitedArabEmirates`, `.unitedKingdom`, `.unitedStates`. The `defaultSelectedCountry` has to be part of the `allowedCountries` list. The default value of this option is `.unitedKingdom`.
+
 ### supportedCardSchemes
 
 We currently support _Visa_, _Mastercard_ and _AmericanExpress_, but you can choose to support only one, two or all three. By default the SDK is configured to support all three.

package/android/build.gradle

@@ -1,7 +1,7 @@
 
 buildscript {
     repositories {
-        jcenter()
+        mavenCentral()
     }
 
     dependencies {
@@ -20,7 +20,7 @@ android {
         minSdkVersion 21
         targetSdkVersion 30
         versionCode 1
-        versionName "1.0"
+        versionName "1.6.1"
     }
     lintOptions {
         abortOnError false
@@ -39,10 +39,10 @@ repositories {
 
 dependencies {
     implementation 'com.facebook.react:react-native:+'
-    implementation 'com.github.FidelLimited:android-sdk:1.5.6'
+    implementation 'com.github.FidelLimited:android-sdk:1.7.1'
 
     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/FidelOptionsAdapter.java

@@ -30,6 +30,7 @@ public final class FidelOptionsAdapter implements DataProcessor<ReadableMap>, Da
     public static final String TERMS_CONDITIONS_URL_KEY = "termsConditionsUrl";
     public static final String META_DATA_KEY = "metaData";
     public static final String ALLOWED_COUNTRIES_KEY = "allowedCountries";
+    public static final String DEFAULT_SELECTED_COUNTRY_KEY = "defaultSelectedCountry";
     public static final String CARD_SCHEMES_KEY = "supportedCardSchemes";
     public static final List<String> OPTION_KEYS = Collections.unmodifiableList(
             Arrays.asList(
@@ -89,6 +90,9 @@ public final class FidelOptionsAdapter implements DataProcessor<ReadableMap>, Da
         if (valueIsValidFor(data, ALLOWED_COUNTRIES_KEY)) {
             Fidel.allowedCountries = countryAdapter.parseAllowedCountries(data.getArray(ALLOWED_COUNTRIES_KEY));
         }
+        if (valueIsValidFor(data, DEFAULT_SELECTED_COUNTRY_KEY)) {
+            Fidel.defaultSelectedCountry = countryAdapter.countryWithInteger(data.getInt(DEFAULT_SELECTED_COUNTRY_KEY));
+        }
         if (data.hasKey(CARD_SCHEMES_KEY)) {
             Fidel.supportedCardSchemes = cardSchemesAdapter.cardSchemesWithReadableArray(data.getArray(CARD_SCHEMES_KEY));
         }

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/ios/FLRNOptionsAdapter.m

@@ -62,6 +62,11 @@ NSString *const kOptionKey = @"Option";
         FLFidel.objc_allowedCountries = (NSArray<NSNumber *> *) rawData;
     }
     
+    if ([self valueIsValidFor:kDefaultSelectedCountryOptionKey fromDictionary:options]) {
+        id rawData = options[kDefaultSelectedCountryOptionKey];
+        FLFidel.defaultSelectedCountry = [((NSNumber *) rawData) integerValue];
+    }
+    
     if ([self valueIsValidFor:kAutoScanOptionKey fromDictionary:options]) {
         FLFidel.autoScan = [options[kAutoScanOptionKey] boolValue];
     }

package/ios/FLRNSDKOptions.h

@@ -10,14 +10,15 @@
 
 typedef NS_ENUM(NSUInteger, FLSDKOption) {
     FLSDKOptionBannerImage = 0,
-    FLSDKOptionCountry = 1,
-    FLSDKOptionAutoScan = 2,
-    FLSDKOptionMetaData = 3,
-    FLSDKOptionCompanyName = 4,
-    FLSDKOptionProgramName = 5,
-    FLSDKOptionDeleteInstructions = 6,
-    FLSDKOptionPrivacyURL = 7,
-    FLSDKOptionTermsConditionsURL = 8,
-    FLSDKOptionCardSchemes = 9,
+    FLSDKOptionAllowedCountries = 1,
+    FLSDKOptionDefaultSelectedCountry = 2,
+    FLSDKOptionAutoScan = 3,
+    FLSDKOptionMetaData = 4,
+    FLSDKOptionCompanyName = 5,
+    FLSDKOptionProgramName = 6,
+    FLSDKOptionDeleteInstructions = 7,
+    FLSDKOptionPrivacyURL = 8,
+    FLSDKOptionTermsConditionsURL = 9,
+    FLSDKOptionCardSchemes = 10,
     FLSDKOptionUnexistent = NSUIntegerMax
 };

package/ios/RCTConvert+Options.h

@@ -20,7 +20,8 @@
 #define FLSDKOptionValues\
 @{\
     kBannerImageOptionKey: @(FLSDKOptionBannerImage), \
-    kAllowedCountriesOptionKey: @(FLSDKOptionCountry), \
+    kAllowedCountriesOptionKey: @(FLSDKOptionAllowedCountries), \
+    kDefaultSelectedCountryOptionKey: @(FLSDKOptionDefaultSelectedCountry), \
     kAutoScanOptionKey: @(FLSDKOptionAutoScan),\
     kMetaDataOptionKey: @(FLSDKOptionMetaData), \
     kCompanyNameOptionKey: @(FLSDKOptionCompanyName), \
@@ -33,6 +34,7 @@
 
 FOUNDATION_EXPORT NSString *const kBannerImageOptionKey;
 FOUNDATION_EXPORT NSString *const kAllowedCountriesOptionKey;
+FOUNDATION_EXPORT NSString *const kDefaultSelectedCountryOptionKey;
 FOUNDATION_EXPORT NSString *const kAutoScanOptionKey;
 FOUNDATION_EXPORT NSString *const kMetaDataOptionKey;
 FOUNDATION_EXPORT NSString *const kCompanyNameOptionKey;

package/ios/RCTConvert+Options.m

@@ -10,6 +10,7 @@
 
 NSString *const kBannerImageOptionKey = @"bannerImage";
 NSString *const kAllowedCountriesOptionKey = @"allowedCountries";
+NSString *const kDefaultSelectedCountryOptionKey = @"defaultSelectedCountry";
 NSString *const kAutoScanOptionKey = @"autoScan";
 NSString *const kMetaDataOptionKey = @"metaData";
 NSString *const kCompanyNameOptionKey = @"companyName";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fidel-react-native",
-  "version": "1.4.3",
+  "version": "1.6.1",
   "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": {}
 }