@dashx/react-native 0.1.9 → 0.1.13

package/android/build.gradle

@@ -90,15 +90,19 @@ repositories {
 }
 
 dependencies {
-  implementation 'com.github.dashxhq:dashx-android:fix-caching-issue-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"
 
   implementation 'com.google.code.gson:gson:2.8.6'
 
-  compileOnly 'com.google.firebase:firebase-core:17.2.1'
-  compileOnly 'com.google.firebase:firebase-messaging:20.0.1'
+  // Import the Firebase BoM (see: https://firebase.google.com/docs/android/learn-more#bom)
+  implementation platform('com.google.firebase:firebase-bom:28.3.0')
+  implementation 'com.google.firebase:firebase-messaging-ktx'
+
+  // The Firebase SDK for Google Analytics is needed for delivery reports
+  implementation 'com.google.firebase:firebase-analytics-ktx'
 }
 
 def configureReactNativePom(def pom) {

package/android/src/main/AndroidManifest.xml

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

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

@@ -12,7 +12,7 @@ class DashXActivityLifecycleCallbacks : Application.ActivityLifecycleCallbacks {
     private var startSession = System.currentTimeMillis().toDouble()
 
     init {
-        dashXClient.trackAppStarted()
+        dashXClient?.trackAppStarted()
     }
 
     override fun onActivityPaused(activity: Activity) {
@@ -20,7 +20,7 @@ class DashXActivityLifecycleCallbacks : Application.ActivityLifecycleCallbacks {
             return
         }
 
-        dashXClient.trackAppSession(System.currentTimeMillis().toDouble() - startSession)
+        dashXClient?.trackAppSession(System.currentTimeMillis().toDouble() - startSession)
     }
 
     override fun onActivityResumed(activity: Activity) {
@@ -29,7 +29,7 @@ class DashXActivityLifecycleCallbacks : Application.ActivityLifecycleCallbacks {
         }
 
         startSession = System.currentTimeMillis().toDouble()
-        dashXClient.trackAppStarted(fromBackground = true)
+        dashXClient?.trackAppStarted(fromBackground = true)
     }
 
     override fun onActivityStarted(activity: Activity) {
@@ -37,10 +37,10 @@ class DashXActivityLifecycleCallbacks : Application.ActivityLifecycleCallbacks {
             return
         }
 
-        val packageManager = activity?.packageManager
+        val packageManager = activity.packageManager
         val info = packageManager?.getActivityInfo(activity.componentName, PackageManager.GET_META_DATA)
         val activityLabel = info?.loadLabel(packageManager)
-        activityLabel?.let { it -> dashXClient.screen(it.toString(), hashMapOf()) }
+        activityLabel?.let { it -> dashXClient?.screen(it.toString(), hashMapOf()) }
     }
 
     override fun onActivityDestroyed(activity: Activity) {

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

@@ -16,35 +16,37 @@ class DashXClientInterceptor private constructor() {
 
     fun createDashXClient(reactApplicationContext: ReactApplicationContext, publicKey: String, baseURI: String?, targetEnvironment: String?, targetInstallation: String?) {
         this.reactApplicationContext = reactApplicationContext
-        client = DashX(reactApplicationContext.applicationContext, publicKey!!, baseURI, targetEnvironment, targetInstallation)
+        client = DashX(reactApplicationContext.applicationContext, publicKey, baseURI, targetEnvironment, targetInstallation)
     }
 
-    fun getDashXClient(): com.dashx.sdk.DashXClient {
-        if (client == null) {
-            throw Exception("DashXClient not initialised")
-        }
-
-        return client!!
+    fun getDashXClient(): com.dashx.sdk.DashXClient? {
+        return client
     }
 
     fun handleMessage(remoteMessage: RemoteMessage) {
-        val notification = remoteMessage.notification
+        val notificationData = remoteMessage.getData()
+
+        DashXLog.d(tag, "Notification Data: " + notificationData)
+
         val eventProperties: WritableMap = Arguments.createMap()
-        DashXLog.d(tag, "Data: " + remoteMessage.data)
 
         try {
-            eventProperties.putMap("data", convertToWritableMap(remoteMessage.data, listOf(dashXNotificationFilter)))
+            eventProperties.putMap("data", convertToWritableMap(notificationData, listOf(dashXNotificationFilter)))
         } catch (e: Exception) {
-            DashXLog.d(tag, "Encountered an error while parsing notification data")
             e.printStackTrace()
+            DashXLog.d(tag, "Encountered an error while parsing notification data.")
         }
 
+        val notification = remoteMessage.getNotification()
+
         if (notification != null) {
             val notificationProperties: WritableMap = Arguments.createMap()
-            notificationProperties.putString("title", notification.title)
-            notificationProperties.putString("body", notification.body)
+            notificationProperties.putString("title", notification.getTitle())
+            notificationProperties.putString("body", notification.getBody())
+
             eventProperties.putMap("notification", notificationProperties)
-            DashXLog.d(tag, "onMessageReceived: " + notification.title)
+
+            DashXLog.d(tag, "onMessageReceived with Title: " + notification.getTitle() + " and Body: " + notification.getBody())
         }
 
         sendJsEvent("messageReceived", eventProperties)

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

@@ -11,13 +11,18 @@ class DashXExceptionHandler(private val mainExceptionHandler: Thread.UncaughtExc
                 return
             }
 
-            val dashXExceptionHandler = DashXExceptionHandler(defaultExceptionHandler)
-            Thread.setDefaultUncaughtExceptionHandler(dashXExceptionHandler)
+            if (defaultExceptionHandler != null) {
+                val dashXExceptionHandler = DashXExceptionHandler(defaultExceptionHandler)
+                Thread.setDefaultUncaughtExceptionHandler(dashXExceptionHandler)
+            }
         }
     }
 
     override fun uncaughtException(thread: Thread, exception: Throwable) {
-        dashXClient.trackAppCrashed(exception)
+        if (dashXClient != null) {
+            dashXClient.trackAppCrashed(exception)
+        }
+
         mainExceptionHandler.uncaughtException(thread, exception)
     }
 }

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

@@ -10,8 +10,11 @@ class DashXMessagingService : FirebaseMessagingService() {
 
     override fun onNewToken(token: String) {
         super.onNewToken(token)
-        dashXClient.setDeviceToken(token)
         DashXLog.d(tag, "onNewToken: $token")
+
+        if (dashXClient != null) {
+            dashXClient.setDeviceToken(token)
+        }
     }
 
     override fun onMessageReceived(remoteMessage: RemoteMessage) {

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

@@ -3,7 +3,7 @@ package com.dashx.rn.sdk
 import com.facebook.react.bridge.*
 import com.dashx.sdk.DashXLog
 import com.google.android.gms.tasks.OnCompleteListener
-import com.google.firebase.iid.FirebaseInstanceId
+import com.google.firebase.messaging.FirebaseMessaging
 
 class DashXModule(private val reactContext: ReactApplicationContext) : ReactContextBaseJavaModule(reactContext) {
     private val tag = DashXModule::class.java.simpleName
@@ -28,7 +28,7 @@ class DashXModule(private val reactContext: ReactApplicationContext) : ReactCont
             options.getStringIfPresent("targetEnvironment"),
             options.getStringIfPresent("targetInstallation")
         )
-        interceptor.getDashXClient().generateAnonymousUid()
+        interceptor.getDashXClient()?.generateAnonymousUid()
 
         if (options.hasKey("trackAppLifecycleEvents") && options.getBoolean("trackAppLifecycleEvents")) {
             DashXExceptionHandler.enable()
@@ -39,28 +39,28 @@ class DashXModule(private val reactContext: ReactApplicationContext) : ReactCont
             DashXActivityLifecycleCallbacks.enableScreenTracking(reactContext.applicationContext)
         }
 
-        FirebaseInstanceId.getInstance().instanceId
+        FirebaseMessaging.getInstance().getToken()
             .addOnCompleteListener(OnCompleteListener { task ->
                 if (!task.isSuccessful) {
-                    DashXLog.d(tag, "getInstanceId failed $task.exception")
+                    DashXLog.d(tag, "FirebaseMessaging.getInstance().getToken() failed: $task.exception")
                     return@OnCompleteListener
                 }
 
-                val token = task.result?.token
-                token?.let { it -> interceptor.getDashXClient().setDeviceToken(it) }
+                val token = task.getResult()
+                token?.let { it -> interceptor.getDashXClient()?.setDeviceToken(it) }
                 DashXLog.d(tag, "Firebase Initialised with: $token")
-            })
+            });
     }
 
     @ReactMethod
     fun identify(uid: String?, options: ReadableMap?) {
         val optionsHashMap = options?.toHashMap()
-        interceptor.getDashXClient().identify(uid, optionsHashMap as HashMap<String, String>?)
+        interceptor.getDashXClient()?.identify(uid, optionsHashMap as HashMap<String, String>?)
     }
 
     @ReactMethod
     fun reset() {
-        interceptor.getDashXClient().reset()
+        interceptor.getDashXClient()?.reset()
     }
 
     @ReactMethod
@@ -72,22 +72,22 @@ class DashXModule(private val reactContext: ReactApplicationContext) : ReactCont
             return
         }
 
-        interceptor.getDashXClient().track(event, jsonData)
+        interceptor.getDashXClient()?.track(event, jsonData)
     }
 
     @ReactMethod
     fun screen(screenName: String, data: ReadableMap?) {
-        interceptor.getDashXClient().screen(screenName, data?.toHashMap() as HashMap<String, String>)
+        interceptor.getDashXClient()?.screen(screenName, data?.toHashMap() as HashMap<String, String>)
     }
 
     @ReactMethod
     fun setIdentityToken(identityToken: String) {
-        interceptor.getDashXClient().setIdentityToken(identityToken)
+        interceptor.getDashXClient()?.setIdentityToken(identityToken)
     }
 
     @ReactMethod
     fun fetchContent(urn: String, options: ReadableMap?, promise: Promise) {
-        interceptor.getDashXClient().fetchContent(
+        interceptor.getDashXClient()?.fetchContent(
             urn,
             options?.getBooleanIfPresent("preview"),
             options?.getStringIfPresent("language"),
@@ -119,7 +119,7 @@ class DashXModule(private val reactContext: ReactApplicationContext) : ReactCont
             throw Exception("Encountered an error while parsing order")
         }
 
-        interceptor.getDashXClient().searchContent(
+        interceptor.getDashXClient()?.searchContent(
             contentType,
             options?.getString("returnType") ?: "all",
             jsonFilter,
@@ -159,7 +159,7 @@ class DashXModule(private val reactContext: ReactApplicationContext) : ReactCont
             throw Exception("Encountered an error while parsing custom")
         }
 
-        interceptor.getDashXClient().addItemToCart(
+        interceptor.getDashXClient()?.addItemToCart(
             itemId,
             pricingId,
             quantity,
@@ -176,7 +176,7 @@ class DashXModule(private val reactContext: ReactApplicationContext) : ReactCont
 
     @ReactMethod
     fun fetchCart(promise: Promise) {
-        interceptor.getDashXClient().fetchCart(
+        interceptor.getDashXClient()?.fetchCart(
             onError = {
                 promise.reject("EUNSPECIFIED", it)
             },
@@ -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)")
@@ -113,20 +119,46 @@ class DashXClient {
 
         track(Constants.INTERNAL_EVENT_APP_SCREEN_VIEWED, withData: properties?.merging([ "name": screenName], uniquingKeysWith: { (_, new) in new }) as NSDictionary?)
     }
+
+    // https://stackoverflow.com/a/11197770
+    func getDeviceModel() -> String {
+        var systemInfo = utsname()
+        uname(&systemInfo)
+        let machineMirror = Mirror(reflecting: systemInfo.machine)
+        return machineMirror.children.reduce("") { identifier, element in
+            guard let value = element.value as? Int8, value != 0 else { return identifier }
+            return identifier + String(UnicodeScalar(UInt8(value)))
+        }
+    }
+
     // MARK: -- subscribe
 
     func subscribe() {
-        if deviceToken == nil || ConfigInterceptor.shared.identityToken == nil {
+        if deviceToken == nil {
+            self.mustSubscribe = true
             return
         }
 
-        let deviceKind = "IOS"
+        self.mustSubscribe = false
+
+        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!,
-            name: deviceKind,
+            accountUid: uid,
+            accountAnonymousUid: anonymousUid!,
+            name: UIDevice.current.model,
             kind: .ios,
-            value: deviceToken!
+            value: deviceToken!,
+            osName: UIDevice.current.systemName,
+            osVersion: UIDevice.current.systemVersion,
+            deviceModel: getDeviceModel(),
+            deviceManufacturer: "Apple"
         )
 
         DashXLog.d(tag: #function, "Calling subscribe with \(subscribeContactInput)")
@@ -136,7 +168,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
     }
 }