@dashx/react-native 0.1.8-alpha → 0.1.12

package/android/build.gradle

@@ -90,7 +90,7 @@ repositories {
 }
 
 dependencies {
-  implementation 'com.github.dashxhq:dashx-android:remove-account-type-SNAPSHOT'
+  implementation 'com.github.dashxhq:dashx-android:main-SNAPSHOT'
     //noinspection GradleDynamicVersion
   implementation 'com.facebook.react:react-native:+'   // From node_modules
   implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"

package/android/src/main/AndroidManifest.xml

@@ -2,7 +2,7 @@
           package="com.dashx.rn.sdk">
 
   <application>
-    <service android:name="com.dashx.reactnative.DashXMessagingService">
+    <service android:name="com.dashx.rn.sdk.DashXMessagingService">
       <intent-filter android:priority="1">
         <action android:name="com.google.firebase.MESSAGING_EVENT"/>
       </intent-filter>

package/android/src/main/java/com/dashx/rn/sdk/DashXModule.kt

@@ -185,4 +185,9 @@ class DashXModule(private val reactContext: ReactApplicationContext) : ReactCont
             }
         )
     }
+    
+    @ReactMethod
+    fun subscribe() {
+        interceptor.getDashXClient().subscribe()
+    }
 }

package/ios/API.swift

@@ -553,20 +553,38 @@ public enum DashXGql {
     public var graphQLMap: GraphQLMap
 
     /// - Parameters:
-    ///   - uid
+    ///   - accountUid
+    ///   - accountAnonymousUid
     ///   - name
     ///   - kind
     ///   - value
-    public init(uid: String, name: Swift.Optional<String?> = nil, kind: ContactKind, value: String) {
-      graphQLMap = ["uid": uid, "name": name, "kind": kind, "value": value]
+    ///   - userAgent
+    ///   - osName
+    ///   - osVersion
+    ///   - deviceModel
+    ///   - deviceManufacturer
+    ///   - deviceUid
+    ///   - deviceAdvertisingUid
+    ///   - isDeviceAdTrackingEnabled
+    public init(accountUid: Swift.Optional<String?> = nil, accountAnonymousUid: Swift.Optional<String?> = nil, name: Swift.Optional<String?> = nil, kind: ContactKind, value: String, userAgent: Swift.Optional<String?> = nil, osName: Swift.Optional<String?> = nil, osVersion: Swift.Optional<String?> = nil, deviceModel: Swift.Optional<String?> = nil, deviceManufacturer: Swift.Optional<String?> = nil, deviceUid: Swift.Optional<String?> = nil, deviceAdvertisingUid: Swift.Optional<String?> = nil, isDeviceAdTrackingEnabled: Swift.Optional<Bool?> = nil) {
+      graphQLMap = ["accountUid": accountUid, "accountAnonymousUid": accountAnonymousUid, "name": name, "kind": kind, "value": value, "userAgent": userAgent, "osName": osName, "osVersion": osVersion, "deviceModel": deviceModel, "deviceManufacturer": deviceManufacturer, "deviceUid": deviceUid, "deviceAdvertisingUid": deviceAdvertisingUid, "isDeviceAdTrackingEnabled": isDeviceAdTrackingEnabled]
     }
 
-    public var uid: String {
+    public var accountUid: Swift.Optional<String?> {
       get {
-        return graphQLMap["uid"] as! String
+        return graphQLMap["accountUid"] as? Swift.Optional<String?> ?? Swift.Optional<String?>.none
       }
       set {
-        graphQLMap.updateValue(newValue, forKey: "uid")
+        graphQLMap.updateValue(newValue, forKey: "accountUid")
+      }
+    }
+
+    public var accountAnonymousUid: Swift.Optional<String?> {
+      get {
+        return graphQLMap["accountAnonymousUid"] as? Swift.Optional<String?> ?? Swift.Optional<String?>.none
+      }
+      set {
+        graphQLMap.updateValue(newValue, forKey: "accountAnonymousUid")
       }
     }
 
@@ -596,43 +614,119 @@ public enum DashXGql {
         graphQLMap.updateValue(newValue, forKey: "value")
       }
     }
+
+    public var userAgent: Swift.Optional<String?> {
+      get {
+        return graphQLMap["userAgent"] as? Swift.Optional<String?> ?? Swift.Optional<String?>.none
+      }
+      set {
+        graphQLMap.updateValue(newValue, forKey: "userAgent")
+      }
+    }
+
+    public var osName: Swift.Optional<String?> {
+      get {
+        return graphQLMap["osName"] as? Swift.Optional<String?> ?? Swift.Optional<String?>.none
+      }
+      set {
+        graphQLMap.updateValue(newValue, forKey: "osName")
+      }
+    }
+
+    public var osVersion: Swift.Optional<String?> {
+      get {
+        return graphQLMap["osVersion"] as? Swift.Optional<String?> ?? Swift.Optional<String?>.none
+      }
+      set {
+        graphQLMap.updateValue(newValue, forKey: "osVersion")
+      }
+    }
+
+    public var deviceModel: Swift.Optional<String?> {
+      get {
+        return graphQLMap["deviceModel"] as? Swift.Optional<String?> ?? Swift.Optional<String?>.none
+      }
+      set {
+        graphQLMap.updateValue(newValue, forKey: "deviceModel")
+      }
+    }
+
+    public var deviceManufacturer: Swift.Optional<String?> {
+      get {
+        return graphQLMap["deviceManufacturer"] as? Swift.Optional<String?> ?? Swift.Optional<String?>.none
+      }
+      set {
+        graphQLMap.updateValue(newValue, forKey: "deviceManufacturer")
+      }
+    }
+
+    public var deviceUid: Swift.Optional<String?> {
+      get {
+        return graphQLMap["deviceUid"] as? Swift.Optional<String?> ?? Swift.Optional<String?>.none
+      }
+      set {
+        graphQLMap.updateValue(newValue, forKey: "deviceUid")
+      }
+    }
+
+    public var deviceAdvertisingUid: Swift.Optional<String?> {
+      get {
+        return graphQLMap["deviceAdvertisingUid"] as? Swift.Optional<String?> ?? Swift.Optional<String?>.none
+      }
+      set {
+        graphQLMap.updateValue(newValue, forKey: "deviceAdvertisingUid")
+      }
+    }
+
+    public var isDeviceAdTrackingEnabled: Swift.Optional<Bool?> {
+      get {
+        return graphQLMap["isDeviceAdTrackingEnabled"] as? Swift.Optional<Bool?> ?? Swift.Optional<Bool?>.none
+      }
+      set {
+        graphQLMap.updateValue(newValue, forKey: "isDeviceAdTrackingEnabled")
+      }
+    }
   }
 
   public enum ContactKind: RawRepresentable, Equatable, Hashable, CaseIterable, Apollo.JSONDecodable, Apollo.JSONEncodable {
     public typealias RawValue = String
-    case secondaryEmail
-    case secondaryPhone
+    case email
+    case phone
     case ios
     case android
+    case web
     /// Auto generated constant for unknown enum values
     case __unknown(RawValue)
 
     public init?(rawValue: RawValue) {
       switch rawValue {
-        case "SECONDARY_EMAIL": self = .secondaryEmail
-        case "SECONDARY_PHONE": self = .secondaryPhone
+        case "EMAIL": self = .email
+        case "PHONE": self = .phone
         case "IOS": self = .ios
         case "ANDROID": self = .android
+        case "WEB": self = .web
         default: self = .__unknown(rawValue)
       }
     }
 
     public var rawValue: RawValue {
       switch self {
-        case .secondaryEmail: return "SECONDARY_EMAIL"
-        case .secondaryPhone: return "SECONDARY_PHONE"
+        case .email: return "EMAIL"
+        case .phone: return "PHONE"
         case .ios: return "IOS"
         case .android: return "ANDROID"
+        case .web: return "WEB"
         case .__unknown(let value): return value
       }
     }
 
     public static func == (lhs: ContactKind, rhs: ContactKind) -> Bool {
       switch (lhs, rhs) {
-        case (.secondaryEmail, .secondaryEmail): return true
-        case (.secondaryPhone, .secondaryPhone): return true
+        case (.email, .email): return true
+        case (.phone, .phone): return true
         case (.ios, .ios): return true
         case (.android, .android): return true
+        case (.web, .web): return true
         case (.__unknown(let lhsValue), .__unknown(let rhsValue)): return lhsValue == rhsValue
         default: return false
       }
@@ -640,10 +734,11 @@ public enum DashXGql {
 
     public static var allCases: [ContactKind] {
       return [
-        .secondaryEmail,
-        .secondaryPhone,
+        .email,
+        .phone,
         .ios,
         .android,
+        .web,
       ]
     }
   }
@@ -2074,6 +2169,7 @@ public enum DashXGql {
         subscribeContact(input: $input) {
           __typename
           id
+          value
         }
       }
       """
@@ -2125,6 +2221,7 @@ public enum DashXGql {
           return [
             GraphQLField("__typename", type: .nonNull(.scalar(String.self))),
             GraphQLField("id", type: .nonNull(.scalar(UUID.self))),
+            GraphQLField("value", type: .nonNull(.scalar(String.self))),
           ]
         }
 
@@ -2134,8 +2231,8 @@ public enum DashXGql {
           self.resultMap = unsafeResultMap
         }
 
-        public init(id: UUID) {
-          self.init(unsafeResultMap: ["__typename": "Contact", "id": id])
+        public init(id: UUID, value: String) {
+          self.init(unsafeResultMap: ["__typename": "Contact", "id": id, "value": value])
         }
 
         public var __typename: String {
@@ -2155,6 +2252,15 @@ public enum DashXGql {
             resultMap.updateValue(newValue, forKey: "id")
           }
         }
+
+        public var value: String {
+          get {
+            return resultMap["value"]! as! String
+          }
+          set {
+            resultMap.updateValue(newValue, forKey: "value")
+          }
+        }
       }
     }
   }

package/ios/Constants.swift

@@ -3,6 +3,7 @@ import Foundation
 struct Constants {
     static let PACKAGE_NAME = "com.dashx.sdk"
     static let USER_PREFERENCES_KEY_ANONYMOUS_UID = "\(PACKAGE_NAME).anonymous_uid"
+    static let USER_PREFERENCES_KEY_DEVICE_TOKEN = "\(PACKAGE_NAME).device_token"
     static let USER_PREFERENCES_KEY_BUILD = "\(PACKAGE_NAME).build"
     static let INTERNAL_EVENT_APP_INSTALLED = "Application Installed"
     static let INTERNAL_EVENT_APP_UPDATED = "Application Updated"

package/ios/DashX.m

@@ -12,4 +12,5 @@ RCT_EXTERN_METHOD(searchContent:(NSString *)contentType options:(NSDictionary *)
 RCT_EXTERN_METHOD(fetchContent:(NSString *)urn options:(NSDictionary *)options resolver:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject)
 RCT_EXTERN_METHOD(addItemToCart:(NSString *)itemId pricingId:(NSString *)pricingId quantity:(NSString *)quantity reset:(BOOL)reset custom:(NSDictionary *)custom resolver:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject)
 RCT_EXTERN_METHOD(fetchCart:resolver:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject)
+RCT_EXTERN_METHOD(subscribe)
 @end

package/ios/DashX.swift

@@ -141,4 +141,9 @@ class DashX: RCTEventEmitter {
         )
     }
 
+    @objc
+    func subscribe() {
+        dashXClient.subscribe()
+    }
+
 }

package/ios/DashXClient.swift

@@ -11,12 +11,18 @@ class DashXClient {
     private var uid: String?
     private var deviceToken: String?
 
+    private var mustSubscribe: Bool = false;
+
     private init() {
         generateAnonymousUid()
     }
 
     func setDeviceToken(to: String) {
         self.deviceToken = to
+
+        if (self.mustSubscribe) {
+          self.subscribe()
+        }
     }
 
     func setTargetEnvironment(to: String) {
@@ -91,7 +97,7 @@ class DashXClient {
             event: event,
             accountUid: uid,
             accountAnonymousUid: anonymousUid,
-            data: withData as? [String: Any?]
+            data: withData as? [String: JSONDecodable?]
         )
 
         DashXLog.d(tag: #function, "Calling track with \(trackEventInput)")
@@ -116,14 +122,26 @@ class DashXClient {
     // MARK: -- subscribe
 
     func subscribe() {
-        if deviceToken == nil || ConfigInterceptor.shared.identityToken == nil {
+        if deviceToken == nil {
+            self.mustSubscribe = true
             return
         }
 
+        self.mustSubscribe = false
+
         let deviceKind = "IOS"
 
+        let preferences = UserDefaults.standard
+        let deviceTokenKey = Constants.USER_PREFERENCES_KEY_DEVICE_TOKEN
+
+        if preferences.string(forKey: deviceTokenKey) == deviceToken {
+            DashXLog.d(tag: #function, "Already subscribed: \(String(describing: deviceToken))")
+            return
+        }
+        
         let subscribeContactInput  = DashXGql.SubscribeContactInput(
-            uid: uid!,
+            accountUid: uid,
+            accountAnonymousUid: anonymousUid!,
             name: deviceKind,
             kind: .ios,
             value: deviceToken!
@@ -136,7 +154,10 @@ class DashXClient {
         Network.shared.apollo.perform(mutation: subscribeContactMutation) { result in
           switch result {
           case .success(let graphQLResult):
-            DashXLog.d(tag: #function, "Sent subscribe with \(String(describing: graphQLResult))")
+              if graphQLResult.data != nil {
+                    preferences.set(graphQLResult.data?.subscribeContact.value, forKey: deviceTokenKey)
+                    DashXLog.d(tag: #function, "Sent subscribe with \(String(describing: graphQLResult))")
+              }
           case .failure(let error):
             DashXLog.d(tag: #function, "Encountered an error during subscribe(): \(error)")
           }

package/ios/graphql/SubscribeContact.graphql

@@ -1,5 +1,6 @@
 mutation SubscribeContact($input: SubscribeContactInput!) {
     subscribeContact(input: $input) {
         id
+        value
     }
 }