react-native-netmera 1.6.3 → 1.6.4

package/README.md

@@ -210,9 +210,9 @@ export const onPushReceive = async (message) => {
 
    ```
    // For receiving Media Push, you must add Netmera pods to top of your Podfile.
-   pod "Netmera", "3.14.10-WithoutDependency"
-   pod "Netmera/NotificationServiceExtension", "3.14.10-WithoutDependency"
-   pod "Netmera/NotificationContentExtension", "3.14.10-WithoutDependency"
+   pod "Netmera", "3.23.1-WithoutDependency"
+   pod "Netmera/NotificationServiceExtension", "3.23.1-WithoutDependency"
+   pod "Netmera/NotificationContentExtension", "3.23.1-WithoutDependency"
    ```
 
 5. In order to use the widget URL callback, add these methods to between `@implementation AppDelegate` and `@end`.
@@ -364,6 +364,18 @@ You can send your events as follows. For more examples, please see the [example
   }
 ```
 
+##### Deeplink
+
+In order to manage your deeplinks, use the following method instead of `Linking.getInitialURL`
+
+```
+Netmera.getInitialURL(url => {
+  console.log(url);
+});
+```
+
+You can use other `Linking` methods as before
+
 ##### Widget URL Callback
 
 In order to use the widget URL callback, use `onWidgetUrlTriggered` method as follows.

package/RNNetmera.podspec

@@ -18,6 +18,6 @@ Pod::Spec.new do |s|
   s.requires_arc = true
 
   s.dependency 'React'
-  s.dependency 'Netmera','3.22.0-WithoutDependency'
+  s.dependency 'Netmera','3.23.1-WithoutDependency'
 end
 

package/android/build.gradle

@@ -15,7 +15,7 @@ android {
 }
 
 dependencies {
-    implementation 'com.netmera:nmcore:3.11.3'
+    implementation 'com.netmera:nmcore:3.11.5'
     implementation 'com.netmera:nmfcm:3.11.0'
     implementation 'com.netmera:nmhms:3.11.0'
     implementation 'com.facebook.react:react-native:+'

package/android/src/main/java/com/netmera/reactnativesdk/RNNetmera.java

@@ -23,7 +23,7 @@ public class RNNetmera {
     static void setNetmeraHeaders() {
         ContentValues headerValues = new ContentValues();
         headerValues.put("X-netmera-framework", "react");
-        headerValues.put("X-netmera-frameworkV", "1.6.3");
+        headerValues.put("X-netmera-frameworkV", "1.6.4");
         Netmera.setNetmeraHeaders(headerValues);
     }
 

package/android/src/main/java/com/netmera/reactnativesdk/RNNetmeraModule.java

@@ -30,6 +30,7 @@ import com.netmera.callbacks.NMCategoryPreferenceFetchCallback;
 import com.netmera.callbacks.NMCategoryPreferenceSetCallback;
 import com.netmera.callbacks.NMFetchCouponsResultListener;
 import com.netmera.callbacks.NMInboxCountResultListener;
+import com.netmera.callbacks.NMUpdateUserListener;
 import com.netmera.data.NMCategoryPreference;
 import com.netmera.data.NMCouponDetail;
 import com.netmera.data.NMInboxStatusCount;
@@ -70,6 +71,9 @@ public class RNNetmeraModule extends ReactContextBaseJavaModule {
     private static final String ERROR_MESSAGE_SET_CATEGORY_PREFERENCE = "Error occurred while setting user category preference list.";
     private static final String ERROR_CODE_COUPON_FETCH = "2026";
     private static final String ERROR_MESSAGE_COUPON_FETCH = "Error occurred while fetching coupons.";
+    private static final String ERROR_CODE_UPDATE_USER = "2027";
+    private static final String ERROR_MESSAGE_UPDATE_USER = "Error occurred while updating user. Reason: ";
+
 
     public static ReactApplicationContext reactContext;
     private NetmeraInbox netmeraInbox;
@@ -294,7 +298,7 @@ public class RNNetmeraModule extends ReactContextBaseJavaModule {
     }
 
     @ReactMethod
-    public void updateUser(ReadableMap readableMap) {
+    public void updateUser(ReadableMap readableMap, final Promise promise) {
         Map userMap = RNNetmeraUtil.toMap(readableMap);
         userMap.values().removeAll(Collections.singleton(null));
         RNNetmeraUser netmeraUser = new RNNetmeraUser();
@@ -315,7 +319,17 @@ public class RNNetmeraModule extends ReactContextBaseJavaModule {
         }
 
         netmeraUser.setUserParameters(userMap);
-        Netmera.updateUser(netmeraUser);
+        Netmera.updateUser(netmeraUser, new NMUpdateUserListener() {
+            @Override
+            public void onSuccess() {
+                promise.resolve(null);
+            }
+
+            @Override
+            public void onFailure(@Nullable String s) {
+                promise.reject(ERROR_CODE_UPDATE_USER, ERROR_MESSAGE_UPDATE_USER + s);
+            }
+        });
     }
 
     @ReactMethod

package/ios/RNNetmera.m

@@ -1,8 +1,7 @@
 //
 //  RNNetmera.m
-//  Netmera SDK
 //
-//  Created by Huseyin Kocoglu on 22.04.2019.
+//  Created by Initial Code
 //  Copyright © 2019 Netmera. All rights reserved.
 //
 
@@ -12,6 +11,7 @@
 #import "RNNetmeraUtils.h"
 #import "RNNetmeraCategoryObject.h"
 #import <Netmera/Netmera.h>
+#import <RNNetmera/RNNetmeraRCTEventEmitter.h>
 
 NSString *const ERROR_CODE_INBOX = @"2016";
 NSString *const ERROR_MESSAGE_INBOX = @"There was a problem fetching inbox";
@@ -33,6 +33,8 @@ NSString *const ERROR_CODE_SET_CATEGORY_PREFERENCE = @"2025";
 NSString *const ERROR_MESSAGE_SET_CATEGORY_PREFERENCE = @"Error occurred while setting user category preference list.";
 NSString *const ERROR_CODE_COUPON_FETCH = @"2026";
 NSString *const ERROR_MESSAGE_COUPON_FETCH = @"Error occurred while fetching coupons.";
+NSString *const ERROR_CODE_UPDATE_USER = @"2027";
+NSString *const ERROR_MESSAGE_UPDATE_USER = @"Error occurred while updating user. Reason: ";
 
 @implementation RNNetmera
 
@@ -44,11 +46,16 @@ NSString *const ERROR_MESSAGE_COUPON_FETCH = @"Error occurred while fetching cou
     [Netmera start];
     [Netmera setAPIKey:apiKey];
     [self setNetmeraHeaders];
+    [Netmera setDeeplinkCallback:^(NSURL * _Nullable url, NetmeraPushObject * _Nullable pushObject) {
+        if (url != nil) {
+            [RNNetmeraRCTEventEmitter onDeeplinkTriggered:url];
+        }
+    }];
 }
 
 + (void)setNetmeraHeaders {
     [Netmera setFramework:@"react"];
-    [Netmera setFrameworkVersion:@"1.6.3"];
+    [Netmera setFrameworkVersion:@"1.6.4"];
 }
 
 + (void)setPushDelegate:(NSObject<NetmeraPushDelegate> *)delegate {
@@ -267,7 +274,9 @@ RCT_EXPORT_METHOD(sendEvent:(NSDictionary *)eventDictionary) {
     [Netmera sendEvent:event];
 }
 
-RCT_EXPORT_METHOD(updateUser:(NSDictionary *)userDictionary) {
+RCT_EXPORT_METHOD(updateUser:(NSDictionary *)userDictionary
+                  resolver: (RCTPromiseResolveBlock)resolve
+                  rejecter:(RCTPromiseRejectBlock)reject) {
     NSMutableDictionary *userMutableDictionary = [userDictionary mutableCopy];
     NSArray *keysForNullValues = [userMutableDictionary allKeysForObject:[NSNull null]];
     [userMutableDictionary removeObjectsForKeys:keysForNullValues];
@@ -281,7 +290,20 @@ RCT_EXPORT_METHOD(updateUser:(NSDictionary *)userDictionary) {
     [userMutableDictionary removeObjectForKey:@"msisdn"];
 
     user.userParameters = userMutableDictionary;
-    [Netmera updateUser:user];
+    [Netmera updateUser:user completion:^(BOOL isSuccess, NSError * _Nullable error) {
+         if (error != nil) {
+            NSString* errorMessage;
+            if (error.userInfo[@"com.netmera.response.object"]) {
+              NSDictionary *errorData = error.userInfo[@"com.netmera.response.object"];
+              errorMessage = errorData[@"error"];
+            } else {
+              errorMessage = nil;
+            }
+            reject(ERROR_CODE_UPDATE_USER, [NSString stringWithFormat:@"%@%@", ERROR_MESSAGE_UPDATE_USER, errorMessage], nil);
+        } else {
+            resolve(nil);
+        }
+    }];
 }
 
 RCT_EXPORT_METHOD(setApiKey:(NSString *)apiKey) {
@@ -392,6 +414,11 @@ RCT_EXPORT_METHOD(updateAll:(NSInteger)inboxStatus
     }
 }
 
+RCT_EXPORT_METHOD(getInitialURL:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject) {
+    NSURL *url = [RNNetmeraRCTEventEmitter getInitialUrl];
+    resolve(url.absoluteString);
+}
+
 RCT_EXPORT_METHOD(getInboxCountForStatus:(NSDictionary *) filterDictionary
                   resolver: (RCTPromiseResolveBlock)resolve
                   rejecter: (RCTPromiseRejectBlock)reject) {

package/ios/RNNetmeraRCTEventEmitter.h

@@ -11,11 +11,13 @@
 
 @interface RNNetmeraRCTEventEmitter : RCTEventEmitter <RCTBridgeModule>
 
++(NSURL *) getInitialUrl;
++(void) handleOpenURL:(NSURL *)url forPushObject:(NetmeraPushObject *)object;
++(void) onDeeplinkTriggered:(NSURL *)url;
 +(void) onPushRegister:(NSDictionary*)dict;
 +(void) onPushReceive:(NSDictionary*)dict;
 +(void) onPushDismiss:(NSDictionary*)dict;
 +(void) onPushOpen:(NSDictionary *)dict;
-+(void) handleOpenURL:(NSURL *)url forPushObject:(NetmeraPushObject *)object;
 
 @end
 

package/ios/RNNetmeraRCTEventEmitter.m

@@ -13,6 +13,7 @@ RCT_EXPORT_MODULE();
 
 bool isReactBridgeInitialized;
 
+NSURL* waitingDeeplink = nil;
 NSDictionary* waitingOnPushRegister = nil;
 NSDictionary* waitingOnPushReceive = nil;
 NSDictionary* waitingOnPushOpen = nil;
@@ -68,6 +69,10 @@ NSDictionary* waitingOnPushDismiss = nil;
   }
 }
 
++ (NSURL * _Nullable)getInitialUrl {
+    return waitingDeeplink;
+}
+
 + (void)handleOpenURL:(NSURL *)url forPushObject:(NetmeraPushObject *)object {
     if (object.pushType == NetmeraPushTypeWebWidget) {
         NSDictionary* urlDictionary = @{@"url" : url.absoluteString};
@@ -75,6 +80,12 @@ NSDictionary* waitingOnPushDismiss = nil;
     }
 }
 
++ (void)onDeeplinkTriggered:(NSURL *)url {
+    if (!isReactBridgeInitialized) {
+        waitingDeeplink = url;
+    }
+}
+
 + (void)onPushRegister:(NSDictionary *)body {
     NSData *deviceToken = body[@"pushToken"];
     const unsigned char *bytes = deviceToken.bytes;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-netmera",
-  "version": "1.6.3",
+  "version": "1.6.4",
   "description": "Netmera React Native SDK",
   "main": "index.ts",
   "author": "netmera",

package/src/Netmera.ts

@@ -5,6 +5,7 @@
 import {
   AppRegistry,
   DeviceEventEmitter,
+  Linking,
   NativeEventEmitter,
   NativeModules,
   NativeModulesStatic,
@@ -19,7 +20,7 @@ import NMInboxStatusCountFilter from "./models/NMInboxStatusCountFilter";
 import NMCategoryPreference from "./models/NMCategoryPreference";
 import { NMInboxStatus } from "./models/NMInboxStatus";
 import NetmeraCouponObject from "./models/NetmeraCouponObject";
-import { isAndroid } from "./utils/DeviceUtils";
+import { isAndroid, isIos } from "./utils/DeviceUtils";
 
 const { RNNetmera, RNNetmeraRCTEventEmitter }: NativeModulesStatic =
   NativeModules;
@@ -201,8 +202,8 @@ export default class Netmera {
     RNNetmera.sendEvent(event);
   };
 
-  static updateUser = (user: NetmeraUser) => {
-    RNNetmera.updateUser(user);
+  static updateUser = (user: NetmeraUser): Promise<void> => {
+    return RNNetmera.updateUser(user);
   };
 
   static updateAll = (inboxStatus: number) => {
@@ -282,4 +283,12 @@ export default class Netmera {
   static isNetmeraRemoteMessage(data?: { [key: string]: string }): boolean {
     return isAndroid() && data != undefined && data.hasOwnProperty("_nm");
   }
+
+  static getInitialURL = async () => {
+    if (isIos()) {
+      return RNNetmera.getInitialURL();
+    } else {
+      return Linking.getInitialURL();
+    }
+  };
 }