getTags now works when called before device registers

Author: jkasten2

iOS_SDK/OneSignalSDK/Source/OneSignal.m

@@ -118,6 +118,8 @@ @implementation OneSignal
 static BOOL coldStartFromTapOnNotification = NO;
 
 static NSMutableArray* pendingSendTagCallbacks;
+static OSResultSuccessBlock pendingGetTagsSuccessBlock;
+static OSFailureBlock pendingGetTagsFailureBlock;
 
 // Has attempted to register for push notifications with Apple since app was installed.
 static BOOL registeredWithApple = NO;
@@ -682,8 +684,11 @@ + (void)sendTag:(NSString*)key value:(NSString*)value onSuccess:(OSResultSuccess
 }
 
 + (void)getTags:(OSResultSuccessBlock)successBlock onFailure:(OSFailureBlock)failureBlock {
-    if (!self.currentSubscriptionState.userId)
+    if (!self.currentSubscriptionState.userId) {
+        pendingGetTagsSuccessBlock = successBlock;
+        pendingGetTagsFailureBlock = failureBlock;
         return;
+    }
 
     NSMutableURLRequest* request;
     NSString* path = [NSString stringWithFormat:@"players/%@?app_id=%@", self.currentSubscriptionState.userId, self.app_id];
@@ -1094,6 +1099,13 @@ + (void)registerUserInternal {
             [self fireIdsAvailableCallback];
 
             [self sendNotificationTypesUpdate];
+            
+            if (pendingGetTagsSuccessBlock) {
+                [OneSignal getTags:pendingGetTagsSuccessBlock onFailure:pendingGetTagsFailureBlock];
+                pendingGetTagsSuccessBlock = nil;
+                pendingGetTagsFailureBlock = nil;
+            }
+            
         }
     } onFailure:^(NSError* error) {
         waitingForOneSReg = false;

iOS_SDK/OneSignalSDK/UnitTests/UnitTests.m

@@ -1958,6 +1958,7 @@ - (void)testSendTags {
         didRunSuccess3 = true;
     } onFailure:^(NSError *error) {}];
 
+    [self runBackgroundThreads];
     [NSObjectOverrider runPendingSelectors];
     [self runBackgroundThreads];
 
@@ -1977,13 +1978,17 @@ - (void)testDeleteTags {
     [self runBackgroundThreads];
     XCTAssertEqual(networkRequestCount, 1);
 
+    NSLog(@"Calling sendTag and deleteTag");
     // send 2 tags and delete 1 before they get sent off.
     [OneSignal sendTag:@"key" value:@"value"];
     [OneSignal sendTag:@"key2" value:@"value2"];
     [OneSignal deleteTag:@"key"];
+    NSLog(@"Finished calling sendTag and deleteTag");
 
     // Make sure only 1 network call is made and only key2 gets sent.
     [NSObjectOverrider runPendingSelectors];
+    [self runBackgroundThreads];
+    
     XCTAssertNil(lastHTTPRequset[@"tags"][@"key"]);
     XCTAssertEqualObjects(lastHTTPRequset[@"tags"][@"key2"], @"value2");
     XCTAssertEqual(networkRequestCount, 2);
@@ -2012,11 +2017,29 @@ - (void)testGetTags {
     XCTAssertTrue(fireGetTags);
 }
 
-- (void)testGetTagsWithNestedDelete {
+- (void)testGetTagsBeforePlayerId {
     [self initOneSignal];
     [self runBackgroundThreads];
     XCTAssertEqual(networkRequestCount, 1);
 
+    __block BOOL fireGetTags = false;
+    
+    [OneSignal getTags:^(NSDictionary *result) {
+        NSLog(@"getTags success HERE");
+        fireGetTags = true;
+    } onFailure:^(NSError *error) {
+        NSLog(@"getTags onFailure HERE");
+    }];
+    
+    [self runBackgroundThreads];
+    
+    XCTAssertTrue(fireGetTags);
+
+}
+
+- (void)testGetTagsWithNestedDelete {
+    [self initOneSignal];
+    
     __block BOOL fireDeleteTags = false;
 
     [OneSignal getTags:^(NSDictionary *result) {
@@ -2031,9 +2054,14 @@ - (void)testGetTagsWithNestedDelete {
         NSLog(@"getTags onFailure HERE");
     }];
 
+    
+    [self runBackgroundThreads];
+    
     [self runBackgroundThreads];
     [NSObjectOverrider runPendingSelectors];
 
+    // create, ge tags, then sendTags call.
+    XCTAssertEqual(networkRequestCount, 3);
     XCTAssertTrue(fireDeleteTags);
 }