Merge pull request #7569 from woocommerce/issue/7550-save-anonid-to-keychain

Save anonymous ID to Keychain for identifying a logged-out user potentially across installs

Author: jaclync

WooCommerce/Classes/Authentication/Keychain+Entries.swift

@@ -6,4 +6,10 @@ extension Keychain {
         get { self[WooConstants.keychainAppleIDKey] }
         set { self[WooConstants.keychainAppleIDKey] = newValue }
     }
+
+    /// The anonymous ID used to identify a logged-out user potentially across installs in analytics and A/B experiments.
+    var anonymousID: String? {
+        get { self[WooConstants.anonymousIDKey] }
+        set { self[WooConstants.anonymousIDKey] = newValue }
+    }
 }

WooCommerce/Classes/System/SessionManager.swift

@@ -119,14 +119,16 @@ final class SessionManager: SessionManagerProtocol {
     /// Anonymous UserID.
     ///
     var anonymousUserID: String? {
-        get {
-            if let anonID = defaults[.defaultAnonymousID] as? String, !anonID.isEmpty {
-                return anonID
-            } else {
-                let newValue = UUID().uuidString
-                defaults[.defaultAnonymousID] = newValue
-                return newValue
-            }
+        if let anonID = defaults[.defaultAnonymousID] as? String, !anonID.isEmpty {
+            return anonID
+        } else if let keychainAnonID = keychain.anonymousID, !keychainAnonID.isEmpty {
+            defaults[.defaultAnonymousID] = keychainAnonID
+            return keychainAnonID
+        } else {
+            let newValue = UUID().uuidString
+            defaults[.defaultAnonymousID] = newValue
+            keychain.anonymousID = newValue
+            return newValue
         }
     }
 

WooCommerce/Classes/System/WooConstants.swift

@@ -21,6 +21,10 @@ enum WooConstants {
     ///
     static let keychainAppleIDKey = "AppleID"
 
+    /// Keychain Access's Key for anonymous ID
+    ///
+    static let anonymousIDKey = "anonymousID"
+
     /// Push Notifications ApplicationID
     ///
 #if DEBUG