Added callback to set external user id (#633)

* Added callback to set external user id
* WIP - Working on unit testing now
* New public method exists now into OneSignal.h, so updates to the wrappers that require a header file will need to be made
* Fixed caching of the external user id to now use OneSignalUserDefaults instead of NSUSerDefaults

* WIP - Working on unit tests for set external id with callback

* Added a completion block for the external user id update
* Instead of success and failure, now it is simply overall completion because we have a push and email channel that needs to be updated
* The param sent back is a NSDictionary with a channel @"push" or @"email" with a @"success" of 1 or 0
* Built a new OneSignalClient method for using the OSMultipleCompletionHandler now

Updated demo app UI a bit for setting email, removing email, setting external user id, removing external user id

* Change to response of external user id completion handler
* true and false instead of 0 and 1 for the success key :value

* Fixed and added unit tests for external id and email
* Removed a not (!) check on accident for pending registering user with external id and is not already set to the same thing it is trying to update to

* Placed the duplicate results generation into a sep method
* Now when dup ext user id is being set we have a method for creating the response and including email or push when necessary

* Addressing comment son previous commits
* OSMultipleCompletionBlock to now return a NSDictionary
* Added a TODO addressing the new executeSimultaneousRequests method and how we should use this in the future

Author: mikechoch

iOS_SDK/OneSignalDevApp/OneSignalDevApp/Base.lproj/Main.storyboard

@@ -33,21 +33,29 @@
 
 @interface ViewController : UIViewController <OSInAppMessageDelegate>
 
-@property (weak, nonatomic) IBOutlet UITextField *appIdTextField;
 @property (weak, nonatomic) IBOutlet UIActivityIndicatorView *activityIndicatorView;
 @property (weak, nonatomic) IBOutlet UISegmentedControl *consentSegmentedControl;
+@property (weak, nonatomic) IBOutlet UITextField *appIdTextField;
+@property (weak, nonatomic) IBOutlet UIButton *updateAppIdButton;
+@property (weak, nonatomic) IBOutlet UIButton *getTagsButton;
+@property (weak, nonatomic) IBOutlet UIButton *sendTagsButton;
+@property (weak, nonatomic) IBOutlet UIButton *promptPushButton;
+@property (weak, nonatomic) IBOutlet UIButton *promptLocationButton;
 @property (weak, nonatomic) IBOutlet UISegmentedControl *subscriptionSegmentedControl;
+@property (weak, nonatomic) IBOutlet UITextField *emailTextField;
+@property (weak, nonatomic) IBOutlet UIButton *setEmailButton;
+@property (weak, nonatomic) IBOutlet UIButton *logoutEmailButton;
+@property (weak, nonatomic) IBOutlet UITextField *externalUserIdTextField;
+@property (weak, nonatomic) IBOutlet UIButton *setExternalUserIdButton;
+@property (weak, nonatomic) IBOutlet UIButton *removeExternalUserIdButton;
 @property (weak, nonatomic) IBOutlet UISegmentedControl *locationSharedSegementedControl;
 @property (weak, nonatomic) IBOutlet UISegmentedControl *inAppMessagingSegmentedControl;
-@property (weak, nonatomic) IBOutlet UIButton *promptPushButton;
-@property (weak, nonatomic) IBOutlet UIButton *promptLocationButton;
 @property (weak, nonatomic) IBOutlet UITextField *addTriggerKey;
 @property (weak, nonatomic) IBOutlet UITextField *addTriggerValue;
 @property (weak, nonatomic) IBOutlet UIButton *addTriggerButton;
 @property (weak, nonatomic) IBOutlet UITextField *removeTriggerKey;
 @property (weak, nonatomic) IBOutlet UITextField *getTriggerKey;
 @property (weak, nonatomic) IBOutlet UILabel *infoLabel;
-@property (weak, nonatomic) IBOutlet UITextField *externalIdTextField;
 @property (weak, nonatomic) IBOutlet UITextField *outcomeName;
 @property (weak, nonatomic) IBOutlet UITextField *outcomeValueName;
 @property (weak, nonatomic) IBOutlet UITextField *outcomeValue;

iOS_SDK/OneSignalDevApp/OneSignalDevApp/ViewController.h

@@ -84,6 +84,33 @@ - (IBAction)getTriggersAction:(id)sender {
     }
 }
 
+- (IBAction)setEmailButton:(id)sender {
+    NSString *email = self.emailTextField.text;
+    [OneSignal setEmail:email withSuccess:^{
+        NSLog(@"Set email successful with email: %@", email);
+    } withFailure:^(NSError *error) {
+        NSLog(@"Set email failed with code: %@ and message: %@", @(error.code), error.description);
+    }];
+}
+
+- (IBAction)logoutEmailButton:(id)sender {
+    [OneSignal logoutEmailWithSuccess:^{
+        NSLog(@"Email logout successful");
+    } withFailure:^(NSError *error) {
+        NSLog(@"Error logging out email with code: %@ and message: %@", @(error.code), error.description);
+    }];
+}
+
+- (IBAction)getTagsButton:(id)sender {
+    [OneSignal IdsAvailable:^(NSString *userId, NSString *pushToken) {
+        NSLog(@"IdsAvailable userId: %@, and pushToken: %@", userId, pushToken);
+    }];
+    
+    [OneSignal getTags:^(NSDictionary *result) {
+        NSLog(@"Tags: %@", result.description);
+    }];
+}
+
 - (IBAction)sendTagButton:(id)sender {
     [OneSignal sendTag:@"key1"
                  value:@"value1"
@@ -95,10 +122,6 @@ - (IBAction)sendTagButton:(id)sender {
                  static int failures = 0;
                  NSLog(@"failures: %d", ++failures);
     }];
-    
-    [OneSignal IdsAvailable:^(NSString *userId, NSString *pushToken) {
-        NSLog(@"IdsAvailable Fired");
-    }];
 }
 
 - (IBAction)promptPushAction:(UIButton *)sender {
@@ -113,10 +136,6 @@ - (IBAction)promptLocationAction:(UIButton *)sender {
     [OneSignal promptLocation];
 }
 
-- (IBAction)setEmailButtonPressed:(UIButton *)sender {
-    [AppDelegate setOneSignalAppId:self.appIdTextField.text];
-}
-
 - (void)promptForNotificationsWithNativeiOS10Code {
     id responseBlock = ^(BOOL granted, NSError* error) {
         NSLog(@"promptForNotificationsWithNativeiOS10Code: %d", granted);
@@ -152,12 +171,21 @@ - (IBAction)inAppMessagingSegmentedControlValueChanged:(UISegmentedControl *)sen
     [OneSignal pauseInAppMessages:(bool) !sender.selectedSegmentIndex];
 }
 
--(void)handleMessageAction:(NSString *)actionId {
+- (void)handleMessageAction:(NSString *)actionId {
     NSLog(@"View controller did get action: %@", actionId);
 }
 
-- (IBAction)removeExternalIdButtonPressed:(UIButton *)sender {
-    [OneSignal removeExternalUserId];
+- (IBAction)setExternalUserId:(UIButton *)sender {
+    NSString* externalUserId = self.externalUserIdTextField.text;
+    [OneSignal setExternalUserId:externalUserId withCompletion:^(NSDictionary *results) {
+        NSLog(@"External user id update complete with results: %@", results.description);
+    }];
+}
+
+- (IBAction)removeExternalUserId:(UIButton *)sender {
+    [OneSignal removeExternalUserId:^(NSDictionary *results) {
+        NSLog(@"External user id update complete with results: %@", results.description);
+    }];
 }
 
 #pragma mark UITextFieldDelegate Methods

iOS_SDK/OneSignalDevApp/OneSignalDevApp/ViewController.m

@@ -507,8 +507,13 @@ typedef void (^OSEmailSuccessBlock)();
 
 
 // External user id
+// Typedefs defining completion blocks for updating the external user id
+typedef void (^OSUpdateExternalUserIdBlock)(NSDictionary* results);
+
 + (void)setExternalUserId:(NSString * _Nonnull)externalId;
++ (void)setExternalUserId:(NSString * _Nonnull)externalId withCompletion:(OSUpdateExternalUserIdBlock _Nullable)completionBlock;
 + (void)removeExternalUserId;
++ (void)removeExternalUserId:(OSUpdateExternalUserIdBlock _Nullable)completionBlock;
 
 // In-App Messaging triggers
 + (void)addTrigger:(NSString * _Nonnull)key withValue:(id _Nonnull)value;