airbridge-react-native-sdk-restricted 2.8.7 → 2.8.9

package/.github/workflows/gitflow.yml

@@ -0,0 +1,20 @@
+name: gitflow
+
+on:
+  pull_request:
+    types:
+      - opened
+      - synchronize
+      - reopened
+      - closed
+    branches:
+      - main
+      - develop
+
+jobs:
+  gitflow:
+    uses: ab180/gitflow/.github/workflows/gitflow.yml@v2
+    secrets:
+      GITHUB_APP_ID: ${{ secrets.SDK_TEAM_APP_ID }}
+      GITHUB_APP_PRIVATE_KEY: ${{ secrets.SDK_TEAM_APP_PRIVATE_KEY }}
+      GITHUB_APP_OWNER: ab180

package/.github/workflows/release-restricted.yml

@@ -0,0 +1,35 @@
+name: release-restricted
+
+on:
+  pull_request:
+    types:
+      - closed
+    branches:
+      - main
+
+jobs:
+  release-restricted:
+    runs-on: ubuntu-latest
+    if: |
+      github.event.pull_request.merged == true
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+
+      - name: Prepare node
+        uses: actions/setup-node@v3
+        with:
+          node-version: 18
+          registry-url: 'https://registry.npmjs.org'
+      
+      - name: Install dependencies
+        run: npm ci
+
+      - name: change restricted
+        run: sh scripts/change_restricted.sh
+
+      - name: Publish
+        env:
+          NODE_AUTH_TOKEN: ${{ secrets.SDK_TEAM_NPM_AUTOMATION_TOKEN }}
+        run: npm publish

package/.github/workflows/release.yml

@@ -0,0 +1,32 @@
+name: release
+
+on:
+  pull_request:
+    types:
+      - closed
+    branches:
+      - main
+
+jobs:
+  release:
+    runs-on: ubuntu-latest
+    if: |
+      github.event.pull_request.merged == true
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+
+      - name: Prepare node
+        uses: actions/setup-node@v3
+        with:
+          node-version: 18
+          registry-url: 'https://registry.npmjs.org'
+      
+      - name: Install dependencies
+        run: npm ci
+
+      - name: Publish
+        env:
+          NODE_AUTH_TOKEN: ${{ secrets.SDK_TEAM_NPM_AUTOMATION_TOKEN }}
+        run: npm publish

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

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

package/android/src/main/java/co/ab180/airbridge/reactnative/AirbridgeRN.java

@@ -12,8 +12,10 @@ import com.facebook.react.uimanager.ViewManager;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
+import java.util.Map;
 
 import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 
 import co.ab180.airbridge.Airbridge;
 
@@ -35,12 +37,25 @@ public class AirbridgeRN implements ReactPackage {
      * @param   appToken
      *              App Token
      */
-    public static void init(@Nonnull Application application, @Nonnull String appName, @Nonnull String appToken) {
-        Airbridge.init(application, ConfigReader.build(appName, appToken, application));
+    public static void init(
+            @Nonnull Application application,
+            @Nonnull String appName,
+            @Nonnull String appToken
+    ) {
+        init(application, appName, appToken, null);
     }
 
-  
-     /**
+    private static void init(
+            @Nonnull Application application,
+            @Nonnull String appName,
+            @Nonnull String appToken,
+            @Nullable Map<String, Object> airbridgeJSON
+    ) {
+        Airbridge.init(application, ConfigReader.build(application, appName, appToken, airbridgeJSON));
+    }
+
+
+    /**
      * Use this method to fetch the correct deep links in exceptional circumstances.
      *
      * When your app is opened by tapping a push notification,

package/android/src/main/java/co/ab180/airbridge/reactnative/ConfigReader.java

@@ -14,37 +14,52 @@ import java.io.InputStreamReader;
 import java.util.Map;
 import java.util.HashMap;
 
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+
 import co.ab180.airbridge.AirbridgeConfig;
 import co.ab180.airbridge.OnAttributionResultReceiveListener;
 
 class ConfigReader {
-    private ConfigReader() {}
+    private ConfigReader() {
+    }
 
-    static AirbridgeConfig build(String appName, String appToken, Context context) {
+    static AirbridgeConfig build(
+            @Nonnull Context context,
+            @Nonnull String appName,
+            @Nonnull String appToken,
+            @Nullable Map<String, Object> airbridgeJSON
+    ) {
         AirbridgeConfig.Builder configBuilder = new AirbridgeConfig.Builder(appName, appToken);
 
-        JSONObject configObject = null;
-        AssetManager assetManager = context.getAssets();
-        try {
-            BufferedReader reader = new BufferedReader(
-                new InputStreamReader(
-                    assetManager.open("airbridge.json")
-                )
-            );
-            
-            StringBuilder builder = new StringBuilder();
+        setJsonObject(context, configBuilder, airbridgeJSON);
 
-            String line = reader.readLine();
-            while (line != null) {
-                builder.append(line);
-                line = reader.readLine();
+        configBuilder.setPlatform("react_native");
+
+        configBuilder.setLifecycleIntegration(activity -> {
+            AirbridgeLifecycleIntegration callback = AirbridgeLifecycle.getLifecycleIntegration();
+            if (callback == null) {
+                return null;
+            } else {
+                return callback.getDataString(activity);
             }
+        });
 
-            configObject = new JSONObject(builder.toString());
-        } catch (IOException ignored) {
-            // when do not use airbridge.json file
-        } catch (JSONException e) {
-            Log.w("AirbridgeRN", "airbridge.json is not json format");
+        configBuilder.setOnAttributionResultReceiveListener(AirbridgeAttribution::processAttribution);
+
+        return configBuilder.build();
+    }
+
+    private static void setJsonObject(
+            @Nonnull Context context,
+            AirbridgeConfig.Builder configBuilder,
+            @Nullable Map<String, Object> airbridgeJSON) {
+
+        JSONObject configObject;
+        if (airbridgeJSON == null) {
+            configObject = loadJsonAsset(context);
+        } else {
+            configObject = loadAirbridgeJSON(airbridgeJSON);
         }
 
         Number sessionTimeoutSeconds = Get.type(Number.class, configObject, "sessionTimeoutSeconds");
@@ -105,27 +120,35 @@ class ConfigReader {
         resultLogLevel = resultLogLevel != null ? resultLogLevel : Log.WARN;
         configBuilder.setLogLevel(resultLogLevel);
 
-        configBuilder.setPlatform("react_native");
+    }
 
-        configBuilder.setLifecycleIntegration(new co.ab180.airbridge.AirbridgeLifecycleIntegration() {
-            @Override
-            public String getDataString(Activity activity) {
-                AirbridgeLifecycleIntegration callback = AirbridgeLifecycle.getLifecycleIntegration();
-                if (callback == null) {
-                    return null;
-                } else {
-                    return callback.getDataString(activity);
-                }
-            }
-        });
+    private static JSONObject loadJsonAsset(@Nonnull Context context) {
+        JSONObject configObject = null;
+        AssetManager assetManager = context.getAssets();
+        try {
+            BufferedReader reader = new BufferedReader(
+                    new InputStreamReader(assetManager.open("airbridge.json"))
+            );
+
+            StringBuilder builder = new StringBuilder();
 
-        configBuilder.setOnAttributionResultReceiveListener(new OnAttributionResultReceiveListener() {
-            @Override
-            public void onAttributionResultReceived(Map<String, String> attribution) {
-                AirbridgeAttribution.processAttribution(attribution);
+            String line = reader.readLine();
+            while (line != null) {
+                builder.append(line);
+                line = reader.readLine();
             }
-        });
-        
-        return configBuilder.build();
+
+            configObject = new JSONObject(builder.toString());
+        } catch (IOException ignored) {
+            // when do not use airbridge.json file
+        } catch (JSONException e) {
+            Log.w("AirbridgeRN", "airbridge.json is not json format");
+        }
+        return configObject;
     }
+
+    private static JSONObject loadAirbridgeJSON(@Nonnull Map<String, Object> airbridgeJSON) {
+        return new JSONObject(airbridgeJSON);
+    }
+
 }

package/changelog.md

@@ -1,3 +1,13 @@
+## 2.8.9
+
+**FIXED**
+* Solve issue that setAttributionListener is not working if airbridge.json is not exist.
+
+## 2.8.8
+
+**FIXED**
+* Support for lowercase characters for ID keys in setUser and updateUser methods
+
 ## 2.8.7
 
 **FIXED**

package/ios/AirbridgeRN/ARNConfigReader.h

@@ -12,7 +12,7 @@ NS_ASSUME_NONNULL_BEGIN
 
 @interface ARNConfigReader : NSObject
 
-+ (void) apply;
++ (void)apply:(NSDictionary*)airbridgeJSON;
 
 @end
 

package/ios/AirbridgeRN/ARNConfigReader.m

@@ -8,72 +8,73 @@
 
 #import "ARNConfigReader.h"
 
-#import "AirbridgeAttribution.h"
 #import "ARNGet.h"
 
 #import <AirBridge/AirBridge.h>
 
 @implementation ARNConfigReader
 
-+ (void) apply {
-    NSString* path = [NSBundle.mainBundle pathForResource:@"airbridge" ofType:@"json"];
-    NSData* data = [NSData dataWithContentsOfFile:path];
-    NSDictionary* json = nil;
-    if (data != nil) {
-        json = [NSJSONSerialization JSONObjectWithData:data options:0 error:nil];
++ (void)apply:(NSDictionary*)airbridgeJSON {
+    NSDictionary* dictionary = airbridgeJSON;
+    if (dictionary == nil) {
+        return;
     }
     
-    NSNumber* sessionTimeoutSeconds = [ARNGet type:NSNumber.class dictionary:json key:@"sessionTimeoutSeconds"];
+    NSNumber* sessionTimeoutSeconds = [ARNGet type:NSNumber.class dictionary:dictionary key:@"sessionTimeoutSeconds"];
     if (sessionTimeoutSeconds != nil) {
         [AirBridge setSessionTimeout:sessionTimeoutSeconds.intValue * 1000];
     }
     
-    NSNumber* autoStartTrackingEnabled = [ARNGet type:NSNumber.class dictionary:json key:@"autoStartTrackingEnabled"];
+    NSNumber* autoStartTrackingEnabled = [ARNGet type:NSNumber.class dictionary:dictionary key:@"autoStartTrackingEnabled"];
     if (autoStartTrackingEnabled != nil) {
         [AirBridge setAutoStartTrackingEnabled:autoStartTrackingEnabled.boolValue];
     }
     
-    NSNumber* userInfoHashEnabled = [ARNGet type:NSNumber.class dictionary:json key:@"userInfoHashEnabled"];
+    NSNumber* userInfoHashEnabled = [ARNGet type:NSNumber.class dictionary:dictionary key:@"userInfoHashEnabled"];
     if (userInfoHashEnabled != nil) {
         [AirBridge setIsUserInfoHashed:userInfoHashEnabled.boolValue];
     }
     
-    NSNumber* trackAirbridgeLinkOnly = [ARNGet type:NSNumber.class dictionary:json key:@"trackAirbridgeLinkOnly"];
+    NSNumber* trackAirbridgeLinkOnly = [ARNGet type:NSNumber.class dictionary:dictionary key:@"trackAirbridgeLinkOnly"];
     if (trackAirbridgeLinkOnly != nil) {
         [AirBridge setIsTrackAirbridgeDeeplinkOnly:trackAirbridgeLinkOnly.boolValue];
     }
     
-    NSNumber* facebookDeferredAppLinkEnabled = [ARNGet type:NSNumber.class dictionary:json key:@"facebookDeferredAppLinkEnabled"];
+    NSNumber* facebookDeferredAppLinkEnabled = [ARNGet type:NSNumber.class dictionary:dictionary key:@"facebookDeferredAppLinkEnabled"];
     if (facebookDeferredAppLinkEnabled != nil) {
         [AirBridge setIsFacebookDeferredAppLinkEnabled:facebookDeferredAppLinkEnabled.boolValue];
     }
 
-    NSNumber* trackingAuthorizeTimeoutSeconds = [ARNGet type:NSNumber.class dictionary:json key:@"trackingAuthorizeTimeoutSeconds"];
+    NSNumber* trackingAuthorizeTimeoutSeconds = [ARNGet type:NSNumber.class dictionary:dictionary key:@"trackingAuthorizeTimeoutSeconds"];
     if (trackingAuthorizeTimeoutSeconds != nil) {
         AirBridge.setting.trackingAuthorizeTimeout = trackingAuthorizeTimeoutSeconds.unsignedLongLongValue * 1000;
     }
     
-    NSString* secretID = [ARNGet type:NSString.class dictionary:json key:@"sdkSignatureSecretID"];
-    NSString* secretKey = [ARNGet type:NSString.class dictionary:json key:@"sdkSignatureSecret"];
+    NSString* secretID = [ARNGet type:NSString.class dictionary:dictionary key:@"sdkSignatureSecretID"];
+    NSString* secretKey = [ARNGet type:NSString.class dictionary:dictionary key:@"sdkSignatureSecret"];
     if (secretID != nil && secretKey != nil) {
         [AirBridge setSDKSignatureSecretWithID:secretID secret:secretKey];
     }
 
-    NSString* logLevel = [ARNGet type:NSString.class dictionary:json key:@"logLevel"] ?: @"";
-    [AirBridge setLogLevel:(
-        [@{
-            @"debug": @(AB_LOG_DEBUG),
-            @"info": @(AB_LOG_INFO),
-            @"warning": @(AB_LOG_WARNING),
-            @"error": @(AB_LOG_CRITICAL),
-            @"fault": @(AB_LOG_CRASH)
-        } objectForKey: [logLevel lowercaseString]
-        ] ?: @(AB_LOG_WARNING)
-    )];
-
-    [AirBridge.state setSDKDevelopmentPlatform:@"react_native"];
-    
-    [AirbridgeAttribution setInitialAttributionCallback];
+    NSString* logLevel = [ARNGet type:NSString.class dictionary:dictionary key:@"logLevel"] ?: @"";
+    if ([logLevel isEqualToString:@"debug"]) {
+        [AirBridge setLogLevel:AB_LOG_DEBUG];
+    }
+    else if ([logLevel isEqualToString:@"info"]) {
+        [AirBridge setLogLevel:AB_LOG_INFO];
+    }
+    else if ([logLevel isEqualToString:@"warning"]) {
+        [AirBridge setLogLevel:AB_LOG_WARNING];
+    }
+    else if ([logLevel isEqualToString:@"error"]) {
+        [AirBridge setLogLevel:AB_LOG_CRITICAL];
+    }
+    else if ([logLevel isEqualToString:@"fault"]) {
+        [AirBridge setLogLevel:AB_LOG_CRASH];
+    }
+    else {
+        [AirBridge setLogLevel:AB_LOG_WARNING];
+    }
 }
 
 @end

package/ios/AirbridgeRN/AirbridgeRN.m

@@ -8,6 +8,7 @@
 
 #import "AirbridgeRN.h"
 
+#import "AirbridgeAttribution.h"
 #import "AirbridgeDeeplink.h"
 
 // Airbridge
@@ -27,8 +28,31 @@ static AirbridgeRN* instance;
     return instance;
 }
 
-+ (AirbridgeRN*)getInstance:(NSString*)appToken appName:(NSString*)appName withLaunchOptions:(nullable NSDictionary*)launchOptions {
-    [ARNConfigReader apply];
++ (AirbridgeRN*)getInstance:(NSString*)appToken
+                    appName:(NSString*)appName
+          withLaunchOptions:(nullable NSDictionary*)launchOptions
+{
+    NSString* path = [NSBundle.mainBundle pathForResource:@"airbridge" ofType:@"json"];
+    NSData* data = [NSData dataWithContentsOfFile:path];
+    NSDictionary* airbridgeJSON = nil;
+    if (data != nil) {
+        airbridgeJSON = [NSJSONSerialization JSONObjectWithData:data options:0 error:nil];
+    }
+
+    return [AirbridgeRN getInstance:appToken
+                            appName:appName
+                  withAirbridgeJSON:airbridgeJSON
+                  withLaunchOptions:launchOptions];
+}
+
++ (AirbridgeRN*)getInstance:(NSString*)appToken
+                    appName:(NSString*)appName
+          withAirbridgeJSON:(nullable NSDictionary*)airbridgeJSON
+          withLaunchOptions:(nullable NSDictionary*)launchOptions
+{
+    [ARNConfigReader apply:airbridgeJSON];
+    [AirBridge.state setSDKDevelopmentPlatform:@"react_native"];
+    [AirbridgeAttribution setInitialAttributionCallback];
     
     [AirBridge getInstance:appToken appName:appName withLaunchOptions:launchOptions];
     [AirbridgeDeeplink setInitialDeeplinkCallback];

package/ios/copy-config.rb

@@ -1,7 +1,7 @@
 require 'xcodeproj'
 require 'pathname'
 
-current_directory=__dir__
+current_directory=File.dirname(__FILE__)
 ios_project_directory=`cd #{current_directory}; cd ../../../ios; pwd`.gsub("\n", "")
 ios_project_file=File.join(
     ios_project_directory,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "airbridge-react-native-sdk-restricted",
-  "version": "2.8.7",
+  "version": "2.8.9",
   "description": "Airbridge SDK for React Native",
   "main": "index.js",
   "types": "index.d.ts",

package/qa/.bundle/config

@@ -0,0 +1,2 @@
+BUNDLE_PATH: "vendor/bundle"
+BUNDLE_FORCE_RUBY_PLATFORM: 1

package/qa/.eslintrc.js

@@ -0,0 +1,4 @@
+module.exports = {
+  root: true,
+  extends: '@react-native',
+};

package/qa/.prettierrc.js

@@ -0,0 +1,7 @@
+module.exports = {
+  arrowParens: 'avoid',
+  bracketSameLine: true,
+  bracketSpacing: false,
+  singleQuote: true,
+  trailingComma: 'all',
+};

package/qa/.watchmanconfig

@@ -0,0 +1 @@
+{}

package/qa/Gemfile

@@ -0,0 +1,9 @@
+source 'https://rubygems.org'
+
+# You may use http://rbenv.org/ or https://rvm.io/ to install and use this version
+ruby ">= 2.6.10"
+
+# Cocoapods 1.15 introduced a bug which break the build. We will remove the upper
+# bound in the template on Cocoapods with next React Native release.
+gem 'cocoapods', '>= 1.13', '< 1.15'
+gem 'activesupport', '>= 6.1.7.5', '< 7.1.0'

package/qa/Gemfile.lock

@@ -0,0 +1,105 @@
+GEM
+  remote: https://rubygems.org/
+  specs:
+    CFPropertyList (3.0.7)
+      base64
+      nkf
+      rexml
+    activesupport (7.0.8.4)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      tzinfo (~> 2.0)
+    addressable (2.8.6)
+      public_suffix (>= 2.0.2, < 6.0)
+    algoliasearch (1.27.5)
+      httpclient (~> 2.8, >= 2.8.3)
+      json (>= 1.5.1)
+    atomos (0.1.3)
+    base64 (0.2.0)
+    claide (1.1.0)
+    cocoapods (1.14.3)
+      addressable (~> 2.8)
+      claide (>= 1.0.2, < 2.0)
+      cocoapods-core (= 1.14.3)
+      cocoapods-deintegrate (>= 1.0.3, < 2.0)
+      cocoapods-downloader (>= 2.1, < 3.0)
+      cocoapods-plugins (>= 1.0.0, < 2.0)
+      cocoapods-search (>= 1.0.0, < 2.0)
+      cocoapods-trunk (>= 1.6.0, < 2.0)
+      cocoapods-try (>= 1.1.0, < 2.0)
+      colored2 (~> 3.1)
+      escape (~> 0.0.4)
+      fourflusher (>= 2.3.0, < 3.0)
+      gh_inspector (~> 1.0)
+      molinillo (~> 0.8.0)
+      nap (~> 1.0)
+      ruby-macho (>= 2.3.0, < 3.0)
+      xcodeproj (>= 1.23.0, < 2.0)
+    cocoapods-core (1.14.3)
+      activesupport (>= 5.0, < 8)
+      addressable (~> 2.8)
+      algoliasearch (~> 1.0)
+      concurrent-ruby (~> 1.1)
+      fuzzy_match (~> 2.0.4)
+      nap (~> 1.0)
+      netrc (~> 0.11)
+      public_suffix (~> 4.0)
+      typhoeus (~> 1.0)
+    cocoapods-deintegrate (1.0.5)
+    cocoapods-downloader (2.1)
+    cocoapods-plugins (1.0.0)
+      nap
+    cocoapods-search (1.0.1)
+    cocoapods-trunk (1.6.0)
+      nap (>= 0.8, < 2.0)
+      netrc (~> 0.11)
+    cocoapods-try (1.2.0)
+    colored2 (3.1.2)
+    concurrent-ruby (1.3.3)
+    escape (0.0.4)
+    ethon (0.16.0)
+      ffi (>= 1.15.0)
+    ffi (1.17.0)
+    fourflusher (2.3.1)
+    fuzzy_match (2.0.4)
+    gh_inspector (1.1.3)
+    httpclient (2.8.3)
+    i18n (1.14.5)
+      concurrent-ruby (~> 1.0)
+    json (2.7.2)
+    minitest (5.23.1)
+    molinillo (0.8.0)
+    nanaimo (0.3.0)
+    nap (1.1.0)
+    netrc (0.11.0)
+    nkf (0.2.0)
+    public_suffix (4.0.7)
+    rexml (3.2.9)
+      strscan
+    ruby-macho (2.5.1)
+    strscan (3.1.0)
+    typhoeus (1.4.1)
+      ethon (>= 0.9.0)
+    tzinfo (2.0.6)
+      concurrent-ruby (~> 1.0)
+    xcodeproj (1.24.0)
+      CFPropertyList (>= 2.3.3, < 4.0)
+      atomos (~> 0.1.3)
+      claide (>= 1.0.2, < 2.0)
+      colored2 (~> 3.1)
+      nanaimo (~> 0.3.0)
+      rexml (~> 3.2.4)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  activesupport (>= 6.1.7.5, < 7.1.0)
+  cocoapods (>= 1.13, < 1.15)
+
+RUBY VERSION
+   ruby 3.3.0p0
+
+BUNDLED WITH
+   2.5.4

package/qa/__tests__/App.test.tsx

@@ -0,0 +1,17 @@
+/**
+ * @format
+ */
+
+import 'react-native';
+import React from 'react';
+import App from '../App';
+
+// Note: import explicitly to use the types shipped with jest.
+import {it} from '@jest/globals';
+
+// Note: test renderer must be required after react-native.
+import renderer from 'react-test-renderer';
+
+it('renders correctly', () => {
+  renderer.create(<App />);
+});

package/qa/airbridge.json

@@ -0,0 +1,7 @@
+{
+    "sessionTimeoutSeconds": 15,
+    "trackingAuthorizeTimeoutSeconds": 15,
+    "sdkSignatureSecretID": "eacf944d-a6da-47e2-a38c-ac3f76bb37bb",
+    "sdkSignatureSecret": "d8ddd2b61947195fa73ef5d8d3cc4092acb280c281f1fc96479c35ef483f2cfe",
+    "logLevel": "debug"
+}