Merge pull request #1299 from OneSignal/fix/more-detailed-error-logs

Give more detailed iOS error for callback to log

Author: nan-li

ios/RCTOneSignal/RCTOneSignalEventEmitter.m

@@ -77,6 +77,16 @@ -(void)stopObserving {
     return events;
 }
 
+- (NSArray<NSString *> *)processNSError:(NSError *)error {
+    if (error.userInfo[@"error"]) {
+        return @[error.userInfo[@"error"]];
+    } else if (error.userInfo[@"returned"]) {
+        return @[error.userInfo[@"returned"]];
+    } else {
+        return @[error.localizedDescription];
+    }
+}
+
 
 #pragma mark Send Event Methods
 
@@ -275,15 +285,15 @@ + (void)sendEventWithName:(NSString *)name withBody:(NSDictionary *)body {
     [OneSignal setEmail:email withEmailAuthHashToken:authHash withSuccess:^{
         callback(@[]);
     } withFailure:^(NSError *error) {
-        callback(@[error.userInfo[@"error"] ?: error.localizedDescription]);
+        callback([self processNSError:error]);
     }];
 }
 
 RCT_EXPORT_METHOD(logoutEmail:(RCTResponseSenderBlock)callback) {
     [OneSignal logoutEmailWithSuccess:^{
         callback(@[]);
     } withFailure:^(NSError *error) {
-        callback(@[error.userInfo[@"error"] ?: error.localizedDescription]);
+        callback([self processNSError:error]);
     }];
 }
 
@@ -292,15 +302,15 @@ + (void)sendEventWithName:(NSString *)name withBody:(NSDictionary *)body {
     [OneSignal setSMSNumber:smsNumber withSMSAuthHashToken:authHash withSuccess:^(NSDictionary *results) {
         callback(@[results]);
     } withFailure:^(NSError *error) {
-        callback(@[error.userInfo[@"error"] ?: error.localizedDescription]);
+        callback([self processNSError:error]);
     }];
 }
 
 RCT_EXPORT_METHOD(logoutSMSNumber:(RCTResponseSenderBlock)callback) {
     [OneSignal logoutSMSNumberWithSuccess:^(NSDictionary *results) {
         callback(@[results]);
     } withFailure:^(NSError *error) {
-        callback(@[error.userInfo[@"error"] ?: error.localizedDescription]);
+        callback([self processNSError:error]);
     }];
 }
 
@@ -372,7 +382,7 @@ + (void)sendEventWithName:(NSString *)name withBody:(NSDictionary *)body {
         successCallback(@[success]);
     } onFailure:^(NSError *error) {
         [OneSignal onesignalLog:ONE_S_LL_ERROR message:[NSString stringWithFormat:@"Notification Send Failure with Error: %@", error]];
-        failureCallback(@[error.userInfo[@"error"] ?: error.localizedDescription]);
+        failureCallback([self processNSError:error]);
     }];
 }
 
@@ -393,7 +403,7 @@ + (void)sendEventWithName:(NSString *)name withBody:(NSDictionary *)body {
     } withFailure:^(NSError *error) {
         [OneSignal onesignalLog:ONE_S_LL_VERBOSE message:[NSString stringWithFormat:@"OneSignal setExternalUserId error: %@", error]];
         if (callback) {
-            callback(@[error.userInfo[@"error"] ?: error.localizedDescription]);
+            callback([self processNSError:error]);
         }
     }];
 }
@@ -410,7 +420,7 @@ + (void)sendEventWithName:(NSString *)name withBody:(NSDictionary *)body {
         }
     } withFailure:^(NSError *error) {
         [OneSignal onesignalLog:ONE_S_LL_VERBOSE message:[NSString stringWithFormat:@"OneSignal removeExternalUserId error: %@", error]];
-        callback(@[error.userInfo[@"error"] ?: error.localizedDescription]);
+        callback([self processNSError:error]);
     }];
 }