fidel-react-native 1.4.0 → 1.5.0

package/CHANGELOG.md

@@ -1,5 +1,21 @@
 # Fidel React Native bridge library change log
 
+## 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.
+
+## 1.4.2
+- Update Fidel Android SDK version to allow French & Swedish translations be available in more countries.
+
+## 1.4.1
+- Update Fidel & Android SDK versions.
+- Prepare for the newest React Native versions.
+- Fix some unit tests.
+- Made it easier to automate testing this React Native bridge library.
+
 ## 1.4.0
 
 - Now the SDK allows you to select multiple allowed countries from which the user can pick. Please check the docs for information about the new `allowedCountries` option.

package/README.md

@@ -7,21 +7,17 @@ This SDK is a bridge between React Native and Fidel's native iOS and Android SDK
 
 ## Getting started
 
-`$ npm install fidel-react-native --save`
+`$ npm install fidel-react-native`
 
-## (Almost) Automatic linking (for RN >= 0.60)
+or
 
-`$ react-native link fidel-react-native`
+`$ yarn add fidel-react-native`
 
 ### iOS
 
-**1.** Go to the `ios` folder. Please check that in your `Podfile` you have the following line:
+**1.** Please make sure that the minimum platform is set to 9.1 in your Podfile: `platform :ios, '9.1'`.
 
-`pod 'fidel-react-native', :path => '../node_modules/fidel-react-native'`
-
-**2.** Please make sure that the minimum platform is set to 9.1 in your Podfile: `platform :ios, '9.1'`.
-
-**3.** Run `pod install`.
+**2.** Run `pod install`.
 
 ### Android
 
@@ -48,109 +44,6 @@ buildscript {
 }
 ```
 
-## Manual linking
-
-### iOS manual linking
-
-#### Step 1: Add the Fidel React Native iOS project as a dependency
-
-**1.** In XCode, in the project navigator, right click `Libraries` ➜ `Add Files to [your project's name]`
-
-**2.** Go to `node_modules` ➜ `fidel-react-native` and add `Fidel.xcodeproj`
-
-**3.** In XCode, in the project navigator, select your project. Add `libFidel.a` to your project's `Build Phases` ➜ `Link Binary With Libraries`
-
-**4.** Under your target's `Build Settings`, make sure to set `YES` for `Always Embed Swift Standard Libraries`. That's because, by default, your project might not need it. It needs to be `YES` because otherwise the project will not find the Swift libraries to be able to run our native iOS SDK.
-
-#### Step 2: Add the Native iOS SDK as a dependency
-
-You can use Cocoapods or install the library as a dynamic library.
-
-**5.** Add a `Podfile` in your `ios/` folder of your React Native project. It should include the following dependency:
-
-```ruby
-use_frameworks!
-pod 'Fidel'
-```
-
-Here is the simplest `Podfile` you need to link with our native iOS SDK:
-
-```ruby
-platform :ios, '9.1'
-
-workspace 'example'
-
-target 'example' do
-    use_frameworks!
-    pod 'Fidel'
-end
-```
-
-**6.** If you use an older Swift version, you should install a different `Fidel` pod version. If your project uses Swift `4.2.1`, for example, your Podfile should include `pod Fidel, '~>1.4'`, *not* `pod 'Fidel'` (which installs the latest version of the latest Swift supported version). Please check our [iOS SDK README (step 1)](https://github.com/FidelLimited/fidel-ios#step-1). You'll find a suitable version you should set for our Fidel iOS SDK.
-
-**7.** Run `pod install` in your terminal.
-
-**8.** Make sure to use the new `.xcworkspace` created by Cocoapods when you run your iOS app. React Native should use it by default.
-
-**9.** In order to allow scanning cards with the camera, make sure to add the key `NSCameraUsageDescription` to your iOS app `Info.plist` and set the value to a string describing why your app needs to use the camera (e.g. "To scan credit cards."). This string will be displayed when the app initially requests permission to access the camera.
-
-### Android manual linking
-
-**1.** Append the following lines to `android/settings.gradle`:
-
-```java
-include ':fidel-react-native'
-project(':fidel-react-native').projectDir = new File(rootProject.projectDir, '../node_modules/fidel-react-native/android')
-```
-
-**2.** Insert the following lines inside the dependencies block in `android/app/build.gradle`:
-
-```java
-implementation project(':fidel-react-native')
-```
-
-**3.** Append Jitpack to `android/build.gradle`:
-
-```java
-allprojects {
-  repositories {
-    ...
-    maven { url "https://jitpack.io" }
-  }
-}
-```
-
-**4.** Make sure that the `minSdkVersion` is the same or higher than the `minSdkVersion` of our native Android SDK:
-
-```java
-buildscript {
-  ext {
-    ...
-    minSdkVersion = 19
-    ...
-  }
-}
-```
-
-**5.** Only for projects initialized with **RN <= 0.59**: Open up `android/app/src/main/java/[...]/MainApplication.java`
-
-- Add `import com.fidelreactlibrary.FidelPackage;` to the imports at the top of the file
-- Add `new FidelPackage()` to the list returned by the `getPackages()` method:
-
-```java
-protected List <ReactPackage> getPackages() {
-  return Arrays.<ReactPackage>asList(
-          new MainReactPackage(),
-          new FidelPackage(),
-          //you might have other Packages here as well.
-      );
-}
-```
-
-**6.** Ensure that you have *Google Play Services* installed.
-
-For a physical device you need to search on Google for *Google Play Services*. There will be a link that takes you to the Play Store and from there you will see a button to update it (*do not* search within the Play Store).
-
 ## How to use Fidel's React Native SDK
 
 Import Fidel in your RN project:
@@ -246,6 +139,22 @@ Both `result` and `error` are objects that look like in the following examples:
 }
 ```
 
+## How to run the example application
+
+1. Follow the React Native [environment setup instructions](https://reactnative.dev/docs/environment-setup). The example app is not an Expo app, so please follow the "React Native CLI Quickstart" guide.
+2. Open the terminal in the "example" folder.
+3. Install React Native dependencies (which include the Fidel react native library) by running `yarn` in the terminal
+4. To run the iOS example app:
+   1. Switch to the "example/ios" folder in your terminal.
+   2. Run `pod install` to install the Cocoapods project dependencies
+   3. Open the `example.xcworkspace` in Xcode
+   4. Run the project (eventually, it should open another terminal windown that runs Metro)
+5. To run the Android example app:
+   1. Open the "example/android" project in Android Studio.
+   2. Open a terminal window in the "example" folder.
+   3. Run the following command to start Metro: `npx react-native start`
+   4. Run the project on your preferred emulator/device.
+
 ## Options documentation
 
 ### bannerImage
@@ -272,7 +181,7 @@ Fidel.setOptions({
 });
 ```
 
-The possible options are: `.unitedKingdom`, `.unitedStates`, `.ireland`, `.sweden`, `.japan`, `.canada`. 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.
+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.
 
 ### supportedCardSchemes
 
@@ -439,7 +348,7 @@ If you do not set a ```privacyUrl```, the text will become _in accordance with t
 
 ### Consent text for the rest of the world
 
-When you set United Kingdom, Ireland, Japan or Sweden as allowed countries or the user selects one of these countries from the list, a consent text specific for these countries will be applied.
+When you set Ireland, Japan , Sweden, United Arab Emirates or United Kingdom as allowed countries or the user selects one of these countries from the list, a consent text specific for these countries will be applied.
 
 The following would be an example Terms & Conditions text for ```Cashback Inc``` (an example company):
 

package/android/build.gradle

@@ -10,16 +10,17 @@ buildscript {
 }
 
 apply plugin: 'com.android.library'
+apply from: 'jacoco.gradle'
 
 android {
-    compileSdkVersion 28
-    buildToolsVersion "28.0.3"
+    compileSdkVersion 30
+    buildToolsVersion "30.0.3"
 
     defaultConfig {
-        minSdkVersion 19
-        targetSdkVersion 26
+        minSdkVersion 21
+        targetSdkVersion 30
         versionCode 1
-        versionName "1.0"
+        versionName "1.5.0"
     }
     lintOptions {
         abortOnError false
@@ -38,11 +39,10 @@ repositories {
 
 dependencies {
     implementation 'com.facebook.react:react-native:+'
-    implementation 'com.github.FidelLimited:android-sdk:1.5.1'
+    implementation 'com.github.FidelLimited:android-sdk:1.6.0'
 
-    testImplementation 'junit:junit:4.12'
-    testImplementation 'androidx.test.ext:junit:1.1.1'
-    testImplementation 'org.assertj:assertj-core:1.7.0'
-    testImplementation 'org.robolectric:robolectric:4.3.1'
+    testImplementation 'junit:junit:4.13.2'
+    testImplementation 'androidx.test.ext:junit:1.1.2'
+    testImplementation 'org.assertj:assertj-core:3.13.2'
+    testImplementation 'org.robolectric:robolectric:4.5.1'
 }
-  

package/android/jacoco.gradle

@@ -0,0 +1,50 @@
+apply plugin: 'jacoco'
+
+jacoco {
+    toolVersion = "0.8.6"
+}
+
+tasks.withType(Test) {
+    jacoco.includeNoLocationClasses = true
+    jacoco.excludes = ['jdk.internal.*']
+}
+
+project.afterEvaluate {
+    def buildTypes = android.buildTypes.collect { type -> type.name }
+    def productFlavors = android.productFlavors.collect { flavor -> flavor.name }
+
+    if (!productFlavors) productFlavors.add('')
+
+    productFlavors.each { productFlavorName ->
+        buildTypes.each { buildTypeName ->
+            def testTaskName = "test${buildTypeName.capitalize()}UnitTest"
+
+            task "${testTaskName}JacocoCoverage" (type:JacocoReport, dependsOn: "$testTaskName") {
+                group = "Reporting"
+                description = "Generate Jacoco coverage reports on the ${buildTypeName.capitalize()} build."
+
+                def excludes = ['**/R.class', '**/R$*.class', '**/BuildConfig.*', '**/Manifest*.*', '**/*Test*.*', 'android/**/*.*' ]
+
+                def coverageSourceDirs = [
+                        "src/main/java",
+                        "src/$productFlavorName/java",
+                        "src/$buildTypeName/java"
+                ]
+
+                // java compiled classes
+                def javaTree = fileTree(dir: "$buildDir/intermediates/javac/$buildTypeName/classes", excludes: excludes)
+                // kotlin compiled classes (to be used in the future)
+                def kotlinTree = fileTree(dir: "$buildDir/tmp/kotlin-classes/$buildTypeName", excludes: excludes)
+                classDirectories.from = files([javaTree, kotlinTree])
+                additionalSourceDirs.from = files(coverageSourceDirs)
+                sourceDirectories.from = files(coverageSourceDirs)
+                executionData.from = files("${buildDir}/jacoco/${testTaskName}.exec")
+
+                reports {
+                    xml.enabled = true
+                    html.enabled = true
+                }
+            }
+        }
+    }
+}

package/android/src/main/java/com/fidelreactlibrary/FidelModule.java

@@ -3,7 +3,7 @@ package com.fidelreactlibrary;
 
 import android.app.Activity;
 import com.facebook.react.bridge.Callback;
-import com.facebook.react.bridge.ReactApplicationContext;;
+import com.facebook.react.bridge.ReactApplicationContext;
 import com.facebook.react.bridge.ReactContextBaseJavaModule;
 import com.facebook.react.bridge.ReactMethod;
 import com.facebook.react.bridge.ReadableMap;
@@ -30,7 +30,7 @@ public class FidelModule extends ReactContextBaseJavaModule {
   private final DataProcessor<ReadableMap> setupProcessor;
   private final DataProcessor<ReadableMap> optionsProcessor;
   private final List<ConstantsProvider> constantsProviderList;
-  private ReactApplicationContext reactContext;
+  private final ReactApplicationContext reactContext;
 
   public FidelModule(ReactApplicationContext reactContext,
                      DataProcessor<ReadableMap> setupProcessor,
@@ -50,6 +50,16 @@ public class FidelModule extends ReactContextBaseJavaModule {
     return "NativeFidelBridge";
   }
 
+  @ReactMethod
+  public void addListener(String eventName) {
+    // Keep: Required for RN built in Event Emitter Calls.
+  }
+
+  @ReactMethod
+  public void removeListeners(Integer count) {
+    // Keep: Required for RN built in Event Emitter Calls.
+  }
+
   @ReactMethod
   public void openForm(Callback callback) {
     final Activity activity = getCurrentActivity();

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

@@ -15,6 +15,7 @@ public final class FidelCountryAdapter implements CountryAdapter {
 
     private static final String UNITED_KINGDOM_COUNTRY_KEY = "unitedKingdom";
     private static final String UNITED_STATES_COUNTRY_KEY = "unitedStates";
+    private static final String UNITED_ARAB_EMIRATES_KEY = "unitedArabEmirates";
     private static final String JAPAN_COUNTRY_KEY = "japan";
     private static final String SWEDEN_COUNTRY_KEY = "sweden";
     private static final String IRELAND_COUNTRY_KEY = "ireland";
@@ -26,6 +27,7 @@ public final class FidelCountryAdapter implements CountryAdapter {
         switch (country) {
             case UNITED_KINGDOM: return UNITED_KINGDOM_COUNTRY_KEY;
             case UNITED_STATES: return UNITED_STATES_COUNTRY_KEY;
+            case UNITED_ARAB_EMIRATES: return UNITED_ARAB_EMIRATES_KEY;
             case JAPAN: return JAPAN_COUNTRY_KEY;
             case SWEDEN: return SWEDEN_COUNTRY_KEY;
             case IRELAND: return IRELAND_COUNTRY_KEY;

package/android/src/main/java/com/fidelreactlibrary/events/CallbackActivityEventListener.java

@@ -17,8 +17,8 @@ public final class CallbackActivityEventListener
         extends BaseActivityEventListener
         implements CallbackInput, FidelCardLinkingObserver {
 
-    private DataConverter<Object, WritableMap> linkResultConverter;
-    private DataProcessor<WritableMap> errorHandler;
+    private final DataConverter<Object, WritableMap> linkResultConverter;
+    private final DataProcessor<WritableMap> errorHandler;
     private Callback callback;
 
     public CallbackActivityEventListener(DataConverter<Object, WritableMap> linkResultConverter,
@@ -27,10 +27,6 @@ public final class CallbackActivityEventListener
         this.errorHandler = errorHandler;
     }
 
-    public CallbackActivityEventListener() {
-
-    }
-
     @Override
     public void onActivityResult(Activity activity,
                                  int requestCode,

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

@@ -6,6 +6,7 @@ import com.facebook.react.bridge.JavaOnlyMap;
 import com.facebook.react.bridge.WritableMap;
 import com.fidel.sdk.Fidel;
 import com.fidel.sdk.LinkResult;
+import com.fidel.sdk.LinkResultError;
 import com.fidel.sdk.LinkResultErrorCode;
 import com.fidelreactlibrary.events.CallbackActivityEventListener;
 import com.fidelreactlibrary.fakes.CallbackSpy;
@@ -34,6 +35,9 @@ public class CallbackActivityEventListenerTests {
 
     private static final String RESULT_EXTRA_KEY = Fidel.FIDEL_LINK_CARD_RESULT_CARD;
     private static final int REQUEST_CODE = Fidel.FIDEL_LINK_CARD_REQUEST_CODE;
+    private static final LinkResultError testLinkResultError
+            = new LinkResultError(LinkResultErrorCode.INVALID_URL, "Test message", "some date");
+    private static final LinkResult testLinkResult = new LinkResult("TEST CARD ID");
 
     @Before
     public final void setUp() {
@@ -45,7 +49,7 @@ public class CallbackActivityEventListenerTests {
 
         activity = Robolectric.buildActivity(Activity.class).setup().get();
         intent = new IntentMock<>(activity, Activity.class);
-        intent.parcelableExtraToReturn = new LinkResult("TEST CARD ID");
+        intent.parcelableExtraToReturn = testLinkResult;
         linkResultConverterStub.convertedDataToReturn = new JavaOnlyMap();
     }
 
@@ -96,10 +100,34 @@ public class CallbackActivityEventListenerTests {
         assertNull(intent.parcelableExtraNameAskedFor);
     }
 
+    @Test
+    public void test_WhenCardLinkingFails_SendConvertedLinkResultToErrorHandler() {
+        sut.onCardLinkingFailed(testLinkResultError);
+        assertEquals(linkResultConverterStub.convertedDataToReturn, errorHandlerSpy.dataToProcess);
+    }
+
+    @Test
+    public void test_WhenCardLinkingFails_ConvertTheErrorToWritableMap() {
+        sut.onCardLinkingFailed(testLinkResultError);
+        assertEquals(linkResultConverterStub.dataReceived, testLinkResultError);
+    }
+
+    @Test
+    public void test_WhenCardLinkingSucceeds_DoNotCallErrorHandler() {
+        sut.onCardLinkingSucceeded(testLinkResult);
+        assertNull(errorHandlerSpy.dataToProcess);
+    }
+
+    @Test
+    public void test_WhenCardLinkingSucceeds_DoNotCallCallback() {
+        sut.onCardLinkingSucceeded(testLinkResult);
+        assertNull(callbackSpy.receivedErrorMap);
+        assertNull(callbackSpy.receivedResultMap);
+    }
+
     private void onActivityResultWithError() {
         LinkResultErrorCode errorCode = LinkResultErrorCode.USER_CANCELED;
-        intent.parcelableExtraToReturn = new LinkResult(errorCode, "Test error message");;
-
+        intent.parcelableExtraToReturn = new LinkResult(errorCode, "Test error message", "2021-05-19T12:37:55.278Z");
         sut.onActivityResult(activity, REQUEST_CODE, 0, intent);
     }
 }

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

@@ -7,6 +7,7 @@ import com.fidelreactlibrary.adapters.FidelCardSchemesAdapter;
 
 import org.junit.Test;
 
+import java.util.Arrays;
 import java.util.EnumSet;
 import java.util.HashMap;
 import java.util.Map;
@@ -14,10 +15,10 @@ import java.util.Set;
 
 import javax.annotation.Nonnull;
 
-import edu.emory.mathcs.backport.java.util.Arrays;
-
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.core.IsCollectionContaining.hasItem;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
 
 public final class FidelCardSchemesAdapterTests {
     private static final String CARD_SCHEMES_KEY = "CardScheme";
@@ -25,7 +26,7 @@ public final class FidelCardSchemesAdapterTests {
     private static final String MASTERCARD_SCHEME_KEY = "mastercard";
     private static final String AMEX_SCHEME_KEY = "americanExpress";
 
-    private FidelCardSchemesAdapter sut = new FidelCardSchemesAdapter();
+    private final FidelCardSchemesAdapter sut = new FidelCardSchemesAdapter();
 
     //Test to expose correct card scheme keys
     @Test

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

@@ -44,7 +44,6 @@ public class FidelCountryAdapterTests {
         }
     }
 
-
     @Test
     public void test_WhenAskedForKeyForCountry_ItProvidesIt() {
         for (Country country : Country.values()) {

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

@@ -78,8 +78,8 @@ public class WritableMapDataConverterTests {
                 JSONObject jsonField = (JSONObject)field.get(linkResult);
                 assertMapEqualsWithJSONObject(mapField.toHashMap(), jsonField);
             }
-            else if (field.getType() != Parcelable.Creator.class && field.getType() != LinkResultError.class) {
-                fail("Some of the link result properties are not converted");
+            else if (field.getType() != Parcelable.Creator.class && field.getType() != LinkResultError.class && !field.getName().equals("$jacocoData")) {
+                fail("Some of the link result properties are not converted" + field + " field name: " + field.getName());
             }
         }
     }
@@ -87,8 +87,7 @@ public class WritableMapDataConverterTests {
     @Test
     public void test_WhenConvertingLinkResultWithError_IncludeAllErrorFields() throws IllegalAccessException {
         LinkResultErrorCode errorCode = LinkResultErrorCode.USER_CANCELED;
-        String errorMessage = TEST_ERROR_MESSAGE;
-        LinkResult linkResult = new LinkResult(errorCode, errorMessage);
+        LinkResult linkResult = new LinkResult(errorCode, TEST_ERROR_MESSAGE, "2021-05-19T12:37:55.278Z");
         Object objectToConvert = linkResult.getError();
 
         WritableMap receivedMap = sut.getConvertedDataFor(objectToConvert);
@@ -99,13 +98,14 @@ public class WritableMapDataConverterTests {
                 assertEquals(receivedString, field.get(objectToConvert));
             }
             else if (field.getType() == LinkResultErrorCode.class) {
-                String receivedErrorCodeString = receivedMap.getString(field.getName());
+                String displayFieldName = field.getName() == "errorCode" ? "code" : field.getName();
+                String receivedErrorCodeString = receivedMap.getString(displayFieldName);
                 LinkResultErrorCode expectedErrorCode = (LinkResultErrorCode) field.get(objectToConvert);
                 String expectedErrorCodeString = expectedErrorCode.toString().toLowerCase();
-                assertEquals(receivedErrorCodeString, expectedErrorCodeString);
+                assertEquals(expectedErrorCodeString, receivedErrorCodeString);
             }
-            else {
-                fail("Some of the link result error properties are not converted");
+            else if (!field.getName().equals("$jacocoData")) {
+                fail("Some of the link result properties are not converted" + field + " field name: " + field.getName());
             }
         }
     }

package/android/src/test/resources/robolectric.properties

@@ -0,0 +1 @@
+sdk=28

package/ios/FLRNOptionsAdapter.m

@@ -18,7 +18,7 @@
 #import "FLRNCardSchemesAdapter.h"
 #import "RCTConvert+Options.h"
 
-#define FLCountryValues @{@"unitedKingdom" : @(FLCountryUnitedKingdom), @"ireland" : @(FLCountryIreland), @"unitedStates" : @(FLCountryUnitedStates), @"sweden" : @(FLCountrySweden), @"japan" : @(FLCountryJapan), @"canada" : @(FLCountryCanada)}
+#define FLCountryValues @{@"unitedArabEmirates" : @(FLCountryUnitedArabEmirates), @"unitedKingdom" : @(FLCountryUnitedKingdom), @"ireland" : @(FLCountryIreland), @"unitedStates" : @(FLCountryUnitedStates), @"sweden" : @(FLCountrySweden), @"japan" : @(FLCountryJapan), @"canada" : @(FLCountryCanada)}
 
 @interface FLRNOptionsAdapter()
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fidel-react-native",
-  "version": "1.4.0",
+  "version": "1.5.0",
   "description": "Fidel's React Native bridge library for iOS and Android.",
   "main": "index.js",
   "nativePackage": true,

package/android/.project

@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>android</name>
-	<comment>Project android created by Buildship.</comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.buildship.core.gradleprojectbuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.buildship.core.gradleprojectnature</nature>
-	</natures>
-</projectDescription>

package/android/.settings/org.eclipse.buildship.core.prefs

@@ -1,2 +0,0 @@
-connection.project.dir=
-eclipse.preferences.version=1