airbridge-react-native-sdk-restricted 2.8.0 → 2.8.1

package/changelog.md

@@ -1,3 +1,8 @@
+## 2.8.1
+
+**FIXED**
+* Fixed a bug that iOS APNS token double encoding issue
+
 ## 2.8.0
 
 **FIXED**

package/ios/AirbridgeRN/ARNHex.h

@@ -0,0 +1,16 @@
+//
+//  Hex.h
+//  AirbridgeRN
+//
+
+#import <Foundation/Foundation.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface ARNHex : NSObject
+
++ (nullable NSData *)dataFromHexString:(NSString *)string;
+
+@end
+
+NS_ASSUME_NONNULL_END

package/ios/AirbridgeRN/ARNHex.m

@@ -0,0 +1,44 @@
+//
+//  Hex.m
+//  AirbridgeRN
+//
+
+#import "ARNHex.h"
+
+@implementation ARNHex
+
++ (nullable NSData *)dataFromHexString:(NSString *)string {
+    // Convert the string to lowercase only once
+    string = [string lowercaseString];
+    NSUInteger length = [string length];
+    
+    // Reserve capacity for the mutable data to avoid frequent reallocation
+    NSMutableData* data = [NSMutableData dataWithCapacity:length / 2];
+    
+    // Define constants for hex characters
+    static const char hexCharacters[] = "0123456789abcdef";
+    
+    for (NSUInteger i = 0; i < length; i += 2) {
+        // Get two characters at once for better performance
+        char highCharacter = [string characterAtIndex:i];
+        char lowCharacter = (i + 1 < length) ? [string characterAtIndex:i + 1] : 0;
+        
+        // Convert hex characters to bytes
+        const char *highCharacterPointer = strchr(hexCharacters, highCharacter);
+        const char *lowCharacterPointer = strchr(hexCharacters, lowCharacter);
+        if (!highCharacterPointer || !lowCharacterPointer) {
+            // catch invalid characters
+            return nil;
+        }
+        
+        // Calculate the byte from the hex characters
+        uint8_t byte = ((highCharacterPointer - hexCharacters) << 4) | (lowCharacterPointer - hexCharacters);
+        
+        // Append the byte to the data
+        [data appendBytes:&byte length:1];
+    }
+    
+    return data;
+}
+
+@end

package/ios/AirbridgeRN/AirbridgeState.m

@@ -12,6 +12,7 @@
 #import <AirBridge/AirBridge.h>
 
 #import "ARNGet.h"
+#import "ARNHex.h"
 
 @implementation AirbridgeState
 
@@ -82,7 +83,11 @@ RCT_EXPORT_METHOD(clearDeviceAlias) {
 }
 
 RCT_EXPORT_METHOD(registerPushToken:(nullable NSString*)token) {
-    NSData* data = [token dataUsingEncoding:NSUTF8StringEncoding];
+    if (token == nil) return;
+    
+    NSData* data = [ARNHex dataFromHexString:token];
+    if (data == nil) return;
+
     [AirBridge registerPushToken:data];
 }
 

package/ios/AirbridgeRN.xcodeproj/project.pbxproj

@@ -7,6 +7,8 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
+		9F2C4C132B9EC9EE0064A9B7 /* ARNHex.m in Sources */ = {isa = PBXBuildFile; fileRef = 9F2C4C112B9EC9EE0064A9B7 /* ARNHex.m */; };
+		9F2C4C142B9EC9EE0064A9B7 /* ARNHex.h in Headers */ = {isa = PBXBuildFile; fileRef = 9F2C4C122B9EC9EE0064A9B7 /* ARNHex.h */; };
 		C300721F24A0B6C3003F8073 /* ARNConfigReader.h in Headers */ = {isa = PBXBuildFile; fileRef = C300721D24A0B6C3003F8073 /* ARNConfigReader.h */; };
 		C300722024A0B6C3003F8073 /* ARNConfigReader.m in Sources */ = {isa = PBXBuildFile; fileRef = C300721E24A0B6C3003F8073 /* ARNConfigReader.m */; };
 		C34284B62266E7040060226A /* AirbridgeRN.h in Headers */ = {isa = PBXBuildFile; fileRef = C34284B42266E7040060226A /* AirbridgeRN.h */; };
@@ -53,6 +55,8 @@
 
 /* Begin PBXFileReference section */
 		134814201AA4EA6300B7C361 /* libAirbridgeRN.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libAirbridgeRN.a; sourceTree = BUILT_PRODUCTS_DIR; };
+		9F2C4C112B9EC9EE0064A9B7 /* ARNHex.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ARNHex.m; sourceTree = "<group>"; };
+		9F2C4C122B9EC9EE0064A9B7 /* ARNHex.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ARNHex.h; sourceTree = "<group>"; };
 		C300721D24A0B6C3003F8073 /* ARNConfigReader.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ARNConfigReader.h; sourceTree = "<group>"; };
 		C300721E24A0B6C3003F8073 /* ARNConfigReader.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ARNConfigReader.m; sourceTree = "<group>"; };
 		C34284B42266E7040060226A /* AirbridgeRN.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AirbridgeRN.h; sourceTree = "<group>"; };
@@ -110,6 +114,8 @@
 		C3BF1EDF2264485C00271B03 /* AirbridgeRN */ = {
 			isa = PBXGroup;
 			children = (
+				9F2C4C122B9EC9EE0064A9B7 /* ARNHex.h */,
+				9F2C4C112B9EC9EE0064A9B7 /* ARNHex.m */,
 				C34284B42266E7040060226A /* AirbridgeRN.h */,
 				C34284B52266E7040060226A /* AirbridgeRN.m */,
 				C35560322264267700D6D240 /* AirbridgeDeeplink.h */,
@@ -135,6 +141,7 @@
 			isa = PBXHeadersBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				9F2C4C142B9EC9EE0064A9B7 /* ARNHex.h in Headers */,
 				C37E9CF9249856EC00BC790F /* ARNGet.h in Headers */,
 				C34284B62266E7040060226A /* AirbridgeRN.h in Headers */,
 				C39C1CD123029BD100CECBD8 /* AirbridgePlacement.h in Headers */,
@@ -231,6 +238,7 @@
 				C35819CB2273324400DCD619 /* AirbridgeState.m in Sources */,
 				C300722024A0B6C3003F8073 /* ARNConfigReader.m in Sources */,
 				C37E9CFA249856EC00BC790F /* ARNGet.m in Sources */,
+				9F2C4C132B9EC9EE0064A9B7 /* ARNHex.m in Sources */,
 				C34284B72266E7040060226A /* AirbridgeRN.m in Sources */,
 				C35560352264267700D6D240 /* AirbridgeDeeplink.m in Sources */,
 			);

package/package.json

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

package/src/WebInterface.js

@@ -26,7 +26,7 @@ class WebInterface {
 
         const getScript = function (webToken, postCommand) {
             const jsonSchemaVersion = 4;
-            const sdkVersion = '2.8.0';
+            const sdkVersion = '2.8.1';
     
             return `
                 AirbridgeNative = {};

package/airbridge-react-native-sdk.podspec.bak

@@ -1,32 +0,0 @@
-require 'json'
-require_relative 'ios/copy-config.rb'
-
-package = JSON.parse(File.read(File.join(__dir__, 'package.json')))
-
-Pod::Spec.new do |s|
-    s.name                  = package['name']
-    s.version               = package['version']
-    s.summary               = package['description']
-    s.description           = package['description']
-    s.license               = package['license']
-    s.author                = package['author']
-    s.homepage              = package['homepage']
-    s.source                = { :http => 'file:' + __dir__ }
-
-    s.requires_arc          = true
-    s.platform              = :ios, '11.0'
-
-    s.preserve_paths        = 'README.md', 'package.json', 'index.js'
-
-    s.source_files          = 'ios/AirbridgeRN/*.{h,m}'
-
-    s.header_dir            = 'AirbridgeRN'
-    s.public_header_files   = 'ios/AirbridgeRN/AirbridgeRN.h'
-
-    s.dependency 'React'
-    s.dependency 'AirBridge', '1.36.0'
-
-    s.pod_target_xcconfig = {
-        'DEFINES_MODULE' => 'YES'
-    }
-end

package/android/build.gradle.bak

@@ -1,27 +0,0 @@
-apply plugin: 'com.android.library'
-
-android {
-    compileSdkVersion 30
-    buildToolsVersion '29.0.2'
-
-    defaultConfig {
-        minSdkVersion 16
-        targetSdkVersion 30
-        versionCode 1
-        versionName '1.0.0'
-    }
-}
-
-rootProject.allprojects {
-    repositories {
-        maven { url 'https://sdk-download.airbridge.io/maven' }
-    }
-}
-
-dependencies {
-    implementation 'com.facebook.react:react-native:+'
-    api 'io.airbridge:sdk-android:2.24.0'
-    implementation 'com.android.installreferrer:installreferrer:2.1'
-}
-
-apply from: 'copy-config.gradle'

package/index.d.ts.bak

@@ -1,292 +0,0 @@
-declare module "airbridge-react-native-sdk" {
-
-    /**
-     * main class (singleton)
-     */
-    class Airbridge {
-        event: Event;
-        deeplink: Deeplink;
-        state: State;
-        placement: Placement;
-
-        /**
-         * Set device alias
-         * @param {string} key - device alias key
-         * @param {string} value - device alias value
-         */
-        setDeviceAlias(key: string, value: string): void;
-
-        /**
-         * Remove device alias
-         * @param {string} key - callback of attribution
-         */
-        removeDeviceAlias(key: string): void;
-
-        /**
-         * clear device alias
-         */
-        clearDeviceAlias(): void;
-
-        /**
-         * Send event to server.
-         * @param {string} category event name
-         * @param {EventOption} [option={}] event options
-         */
-        trackEvent(category: string, option?: EventOption): void;
-
-        /**
-         * register push token
-         * @param {string} token - push token
-         */
-        registerPushToken(token: string): void;
-
-        /**
-         * create interface of webview
-         * @param webToken token for airbridge web sdk that using on webview
-         * @param postCommandFunction notify to interface how to post command to native
-         * @returns {WebInterface} Web Interface
-         */
-        createWebInterface(
-            webToken: string,
-            postCommandFunction: (command: string) => string,
-        ): WebInterface;
-    }
-
-    /**
-     * class for interface of webview
-     */
-    class WebInterface {
-        script: string;
-        /**
-         * handle command from webview
-         * @param {String} command command from webview
-         */
-        handle(command: string): void;
-    }
-
-    /**
-     * @param deeplink - URL of deeplink
-     */
-    type DeeplinkListener = (deeplink: string | null) => void;
-
-    /**
-     * class for set SDK's deeplink behavior (singleton)
-     */
-    class Deeplink {
-        /**
-         * Set DeeplinkListener (listen deeplink or deferred-deeplink)<br/>
-         * @param listener - callback of deeplink & deferred-deeplink
-         */
-        setDeeplinkListener(listener: DeeplinkListener): void;
-    }
-
-    /**
-     * class for send event (singleton)
-     */
-    class Event {
-        /**
-         * Send event to server.
-         * @param {string} category event name
-         * @param {EventOption} [option={}] event options
-         */
-        trackEvent(category: string, option?: EventOption): void;
-    }
-
-    /**
-     * class for use SDK's placement function (singleton)
-     */
-    class Placement {
-        /**
-         * 1. send +1 click statistics to server<br/>
-         * 2. get deeplink and fallback from server<br/>
-         * 3. open deeplink. when fail, open fallback<br/>
-         * 4. parameter's deeplink, fallback is spare for network-fail
-         * @param trackingLink - created on dashboard
-         */
-        click(trackingLink: string): void;
-        /**
-         * send +1 impression statistics to server<br/>
-         * @param trackingLink - created on dashboard
-         */
-        impression(trackingLink: string): void;
-    }
-
-    /**
-     * @param attribution - URL of attribution
-     */
-    type AttributionListener = (attribution: {
-        [key: string]: string;
-    }) => void;
-
-    /**
-     * class for manage SDK's state (singleton)
-     */
-    class State {
-        /**
-         * set current user<br/>
-         *
-         * user.property is null, if input.property is null
-         * @param user - user infomation
-         */
-        setUser(user: User): void;
-        /**
-         * update current user<br/>
-         *
-         * user.property not be changed, if input.property is null
-         * @param user - user infomation
-         */
-        updateUser(user: User): void;
-        /**
-         * make airbridge start tracking
-         */
-        startTracking(): void;
-        /**
-         * get deviceUUID of Airbridge SDK.
-         */
-        deviceUUID(): Promise<string>;
-        /**
-         * Set AttributionListener (listen attribution)<br/>
-         * @param listener - callback of attribution
-         */
-        setAttributionListener(listener: AttributionListener): void;
-
-        /**
-         * Set device alias
-         * @param {string} key - device alias key
-         * @param {string} value - device alias value
-         */
-        setDeviceAlias(key: string, value: string): void;
-
-        /**
-         * Remove device alias
-         * @param {string} key - callback of attribution
-         */
-        removeDeviceAlias(key: string): void;
-
-        /**
-         * clear device alias
-         */
-        clearDeviceAlias(): void;
-
-        /**
-         * register push token
-         * @param {string} token - push token
-         */
-        registerPushToken(token: string): void;
-    }
-
-    class WebInterface {
-
-        /**
-         * handle command from webview
-         */
-        public readonly script: string;
-
-        /**
-         * handle command from webview
-         * @param {String} command command from webview
-         */
-        handle(command: string): void;    
-    }
-
-    /**
-     * @property {string} [action] event group name 1
-     * @property {string} [label] event group name 2
-     * @property {number} [value] event custom value
-     * @property {{}} [customAttributes] event custom attributes
-     * @property {{}} [semanticAttributes] event semantic attributes
-     */
-    type EventOption = {
-        action?: string;
-        label?: string;
-        value?: number;
-        customAttributes?: {
-            [key: string]: string;
-        };
-        semanticAttributes?: {
-            [key: string]: any;
-        };
-    };
-
-    /**
-     * @property {string} [ID] - Product's unique identifier
-     * @property {string} [name] - Product's name
-     * @property {string} [currency] - currency in <a href='https://en.wikipedia.org/wiki/ISO_4217'>ISO 4217<a/>
-     * @property {number} [price] - Product's price
-     * @property {number} [quantity] - Purchased quantity
-     * @property {number} [position] - Product's index in list
-     */
-    type Product = {
-        ID?: string;
-        name?: string;
-        currency?: string;
-        price?: number;
-        quantity?: number;
-        position?: number;
-    };
-
-    /**
-     * @property {string} [ID] - User's ID (not allow empty string)
-     * @property {string} [email] - User's Email (not allow empty string)
-     * @property {string} [phone] - User's Phone Number (not allow empty string)
-     * @property {{}} [alias] - User's Alias
-     * @property {{}} [attributes] - User's Attributes
-     */
-    type User = {
-        ID?: string;
-        email?: string;
-        phone?: string;
-        alias?: {
-            [key: string]: string;
-        };
-        attributes?: {
-            [key: string]: any;
-        };
-    };
-
-    const AirbridgeCategory: {
-        SIGN_UP: string
-        SIGN_IN: string
-        SIGN_OUT: string
-
-        HOME_VIEW: string
-        SEARCH_RESULT_VIEW: string
-        PRODUCT_LIST_VIEW: string
-        PRODUCT_DETAILS_VIEW: string
-
-        ADD_TO_CART: string
-        ORDER_COMPLETED: string
-    }
-
-    const AirbridgeAttributes: {
-        QUERY: string
-        PRODUCT_LIST_ID: string
-        CART_ID: string
-        TRANSACTION_ID: string
-        PRODUCTS: string
-        IN_APP_PURCHASED: string
-        CURRENCY: string
-        TOTAL_VALUE: string
-        TOTAL_QUANTITY: string
-    }
-
-    const AirbridgeProduct: {
-        PRODUCT_ID: string
-        NAME: string
-        CURRENCY: string
-        PRICE: string
-        QUANTITY: string
-        POSITION: string
-    }
-
-    const airbridge: Airbridge;
-
-    export default airbridge;
-
-    export {
-        AirbridgeCategory,
-        AirbridgeAttributes,
-        AirbridgeProduct,
-        WebInterface,
-    }
-}