pushwoosh-react-native-plugin 6.1.58 → 6.1.60

package/README.md

@@ -25,7 +25,7 @@
 
 - [Integration Guide](https://docs.pushwoosh.com/platform-docs/pushwoosh-sdk/cross-platform-frameworks/react-native/integrating-react-native-plugin) — step-by-step setup
 - [API Reference](docs/README.md) — full API documentation
-- [Sample Project](https://github.com/Pushwoosh/pushwoosh-react-native-sample) — ready-to-run demo app
+- [Sample Project](https://github.com/Pushwoosh/pushwoosh-react-native-plugin/tree/master/example/demoapp) — ready-to-run demo app
 
 ## Features
 

package/docs/README.md

@@ -46,6 +46,8 @@ DeviceEventEmitter.addListener('pushOpened', (e: Event) => {
 <tr class="even"><td><a href="#getpushtoken">getPushToken(success)</a></td></tr>
 <tr class="even"><td><a href="#gethwid">getHwid(success)</a></td></tr>
 <tr class="even"><td><a href="#setuserid">setUserId(userId, success, fail)</a></td></tr>
+<tr class="even"><td><a href="#setemails">setEmails(emails, success, fail)</a></td></tr>
+<tr class="even"><td><a href="#setuseremails">setUserEmails(userId, emails, success, fail)</a></td></tr>
 <tr class="even"><td><a href="#postevent">postEvent(event, attributes)</a></td></tr>
 <tr class="even"><td><a href="#setapplicationiconbadgenumber">setApplicationIconBadgeNumber(badgeNumber)</a></td></tr>
 <tr class="even"><td><a href="#getapplicationiconbadgenumber">getApplicationIconBadgeNumber(callback)</a></td></tr>
@@ -292,6 +294,75 @@ This allows data and events to be matched across multiple user devices.
 </table>
 
 
+### setEmails
+
+```js
+setEmails(emails, success, fail)
+```
+
+Registers email address(es) for the current user. The addresses are associated with the user identifier currently set on the device; if `setUserId` was never called, the device HWID is used as the identifier. Use `setUserEmails` to set the user identifier and the addresses in a single call.
+
+<table width=100% style='background-color:#0EA7ED;'>
+<colgroup>
+<col width="10%" />
+<col width="20%" />
+<col width="70%" />
+</colgroup>
+<tbody>
+<tr>
+<th align="left" colspan="3"><strong>Parameters</strong></th>
+</tr>
+<tr class="even"><td>array</td><td><b>emails</b></td><td>Array of email addresses associated with the current user.</td></tr>
+<tr class="even"><td>function</td><td><b>success</b></td><td>(optional) method success callback.</td></tr>
+<tr class="even"><td>function</td><td><b>fail</b></td><td>(optional) method failure callback.</td></tr>
+</tbody>
+</table>
+
+Example:
+
+```js
+Pushwoosh.setEmails(["user@example.com"],
+    function() { console.warn("setEmails success"); },
+    function(error) { console.warn("setEmails failed: " + error); }
+);
+```
+
+
+### setUserEmails
+
+```js
+setUserEmails(userId, emails, success, fail)
+```
+
+Registers email address(es) for a specific user identifier. The method sets the user identifier and registers the addresses in a single call, so data and events can be matched across multiple channels (push, email) for the same user. A separate `setUserId` call is not required.
+
+<table width=100% style='background-color:#0EA7ED;'>
+<colgroup>
+<col width="10%" />
+<col width="20%" />
+<col width="70%" />
+</colgroup>
+<tbody>
+<tr>
+<th align="left" colspan="3"><strong>Parameters</strong></th>
+</tr>
+<tr class="even"><td>string</td><td><b>userId</b></td><td>Identifier of currently logged in user</td></tr>
+<tr class="even"><td>array</td><td><b>emails</b></td><td>Array of email addresses associated with the user.</td></tr>
+<tr class="even"><td>function</td><td><b>success</b></td><td>(optional) method success callback.</td></tr>
+<tr class="even"><td>function</td><td><b>fail</b></td><td>(optional) method failure callback.</td></tr>
+</tbody>
+</table>
+
+Example:
+
+```js
+Pushwoosh.setUserEmails("user-123", ["user@example.com"],
+    function() { console.warn("setUserEmails success"); },
+    function(error) { console.warn("setUserEmails failed: " + error); }
+);
+```
+
+
 ### postEvent
 
 ```js

package/index.d.ts

@@ -51,8 +51,8 @@ declare module 'pushwoosh-react-native-plugin' {
     enableHuaweiPushNotifications(): void;
 
     //email methods
-    setUserEmails(userId: string, emails: (string | string[]), success?: () => void, fail?: (error: Error) => void): void;
-    setEmails(emails: (string | string[]), success?: () => void, fail?: (error: Error) => void): void; 
+    setUserEmails(userId: string, emails: (string | string[]), success?: () => void, fail?: (error: string) => void): void;
+    setEmails(emails: (string | string[]), success?: () => void, fail?: (error: string) => void): void; 
     //SMS and WhatsApp methods
     registerSMSNumber(phoneNumber: string): void;
     registerWhatsappNumber(phoneNumber: string): void;

package/index.js

@@ -383,14 +383,26 @@ class PushNotification {
 	//		}
 	//	);
 	//
-	setUserEmails(userId: string, emails: Object, success: ?Function, fail: ?Function) {
+	setUserEmails(userId: string, emails: string | Array<string>, success: ?Function, fail: ?Function) {
 		if (!success) {
 			success = function() {};
 		}
 		if (!fail) {
 			fail = function(error) {};
 		}
-		PushwooshModule.setUserEmails(userId, emails, success, fail);
+		// Both native SDKs return silently on an empty user id without touching the callback.
+		if (typeof userId !== 'string' || userId.length === 0) {
+			fail('userId must not be empty');
+			return;
+		}
+		// The native bridge accepts arrays only, while the public type allows a single address.
+		const emailsList = (Array.isArray(emails) ? emails : [emails])
+			.filter(email => typeof email === 'string' && email.length > 0);
+		if (emailsList.length === 0) {
+			fail('emails must be a non-empty array of strings');
+			return;
+		}
+		PushwooshModule.setUserEmails(userId, emailsList, success, fail);
 	}
 
 
@@ -408,14 +420,21 @@ class PushNotification {
 	//		}
 	//	);
 	//
-	setEmails(emails: Object, success: ?Function, fail: ?Function) {
+	setEmails(emails: string | Array<string>, success: ?Function, fail: ?Function) {
 		if (!success) {
 			success = function() {};
 		}
 		if (!fail) {
 			fail = function(error) {};
 		}
-		PushwooshModule.setEmails(emails, success, fail);
+		// The native bridge accepts arrays only, while the public type allows a single address.
+		const emailsList = (Array.isArray(emails) ? emails : [emails])
+			.filter(email => typeof email === 'string' && email.length > 0);
+		if (emailsList.length === 0) {
+			fail('emails must be a non-empty array of strings');
+			return;
+		}
+		PushwooshModule.setEmails(emailsList, success, fail);
 	}
 
 	//Function: registerSMSNumber

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pushwoosh-react-native-plugin",
-  "version": "6.1.58",
+  "version": "6.1.60",
   "description": "This plugin allows you to send and receive push notifications. Powered by Pushwoosh (www.pushwoosh.com).",
   "main": "index.js",
   "types": "index.d.ts",

package/pushwoosh-react-native-plugin.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = "pushwoosh-react-native-plugin"
-  s.version          = "6.1.58"
+  s.version          = "6.1.60"
   s.summary          = "React Native Pushwoosh Push Notifications module"
   s.requires_arc = true
   s.author       = 'Pushwoosh'
@@ -15,6 +15,6 @@ Pod::Spec.new do |s|
   s.static_framework = true
 
   s.dependency 'React'
-  s.dependency 'PushwooshXCFramework', '7.0.36'
+  s.dependency 'PushwooshXCFramework', '7.2.5'
   s.dependency 'PushwooshInboxUIXCFramework'
 end

package/src/android/build.gradle

@@ -37,7 +37,7 @@ android {
 }
 
 ext {
-    pushwoosh = "6.7.64"
+    pushwoosh = "6.11.1"
 }
 
 dependencies {

package/src/android/proguard-rules.pro

@@ -1,6 +1,6 @@
 # Add project specific ProGuard rules here.
 # By default, the flags in this file are appended to flags specified
-# in /Users/arellomobile/Library/Android/sdk/tools/proguard/proguard-android.txt
+# in $HOME/Library/Android/sdk/tools/proguard/proguard-android.txt
 # You can edit the include path and order by changing the proguardFiles
 # directive in build.gradle.
 #

package/src/ios/PushwooshPlugin/Pushwoosh.m

@@ -34,6 +34,40 @@ static id objectOrNull(id object) {
     }
 }
 
+typedef void (^PWEmailsCompletion)(NSError *error);
+
+// The SDK invokes the completion once per address, an RCTResponseSenderBlock only once:
+// the first error wins, success is reported after the last address.
+static PWEmailsCompletion emailsCompletionHandler(NSUInteger addressCount, RCTResponseSenderBlock successCallback, RCTResponseSenderBlock errorCallback) {
+    NSObject *lock = [NSObject new];
+    __block NSUInteger completedCount = 0;
+    __block BOOL responded = NO;
+
+    return ^(NSError *error) {
+        @synchronized (lock) {
+            if (responded) {
+                return;
+            }
+
+            if (error) {
+                responded = YES;
+                if (errorCallback) {
+                    errorCallback(@[ objectOrNull([error localizedDescription]) ]);
+                }
+                return;
+            }
+
+            completedCount++;
+            if (completedCount >= addressCount) {
+                responded = YES;
+                if (successCallback) {
+                    successCallback(@[]);
+                }
+            }
+        }
+    };
+}
+
 static NSDictionary * gStartPushData = nil;
 static NSURL * gPushDeepLinkURL = nil;  // Deep link URL for New Architecture support
 static NSString * const kRegistrationSuccesEvent = @"PWRegistrationSuccess";
@@ -44,6 +78,27 @@ static NSString * const kPushOpenEvent = @"PWPushOpen";
 static NSString * const kPushOpenJSEvent = @"pushOpened";
 static NSString * const kPushReceivedJSEvent = @"pushReceived";
 
+/// Returns the push link only when it is a deep link this app can route itself, otherwise nil.
+///
+/// http/https links are left to the native SDK: it checks the host's apple-app-site-association
+/// and either hands the link to the app's Universal Links handler (own domain) or opens the
+/// browser (anyone else's). Handing those to RCTLinking too made every external link land in JS
+/// as if it were an in-app destination.
+static NSURL * pwplugin_deepLinkURLFromPushLink(id link) {
+    if (![link isKindOfClass:[NSString class]] || [link length] == 0) {
+        return nil;
+    }
+
+    NSURL *url = [NSURL URLWithString:link];
+    NSString *scheme = url.scheme.lowercaseString;
+
+    if (scheme.length == 0 || [scheme isEqualToString:@"http"] || [scheme isEqualToString:@"https"]) {
+        return nil;
+    }
+
+    return url;
+}
+
 @interface PushwooshPlugin (InnerPushwooshPlugin)
 
 - (void) application:(UIApplication *)application pwplugin_didRegisterWithDeviceToken:(NSData *)deviceToken;
@@ -178,12 +233,12 @@ RCT_EXPORT_METHOD(init:(NSDictionary*)config success:(RCTResponseSenderBlock)suc
     }
     
     if (gStartPushData) {
-        NSString *link = gStartPushData[@"l"];
-        
+        NSURL *deepLink = pwplugin_deepLinkURLFromPushLink(gStartPushData[@"l"]);
+
         //get deeplink from the payload and write it to the launchOptions for proper RCTLinking behavior
-        if (link) {
+        if (deepLink) {
             NSMutableDictionary *launchOptions = self.bridge.launchOptions.mutableCopy;
-            launchOptions[UIApplicationLaunchOptionsURLKey] = [NSURL URLWithString:link];
+            launchOptions[UIApplicationLaunchOptionsURLKey] = deepLink;
             [self.bridge setValue:launchOptions forKey:@"launchOptions"];
         }
         
@@ -253,35 +308,34 @@ RCT_EXPORT_METHOD(getPushToken:(RCTResponseSenderBlock)callback) {
 }
 
 RCT_EXPORT_METHOD(setEmails:(NSArray *)emails success:(RCTResponseSenderBlock)successCallback error:(RCTResponseSenderBlock)errorCallback) {
-    __block NSError* gError = nil;
-    [[Pushwoosh sharedInstance] setEmails:emails completion:^(NSError * _Nullable error) {
-        if (error) {
-            gError = error;
+    if (emails.count == 0) {
+        // The SDK ignores an empty list without invoking the completion block.
+        if (errorCallback) {
+            errorCallback(@[ @"emails must be a non-empty array" ]);
         }
-    }];
-    if (!gError && successCallback) {
-        successCallback(@[]);
-    }
-    
-    if (gError && errorCallback) {
-        errorCallback(@[ objectOrNull([gError localizedDescription]) ]);
+        return;
     }
+
+    [[Pushwoosh sharedInstance] setEmails:emails completion:emailsCompletionHandler(emails.count, successCallback, errorCallback)];
 }
 
 RCT_EXPORT_METHOD(setUserEmails:(NSString*)userId emails:(NSArray *)emails success:(RCTResponseSenderBlock)successCallback error:(RCTResponseSenderBlock)errorCallback) {
-    __block NSError* gError = nil;
-    [[Pushwoosh sharedInstance] setUser:userId emails:emails completion:^(NSError * _Nullable error) {
-        if (error) {
-            gError = error;
+    if (userId.length == 0) {
+        // The SDK ignores an empty user id without invoking the completion block.
+        if (errorCallback) {
+            errorCallback(@[ @"userId must not be empty" ]);
         }
-    }];
-    if (!gError && successCallback) {
-        successCallback(@[]);
+        return;
     }
-    
-    if (gError && errorCallback) {
-        errorCallback(@[ objectOrNull([gError localizedDescription]) ]);
+
+    if (emails.count == 0) {
+        if (errorCallback) {
+            errorCallback(@[ @"emails must be a non-empty array" ]);
+        }
+        return;
     }
+
+    [[Pushwoosh sharedInstance] setUser:userId emails:emails completion:emailsCompletionHandler(emails.count, successCallback, errorCallback)];
 }
 
 RCT_EXPORT_METHOD(setTags:(NSDictionary*)tags success:(RCTResponseSenderBlock)successCallback error:(RCTResponseSenderBlock)errorCallback) {
@@ -968,9 +1022,9 @@ RCT_EXPORT_METHOD(getRichMediaType:(RCTResponseSenderBlock)callback) {
     if (onStart) {
         gStartPushData = pushNotification;
         // Save deep link URL for New Architecture (Linking.getInitialURL support)
-        NSString *link = pushNotification[@"l"];
-        if (link) {
-            gPushDeepLinkURL = [NSURL URLWithString:link];
+        NSURL *deepLink = pwplugin_deepLinkURLFromPushLink(pushNotification[@"l"]);
+        if (deepLink) {
+            gPushDeepLinkURL = deepLink;
         }
     }
 }
@@ -978,9 +1032,9 @@ RCT_EXPORT_METHOD(getRichMediaType:(RCTResponseSenderBlock)callback) {
     if (onStart) {
         gStartPushData = pushNotification;
         // Save deep link URL for New Architecture (Linking.getInitialURL support)
-        NSString *link = pushNotification[@"l"];
-        if (link) {
-            gPushDeepLinkURL = [NSURL URLWithString:link];
+        NSURL *deepLink = pwplugin_deepLinkURLFromPushLink(pushNotification[@"l"]);
+        if (deepLink) {
+            gPushDeepLinkURL = deepLink;
         }
     }
 }
@@ -1007,9 +1061,9 @@ didReceiveNotificationResponse:(UNNotificationResponse *)response
     // Capture deep link from push notification on cold start
     if ([response.notification.request.trigger isKindOfClass:[UNPushNotificationTrigger class]]) {
         NSDictionary *userInfo = response.notification.request.content.userInfo;
-        NSString *link = userInfo[@"l"];
-        if (link) {
-            gPushDeepLinkURL = [NSURL URLWithString:link];
+        NSURL *deepLink = pwplugin_deepLinkURLFromPushLink(userInfo[@"l"]);
+        if (deepLink) {
+            gPushDeepLinkURL = deepLink;
         }
     }
 
@@ -1068,9 +1122,9 @@ static PWEarlyNotificationDelegate *gEarlyDelegate = nil;
             NSDictionary *launchOptions = notification.userInfo;
             NSDictionary *remoteNotification = launchOptions[UIApplicationLaunchOptionsRemoteNotificationKey];
             if (remoteNotification) {
-                NSString *link = remoteNotification[@"l"];
-                if (link && !gPushDeepLinkURL) {
-                    gPushDeepLinkURL = [NSURL URLWithString:link];
+                NSURL *deepLink = pwplugin_deepLinkURLFromPushLink(remoteNotification[@"l"]);
+                if (deepLink && !gPushDeepLinkURL) {
+                    gPushDeepLinkURL = deepLink;
                 }
             }
         }];