pushwoosh-react-native-plugin 6.1.26 → 6.1.28

package/.github/ISSUE_TEMPLATE/bug_report.yml

@@ -58,6 +58,7 @@ body:
       label: Your Pushwoosh React Native Plugin version
       description: Your React Native Plugin version which was integrated to the app. You may find it on the [releases page](https://github.com/Pushwoosh/pushwoosh-react-native-plugin/releases)
       options:
+        - 6.1.28
         - 6.1.26
         - 6.1.25
         - 6.1.23

package/index.js

@@ -127,6 +127,55 @@ class PushNotification {
 		PushwooshModule.onPushOpen(callback);
 	}
 
+	//Function: setUserEmails
+	//Register emails list associated to the current user.
+	//
+	//Example:
+	//(start code)
+	//	Pushwoosh.setUserEmails("someUser", ["example@mail.some"],
+	//		function(status) {
+	//			console.warn('setUserEmails success');
+	//		},
+	//		function(status) {
+	//			console.warn('setUserEmails failed');
+	//		}
+	//	);
+	//
+	setUserEmails(userId: string, emails: Object, success: ?Function, fail: ?Function) {
+		if (!success) {
+			success = function() {};
+		}
+		if (!fail) {
+			fail = function(error) {};
+		}
+		PushwooshModule.setUserEmails(userId, emails, success, fail);
+	}
+
+
+	//Function: setEmails
+	//Register emails list associated to the current user.
+	//
+	//Example:
+	//(start code)
+	//	Pushwoosh.setEmails(["example@mail.some"],
+	//		function(status) {
+	//			console.warn('setEmails success');
+	//		},
+	//		function(status) {
+	//			console.warn('setEmails failed');
+	//		}
+	//	);
+	//
+	setEmails(emails: Object, success: ?Function, fail: ?Function) {
+		if (!success) {
+			success = function() {};
+		}
+		if (!fail) {
+			fail = function(error) {};
+		}
+		PushwooshModule.setEmails(emails, success, fail);
+	}
+
 	//Function: setTags
 	//Call this to set tags for the device
 	//
@@ -233,6 +282,17 @@ class PushNotification {
 		PushwooshModule.getHwid(success);
 	}
 
+	//Function: getUserId
+	//Call this to get Pushwoosh User ID used for communications with Pushwoosh API
+	//
+	//Example:
+	//(start code)
+	//	Pushwoosh.getUserId();
+	//(end)
+	getUserId(success: Function) {
+		PushwooshModule.getUserId(success);
+	}
+
 	//Function: setUserId
 	//[android, ios] Set User indentifier. This could be Facebook ID, username or email, or any other user ID.
 	//This allows data and events to be matched across multiple user devices.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pushwoosh-react-native-plugin",
-  "version": "6.1.26",
+  "version": "6.1.28",
   "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.26"
+  s.version          = "6.1.28"
   s.summary          = "React Native Pushwoosh Push Notifications module"
   s.requires_arc = true
   s.author       = 'Pushwoosh'

package/src/android/build.gradle

@@ -37,7 +37,7 @@ android {
 }
 
 ext {
-    pushwoosh = "6.7.1"
+    pushwoosh = "6.7.3"
 }
 
 dependencies {

package/src/android/src/main/java/com/pushwoosh/reactnativeplugin/PushwooshPlugin.java

@@ -186,6 +186,42 @@ public class PushwooshPlugin extends ReactContextBaseJavaModule implements Lifec
 		}
 	}
 
+	@ReactMethod
+	public void setEmails(@NonNull ReadableArray emails, final Callback success, final Callback error) {
+		Pushwoosh.getInstance().setEmail(ConversionUtil.messageCodesArrayToArrayList(emails), new com.pushwoosh.function.Callback<Boolean, SetEmailException>() {
+			@Override
+			public void process(@NonNull Result<Boolean, SetEmailException> result) {
+				if (result.isSuccess()) {
+					if (success != null) {
+						success.invoke();
+					}
+				} else {
+					if (error != null) {
+						error.invoke(result.getException().getMessage());
+					}
+				}
+			}
+		});
+	}
+
+	@ReactMethod
+	public void setUserEmails(@NonNull String userId, @NonNull ReadableArray emails, final Callback success, final Callback error) {
+		Pushwoosh.getInstance().setUser(userId, ConversionUtil.messageCodesArrayToArrayList(emails), new com.pushwoosh.function.Callback<Boolean, SetUserException>() {
+			@Override
+			public void process(@NonNull Result<Boolean, SetUserException> result) {
+				if (result.isSuccess()) {
+					if (success != null) {
+						success.invoke();
+					}
+				} else {
+					if (error != null) {
+						error.invoke(result.getException().getMessage());
+					}
+				}
+			}
+		});
+	}
+
 	@ReactMethod
 	public void setTags(ReadableMap tags, final Callback success, final Callback error) {
 		Pushwoosh.getInstance().sendTags(ConversionUtil.convertToTagsBundle(tags), new com.pushwoosh.function.Callback<Void, PushwooshException>() {
@@ -232,6 +268,11 @@ public class PushwooshPlugin extends ReactContextBaseJavaModule implements Lifec
 		callback.invoke(Pushwoosh.getInstance().getHwid());
 	}
 
+	@ReactMethod
+	public void getUserId(Callback callback) {
+		callback.invoke(Pushwoosh.getInstance().getUserId());
+	}
+
 	@ReactMethod
 	public void setUserId(String userId) {
 		PushwooshInApp.getInstance().setUserId(userId);

package/src/ios/Pushwoosh.h

@@ -18,7 +18,7 @@
 
 #endif
 
-#define PUSHWOOSH_VERSION @"6.5.5"
+#define PUSHWOOSH_VERSION @"6.5.7"
 
 
 @class Pushwoosh, PWMessage, PWNotificationCenterDelegateProxy;
@@ -365,6 +365,13 @@ Unregisters from push notifications.
  */
 - (NSString * _Nonnull)getHWID;
 
+/**
+ Gets UserId.
+ 
+ @return userId. If the userId hasn't been set previously, then the userId is assigned the HWID.
+ */
+- (NSString * _Nonnull)getUserId;
+
 /**
  Returns dictionary with enabled remove notificaton types.
  

package/src/ios/PushwooshPlugin/Pushwoosh.h

@@ -26,6 +26,6 @@
 #import "PWInbox.h"
 #endif
 
-@interface PushwooshPlugin: RCTEventEmitter<RCTBridgeModule,PushNotificationDelegate>
+@interface PushwooshPlugin: RCTEventEmitter<RCTBridgeModule, PushNotificationDelegate, UIApplicationDelegate>
 
 @end

package/src/ios/PushwooshPlugin/Pushwoosh.m

@@ -71,6 +71,7 @@ RCT_EXPORT_METHOD(init:(NSDictionary*)config success:(RCTResponseSenderBlock)suc
     [PushNotificationManager initializeWithAppCode:appCode appName:nil];
     [[PushNotificationManager pushManager] sendAppOpen];
     [PushNotificationManager pushManager].delegate = self;
+    [[UIApplication sharedApplication] setDelegate:self];
 
     // We set Pushwoosh UNUserNotificationCenter delegate unless CUSTOM is specified in the config
     if(![notificationHandling isEqualToString:@"CUSTOM"]) {
@@ -165,12 +166,42 @@ RCT_EXPORT_METHOD(getHwid:(RCTResponseSenderBlock)callback) {
     }
 }
 
+RCT_EXPORT_METHOD(getUserId:(RCTResponseSenderBlock)callback) {
+    if (callback) {
+        callback(@[ [[Pushwoosh sharedInstance] getUserId] ]);
+    }
+}
+
 RCT_EXPORT_METHOD(getPushToken:(RCTResponseSenderBlock)callback) {
     if (callback) {
         callback(@[ objectOrNull([[PushNotificationManager pushManager] getPushToken]) ]);
     }
 }
 
+RCT_EXPORT_METHOD(setEmails:(NSArray *)emails success:(RCTResponseSenderBlock)successCallback error:(RCTResponseSenderBlock)errorCallback) {
+    [[Pushwoosh sharedInstance] setEmails:emails completion:^(NSError * _Nullable error) {
+        if (!error && successCallback) {
+            successCallback(@[]);
+        }
+        
+        if (error && errorCallback) {
+            errorCallback(@[ objectOrNull([error localizedDescription]) ]);
+        }
+    }];
+}
+
+RCT_EXPORT_METHOD(setUserEmails:(NSString*)userId emails:(NSArray *)emails success:(RCTResponseSenderBlock)successCallback error:(RCTResponseSenderBlock)errorCallback) {
+    [[Pushwoosh sharedInstance] setUser:userId emails:emails completion:^(NSError * _Nullable error) {
+        if (!error && successCallback) {
+            successCallback(@[]);
+        }
+        
+        if (error && errorCallback) {
+            errorCallback(@[ objectOrNull([error localizedDescription]) ]);
+        }
+    }];
+}
+
 RCT_EXPORT_METHOD(setTags:(NSDictionary*)tags success:(RCTResponseSenderBlock)successCallback error:(RCTResponseSenderBlock)errorCallback) {
     [[PushNotificationManager pushManager] setTags:tags withCompletion:^(NSError* error) {
         if (!error && successCallback) {
@@ -331,9 +362,17 @@ RCT_EXPORT_METHOD(performAction:(NSString*)code) {
     [PWInbox performActionForMessageWithCode:code];
 }
 
-#pragma mark - UNUserNotificationCenter Delegate Methods
+#pragma mark - UIApplicationDelegate Methods
 #pragma mark -
 
+- (void)application:(UIApplication *)application didRegisterForRemoteNotificationsWithDeviceToken:(NSData *)deviceToken {
+    [[Pushwoosh sharedInstance] handlePushRegistration:deviceToken];
+}
+
+- (void)application:(UIApplication *)application didFailToRegisterForRemoteNotificationsWithError:(NSError *)error {
+    [[Pushwoosh sharedInstance] handlePushRegistrationFailure:error];
+}
+
 #pragma mark - UNUserNotificationCenter Delegate Methods
 #pragma mark -