Merge pull request #7574 from woocommerce/fix/explat-include-anonid-in-loggedin-requests

Pass anonymous ID to ExPlat configuration for authenticated users

Author: jaclync

Podfile

@@ -36,8 +36,10 @@ target 'WooCommerce' do
   # ====================
   #
 
+  pod 'Automattic-Tracks-iOS', '~> 0.12.0-beta.2'
   # pod 'Automattic-Tracks-iOS', :git => 'https://github.com/Automattic/Automattic-Tracks-iOS.git', :branch => ''
-  pod 'Automattic-Tracks-iOS', '~> 0.12.0-beta.1'
+  # pod 'Automattic-Tracks-iOS', :git => 'https://github.com/Automattic/Automattic-Tracks-iOS.git', :commit => ''
+  # pod 'Automattic-Tracks-iOS', :path => '../Automattic-Tracks-iOS'
 
   pod 'Gridicons', '~> 1.2.0'
 
@@ -227,7 +229,10 @@ end
 # ==================
 #
 def experiments_pods
-  pod 'Automattic-Tracks-iOS', '~> 0.12.0-beta.1'
+  pod 'Automattic-Tracks-iOS', '~> 0.12.0-beta.2'
+  # pod 'Automattic-Tracks-iOS', :git => 'https://github.com/Automattic/Automattic-Tracks-iOS.git', :branch => ''
+  # pod 'Automattic-Tracks-iOS', :git => 'https://github.com/Automattic/Automattic-Tracks-iOS.git', :commit => '7e11e93d6205f51c09aad5d59f4e0679a796a2ef'
+  # pod 'Automattic-Tracks-iOS', :path => '../Automattic-Tracks-iOS'
   pod 'CocoaLumberjack', '~> 3.7.4'
   pod 'CocoaLumberjack/Swift', '~> 3.7.4'
 end

Podfile.lock

@@ -6,7 +6,7 @@ PODS:
   - AppAuth/Core (1.5.0)
   - AppAuth/ExternalUserAgent (1.5.0):
     - AppAuth/Core
-  - Automattic-Tracks-iOS (0.12.0-beta.1):
+  - Automattic-Tracks-iOS (0.12.0-beta.2):
     - Sentry (~> 6)
     - Sodium (>= 0.9.1)
     - UIDeviceIdentifier (~> 2.0)
@@ -83,7 +83,7 @@ PODS:
 
 DEPENDENCIES:
   - Alamofire (~> 4.8)
-  - Automattic-Tracks-iOS (~> 0.12.0-beta.1)
+  - Automattic-Tracks-iOS (~> 0.12.0-beta.2)
   - CocoaLumberjack (~> 3.7.4)
   - CocoaLumberjack/Swift (~> 3.7.4)
   - Gridicons (~> 1.2.0)
@@ -144,7 +144,7 @@ SPEC REPOS:
 SPEC CHECKSUMS:
   Alamofire: 3ec537f71edc9804815215393ae2b1a8ea33a844
   AppAuth: 80317d99ac7ff2801a2f18ff86b48cd315ed465d
-  Automattic-Tracks-iOS: b6f9873770a57e54941c5a3ca8296cbc8dd1015b
+  Automattic-Tracks-iOS: f31213fbf0391968ffcff75e8c1bdad398589261
   CocoaLumberjack: 543c79c114dadc3b1aba95641d8738b06b05b646
   FormatterKit: 184db51bf120b633693a73624a4cede89ec51a41
   GoogleSignIn: fd381840dbe7c1137aa6dc30849a5c3e070c034a
@@ -179,6 +179,6 @@ SPEC CHECKSUMS:
   ZendeskSupportProvidersSDK: 2bdf8544f7cd0fd4c002546f5704b813845beb2a
   ZendeskSupportSDK: 3a8e508ab1d9dd22dc038df6c694466414e037ba
 
-PODFILE CHECKSUM: e8394e38023e50481a5683373d9efd4e827ba1db
+PODFILE CHECKSUM: 9a75e7f419482622cc94acc2a73bd04ebbc4beaf
 
 COCOAPODS: 1.11.2

WooCommerce/Classes/Analytics/TracksProvider.swift

@@ -64,6 +64,7 @@ public extension TracksProvider {
 private extension TracksProvider {
     func switchTracksUsersIfNeeded() {
         let currentAnalyticsUsername = UserDefaults.standard[.analyticsUsername] as? String ?? ""
+        let anonymousID = ServiceLocator.stores.sessionManager.anonymousUserID
         if ServiceLocator.stores.isAuthenticated,
             let account = ServiceLocator.stores.sessionManager.defaultAccount,
             let credentials = ServiceLocator.stores.sessionManager.defaultCredentials {
@@ -72,25 +73,28 @@ private extension TracksProvider {
                 UserDefaults.standard[.analyticsUsername] = account.username
                 tracksService.switchToAuthenticatedUser(withUsername: account.username,
                                                         userID: String(account.userID),
+                                                        anonymousID: anonymousID,
                                                         wpComToken: credentials.authToken,
                                                         skipAliasEventCreation: false)
             } else if currentAnalyticsUsername == account.username {
                 // Username did not change - just make sure Tracks client has it
                 tracksService.switchToAuthenticatedUser(withUsername: account.username,
                                                         userID: String(account.userID),
+                                                        anonymousID: anonymousID,
                                                         wpComToken: credentials.authToken,
                                                         skipAliasEventCreation: true)
             } else {
                 // Username changed for some reason - switch back to anonymous first
-                tracksService.switchToAnonymousUser(withAnonymousID: ServiceLocator.stores.sessionManager.anonymousUserID)
+                tracksService.switchToAnonymousUser(withAnonymousID: anonymousID)
                 tracksService.switchToAuthenticatedUser(withUsername: account.username,
                                                         userID: String(account.userID),
+                                                        anonymousID: anonymousID,
                                                         wpComToken: credentials.authToken,
                                                         skipAliasEventCreation: false)
             }
         } else {
             UserDefaults.standard[.analyticsUsername] = nil
-            tracksService.switchToAnonymousUser(withAnonymousID: ServiceLocator.stores.sessionManager.anonymousUserID)
+            tracksService.switchToAnonymousUser(withAnonymousID: anonymousID)
         }
     }