Merge pull request #74 from plaidev/ios/0.6.0

[ios] Support custom user properties and bump up to 0.6.0

Nativebrik.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = 'Nativebrik'
-  s.version          = '0.5.10'
+  s.version          = '0.6.0'
   s.summary          = 'Nativebrik SDK'
   s.description      = <<-DESC
 Nativebrik SDK for iOS.

ios/Nativebrik/Nativebrik/data/user.swift

@@ -65,19 +65,22 @@ private let USER_SEED_MAX: Int = 100000000
 
 public class NativebrikUser {
     private var properties: [String: String]
+    private var customProperties: [String: String]
     private var lastBootTime: Double = getCurrentDate().timeIntervalSince1970
     internal var userDB: UserDefaults
 
     init() {
         if !isNativebrikAvailable {
             self.properties = [:]
+            self.customProperties = [:]
             self.userDB = UserDefaults.standard
             return
         }
 
         let suiteName = "\(Bundle.main.bundleIdentifier ?? "app").nativebrik.com"
         self.userDB = UserDefaults(suiteName: suiteName) ?? UserDefaults.standard
         self.properties = [:]
+        self.customProperties = [:]
 
         // userId := uuid by default
         let userId = self.userDB.object(forKey: NativebrikUserDefaultsKeys.USER_ID.rawValue) as? String ?? UUID().uuidString
@@ -127,12 +130,28 @@ public class NativebrikUser {
         }
     }
 
+    // This is an alias of NativebrikUser.setProperties
     public func set(_ properties: [String: String]) {
         for (key, value) in properties {
-            self.properties[key] = value
+            if key == BuiltinUserProperty.userId.rawValue {
+                // overwrite userId
+                self.properties[BuiltinUserProperty.userId.rawValue] = value
+                continue
+            }
+            self.customProperties[key] = value
         }
     }
 
+    public func setProperties(_ properties: [String: String]) {
+        self.set(properties)
+    }
+
+    public func getProperties() -> [String:String] {
+        var props = self.customProperties
+        props[BuiltinUserProperty.userId.rawValue] = self.properties[BuiltinUserProperty.userId.rawValue]
+        return props
+    }
+
     /**
      print user properties for debug
      */
@@ -263,6 +282,11 @@ public class NativebrikUser {
                 eventProps.append(eventProp)
             }
         }
+
+        for (key, value) in self.customProperties {
+            let eventProp = UserProperty(name: key, value: value, type: .STRING)
+            eventProps.append(eventProp)
+        }
 
         return eventProps
     }

ios/Nativebrik/Nativebrik/data/variable.swift

@@ -15,9 +15,12 @@ func _createVariableForTemplate(
     arguments: Any? = nil,
     projectId: String? = nil
 ) -> Any {
-    let userData: [String:Any] = (user != nil) ? [
-        "id": user?.id ?? "",
-    ] : [:]
+    var userData: [String: Any] = [:]
+    if let user = user {
+        userData["id"] = user.id
+        user.getProperties().forEach { userData[$0.key] = $0.value }
+    }
+
     let formData: [String:Any]? = form
     var propertiesData: [String:Any] = [:]
     if let properties = properties {

ios/Nativebrik/Nativebrik/sdk.swift

@@ -12,7 +12,7 @@ import Combine
 // for development
 public var nativebrikTrackUrl = "https://track.nativebrik.com/track/v1"
 public var nativebrikCdnUrl = "https://cdn.nativebrik.com"
-public let nativebrikSdkVersion = "0.5.10"
+public let nativebrikSdkVersion = "0.6.0"
 
 public let isNativebrikAvailable: Bool = {
     if #available(iOS 15.0, *) {