Fix setEmail Callback Issue

• setEmail() was meant to accept callback and emailAuthToken as optional parameters
• However it was crashing if no callback was passed in because React-Native requires it to be non-nil
• Fixed the function to create a default callback if none is passed in
• Also resolved errors not being correctly serialized for RN to use.

Author: Nightsd01

index.js

@@ -200,17 +200,17 @@ export default class OneSignal {
     }
 
     static setEmail(email, emailAuthCode, callback) {
-
-        if (callback == undefined && typeof emailAuthCode == 'function') {
+        if (emailAuthCode == undefined) {
             //emailAuthCode is an optional parameter
             //since JS does not support function overloading,
             //unauthenticated setEmail calls will have emailAuthCode as the callback
 
-            var callback = emailAuthCode;
-
-            RNOneSignal.setUnauthenticatedEmail(email, callback);
+            RNOneSignal.setUnauthenticatedEmail(email, function(){});
+        } else if (callback == undefined && typeof emailAuthCode == 'function') {
+            RNOneSignal.setUnauthenticatedEmail(email, emailAuthCode);
+        } else if (callback == undefined) {
+            RNOneSignal.setEmail(email, emailAuthCode, function(){});
         } else {
-
             RNOneSignal.setEmail(email, emailAuthCode, callback);
         }
     }

ios/RCTOneSignal/RCTOneSignalEventEmitter.m

@@ -149,11 +149,10 @@ + (void)sendEventWithName:(NSString *)name withBody:(NSDictionary *)body {
 
 RCT_EXPORT_METHOD(setEmail :(NSString *)email withAuthHash:(NSString *)authHash withResponse:(RCTResponseSenderBlock)callback) {
     // Auth hash token created on server and sent to client.
-    
     [OneSignal setEmail:email withEmailAuthHashToken:authHash withSuccess:^{
         callback(@[]);
     } withFailure:^(NSError *error) {
-        callback(@[error]);
+        callback(@[error.userInfo[@"error"] ?: error.localizedDescription]);
     }];
 }
 
@@ -162,15 +161,15 @@ + (void)sendEventWithName:(NSString *)name withBody:(NSDictionary *)body {
     [OneSignal setEmail:email withSuccess:^{
         callback(@[]);
     } withFailure:^(NSError *error) {
-        callback(@[error]);
+        callback(@[error.userInfo[@"error"] ?: error.localizedDescription]);
     }];
 }
 
 RCT_EXPORT_METHOD(logoutEmail:(RCTResponseSenderBlock)callback) {
     [OneSignal logoutEmailWithSuccess:^{
         callback(@[]);
     } withFailure:^(NSError *error) {
-        callback(@[error]);
+        callback(@[error.userInfo[@"error"] ?: error.localizedDescription]);
     }];
 }
 
@@ -284,24 +283,33 @@ + (void)sendEventWithName:(NSString *)name withBody:(NSDictionary *)body {
     [OneSignal promptLocation];
 }
 
-RCT_EXPORT_METHOD(postNotification:(NSDictionary *)contents data:(NSDictionary *)data player_id:(NSString*)player_id other_parameters:(NSDictionary *)other_parameters) {
-    NSDictionary * additionalData = @{@"p2p_notification": data};
+// The post notification endpoint accepts four parameters.
+RCT_EXPORT_METHOD(postNotification:(NSDictionary *)contents data:(NSDictionary *)data player_id:(id)player_ids other_parameters:(NSDictionary *)other_parameters) {
+    NSDictionary * additionalData = data ? @{@"p2p_notification": data} : @{};
 
     NSMutableDictionary * extendedData = [additionalData mutableCopy];
-    BOOL isHidden = [[other_parameters objectForKey:@"hidden"] boolValue];
+    BOOL isHidden = [[other_parameters ?: @{} objectForKey:@"hidden"] boolValue];
     if (isHidden) {
         [extendedData setObject:[NSNumber numberWithBool:YES] forKey:@"hidden"];
     }
 
-    NSDictionary *notification = @{
-                                   @"contents" : contents,
-                                   @"data" : extendedData,
-                                   @"include_player_ids": @[player_id]
-                                   };
-    NSMutableDictionary * extendedNotification = [notification mutableCopy];
-    [extendedNotification addEntriesFromDictionary: other_parameters];
+    NSMutableDictionary *notification = [NSMutableDictionary new];
+    notification[@"contents"] = contents;
+    notification[@"data"] = extendedData;
+    
+    if (player_ids && [player_ids isKindOfClass:[NSArray class]]) {
+        //array of player ids
+        notification[@"include_player_ids"] = (NSArray<NSString *> *)player_ids;
+    } else if (player_ids && [player_ids isKindOfClass:[NSString class]]) {
+        //individual player id
+        notification[@"include_player_ids"] = @[(NSString *)player_ids];
+    }
+    
+    if (other_parameters) {
+        [notification addEntriesFromDictionary:other_parameters];
+    }
 
-    [OneSignal postNotification:extendedNotification];
+    [OneSignal postNotification:notification];
 }
 
 RCT_EXPORT_METHOD(syncHashedEmail:(NSString*)email) {