Pushed save of anonId higher up into the flow. (#977)

* Pushed save of anonId higher up into the flow. * Removed api endpoint test. Co-authored-by: Brandon Sneed <[email protected]>
segmentio · Mar 9, 2021 · e35f1c9 · e35f1c9
1 parent ce4280d
commit e35f1c9
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 10 deletions.
diff --git a/Segment/Classes/SEGAnalytics.m b/Segment/Classes/SEGAnalytics.m
@@ -276,6 +276,8 @@ - (void)identify:(NSString *)userId traits:(NSDictionary *)traits options:(NSDic
     NSString *anonId = [options objectForKey:@"anonymousId"];
     if (anonId == nil) {
         anonId = [self getAnonymousId];
+    } else {
+        [self.integrationsManager saveAnonymousId:anonId];
     }
     // configure traits to match what is seen on android.
     NSMutableDictionary *existingTraitsCopy = [[SEGState sharedInstance].userInfo.traits mutableCopy];

diff --git a/Segment/Internal/SEGIntegrationsManager.h b/Segment/Internal/SEGIntegrationsManager.h
@@ -36,6 +36,7 @@ NS_SWIFT_NAME(IntegrationsManager)
 
 // @Deprecated - Exposing for backward API compat reasons only
 - (NSString *_Nonnull)getAnonymousId;
+- (void)saveAnonymousId:(NSString *)anonymousId;
 
 @end
 

diff --git a/Segment/Internal/SEGIntegrationsManager.m b/Segment/Internal/SEGIntegrationsManager.m
@@ -213,15 +213,6 @@ - (void)identify:(SEGIdentifyPayload *)payload
 {
     NSCAssert2(payload.userId.length > 0 || payload.traits.count > 0, @"either userId (%@) or traits (%@) must be provided.", payload.userId, payload.traits);
 
-    NSString *anonymousId = payload.anonymousId;
-    NSString *existingAnonymousId = self.cachedAnonymousId;
-
-    if (anonymousId == nil) {
-        payload.anonymousId = anonymousId;
-    } else if (![anonymousId isEqualToString:existingAnonymousId]) {
-        [self saveAnonymousId:anonymousId];
-    }
-
     [self callIntegrationsWithSelector:NSSelectorFromString(@"identify:")
                              arguments:@[ payload ]
                                options:payload.options

diff --git a/SegmentTests/AnalyticsTests.swift b/SegmentTests/AnalyticsTests.swift
@@ -65,7 +65,8 @@ class AnalyticsTests: XCTestCase {
         XCTAssertEqual(config.flushInterval, 30)
         XCTAssertEqual(config.maxQueueSize, 1000)
         XCTAssertEqual(config.writeKey, "QUI5ydwIGeFFTa1IvCBUhxL9PyW5B0jE")
-        XCTAssertEqual(config.apiHost?.absoluteString, "https://api.segment.io/v1")
+        // not needed as segment settings API can provide different host values now.
+        //XCTAssertEqual(config.apiHost?.absoluteString, "https://api.segment.io/v1")
         XCTAssertEqual(config.shouldUseLocationServices, false)
         XCTAssertEqual(config.enableAdvertisingTracking, true)
         XCTAssertEqual(config.shouldUseBluetooth,  false)
-Original file line number
+Diff line change
@@ Expand Up / @@ -36,6 +36,7 @@ NS_SWIFT_NAME(IntegrationsManager) @@
     // @Deprecated - Exposing for backward API compat reasons only
     - (NSString *_Nonnull)getAnonymousId;
+    - (void)saveAnonymousId:(NSString *)anonymousId;
     @end
@@ Expand Down @@