@dashx/react-native 0.1.6 → 0.1.10

package/android/build/reports/lint-results.xml

@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<issues format="5" by="lint 3.4.1">
+
+    <issue
+        id="NewApi"
+        severity="Error"
+        message="Call requires API level 24 (current min is 16): `java.lang.Iterable#forEach`"
+        category="Correctness"
+        priority="6"
+        summary="Calling new methods on older versions"
+        explanation="This check scans through all the Android API calls in the application and warns about any calls that are not available on **all** versions targeted by this application (according to its minimum SDK attribute in the manifest).&#xA;&#xA;If you really want to use this API and don&apos;t need to support older devices just set the `minSdkVersion` in your `build.gradle` or `AndroidManifest.xml` files.&#xA;&#xA;If your code is **deliberately** accessing newer APIs, and you have ensured (e.g. with conditional execution) that this code will only ever be called on a supported platform, then you can annotate your class or method with the `@TargetApi` annotation specifying the local minimum SDK to apply, such as `@TargetApi(11)`, such that this check considers 11 rather than your manifest file&apos;s minimum SDK as the required API level.&#xA;&#xA;If you are deliberately setting `android:` attributes in style definitions, make sure you place this in a `values-v`*NN* folder in order to avoid running into runtime conflicts on certain devices where manufacturers have added custom attributes whose ids conflict with the new ones on later platforms.&#xA;&#xA;Similarly, you can use tools:targetApi=&quot;11&quot; in an XML file to indicate that the element will only be inflated in an adequate context."
+        errorLine1="                content.forEach {"
+        errorLine2="                        ~~~~~~~">
+        <location
+            file="/Users/pradeep/Projects/dashx/dashx-js/packages/react-native/android/src/main/java/com/dashx/rn/sdk/DashXModule.kt"
+            line="138"
+            column="25"/>
+    </issue>
+
+    <issue
+        id="GradleDependency"
+        severity="Warning"
+        message="A newer version of com.google.firebase:firebase-core than 17.2.1 is available: 20.0.2"
+        category="Correctness"
+        priority="4"
+        summary="Obsolete Gradle Dependency"
+        explanation="This detector looks for usages of libraries where the version you are using is not the current stable release. Using older versions is fine, and there are cases where you deliberately want to stick with an older version. However, you may simply not be aware that a more recent version is available, and that is what this lint check helps find."
+        errorLine1="  compileOnly &apos;com.google.firebase:firebase-core:17.2.1&apos;"
+        errorLine2="  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="/Users/pradeep/Projects/dashx/dashx-js/packages/react-native/android/build.gradle"
+            line="100"
+            column="3"/>
+    </issue>
+
+    <issue
+        id="GradleDependency"
+        severity="Warning"
+        message="A newer version of com.google.firebase:firebase-messaging than 20.0.1 is available: 23.0.0"
+        category="Correctness"
+        priority="4"
+        summary="Obsolete Gradle Dependency"
+        explanation="This detector looks for usages of libraries where the version you are using is not the current stable release. Using older versions is fine, and there are cases where you deliberately want to stick with an older version. However, you may simply not be aware that a more recent version is available, and that is what this lint check helps find."
+        errorLine1="  compileOnly &apos;com.google.firebase:firebase-messaging:20.0.1&apos;"
+        errorLine2="  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="/Users/pradeep/Projects/dashx/dashx-js/packages/react-native/android/build.gradle"
+            line="101"
+            column="3"/>
+    </issue>
+
+    <issue
+        id="ExportedService"
+        severity="Warning"
+        message="Exported service does not require permission"
+        category="Security"
+        priority="5"
+        summary="Exported service does not require permission"
+        explanation="Exported services (services which either set `exported=true` or contain an intent-filter and do not specify `exported=false`) should define a permission that an entity must have in order to launch the service or bind to it. Without this, any application can use this service."
+        errorLine1="    &lt;service android:name=&quot;com.dashx.reactnative.DashXMessagingService&quot;>"
+        errorLine2="     ~~~~~~~">
+        <location
+            file="/Users/pradeep/Projects/dashx/dashx-js/packages/react-native/android/src/main/AndroidManifest.xml"
+            line="5"
+            column="6"/>
+    </issue>
+
+</issues>

package/android/build/tmp/compileDebugJavaWithJavac/source-classes-mapping.txt

@@ -0,0 +1,2 @@
+com/dashx/rn/sdk/BuildConfig.java
+ com.dashx.rn.sdk.BuildConfig

package/android/build/tmp/compileReleaseJavaWithJavac/source-classes-mapping.txt

@@ -0,0 +1,2 @@
+com/dashx/rn/sdk/BuildConfig.java
+ com.dashx.rn.sdk.BuildConfig

package/android/build.gradle

@@ -90,7 +90,7 @@ repositories {
 }
 
 dependencies {
-  implementation 'com.github.dashxhq:dashx-android:cart-operations-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/java/com/dashx/rn/sdk/DashXClientInterceptor.kt

@@ -14,9 +14,9 @@ class DashXClientInterceptor private constructor() {
     var reactApplicationContext: ReactApplicationContext? = null
     private val dashXNotificationFilter = "DASHX_PN_TYPE"
 
-    fun createDashXClient(reactApplicationContext: ReactApplicationContext, publicKey: String, baseURI: String?, accountType: String?, targetEnvironment: String?, targetInstallation: String?) {
+    fun createDashXClient(reactApplicationContext: ReactApplicationContext, publicKey: String, baseURI: String?, targetEnvironment: String?, targetInstallation: String?) {
         this.reactApplicationContext = reactApplicationContext
-        client = DashX(reactApplicationContext.applicationContext, publicKey!!, baseURI, accountType, targetEnvironment, targetInstallation)
+        client = DashX(reactApplicationContext.applicationContext, publicKey!!, baseURI, targetEnvironment, targetInstallation)
     }
 
     fun getDashXClient(): com.dashx.sdk.DashXClient {

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

@@ -25,7 +25,6 @@ class DashXModule(private val reactContext: ReactApplicationContext) : ReactCont
             reactContext,
             options.getString("publicKey")!!,
             options.getStringIfPresent("baseUri"),
-            options.getStringIfPresent("accountType"),
             options.getStringIfPresent("targetEnvironment"),
             options.getStringIfPresent("targetInstallation")
         )
@@ -56,7 +55,7 @@ class DashXModule(private val reactContext: ReactApplicationContext) : ReactCont
     @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
@@ -186,4 +185,9 @@ class DashXModule(private val reactContext: ReactApplicationContext) : ReactCont
             }
         )
     }
+    
+    @ReactMethod
+    fun subscribe() {
+        interceptor.getDashXClient().subscribe()
+    }
 }

package/ios/API.swift

@@ -49,7 +49,6 @@ public enum DashXGql {
     public var graphQLMap: GraphQLMap
 
     /// - Parameters:
-    ///   - accountType
     ///   - accountUid
     ///   - accountAnonymousUid
     ///   - itemId
@@ -57,17 +56,8 @@ public enum DashXGql {
     ///   - quantity
     ///   - reset
     ///   - custom
-    public init(accountType: Swift.Optional<String?> = nil, accountUid: Swift.Optional<String?> = nil, accountAnonymousUid: Swift.Optional<String?> = nil, itemId: UUID, pricingId: UUID, quantity: Decimal, reset: Bool, custom: Swift.Optional<JSON?> = nil) {
-      graphQLMap = ["accountType": accountType, "accountUid": accountUid, "accountAnonymousUid": accountAnonymousUid, "itemId": itemId, "pricingId": pricingId, "quantity": quantity, "reset": reset, "custom": custom]
-    }
-
-    public var accountType: Swift.Optional<String?> {
-      get {
-        return graphQLMap["accountType"] as? Swift.Optional<String?> ?? Swift.Optional<String?>.none
-      }
-      set {
-        graphQLMap.updateValue(newValue, forKey: "accountType")
-      }
+    public init(accountUid: Swift.Optional<String?> = nil, accountAnonymousUid: Swift.Optional<String?> = nil, itemId: UUID, pricingId: UUID, quantity: Decimal, reset: Bool, custom: Swift.Optional<JSON?> = nil) {
+      graphQLMap = ["accountUid": accountUid, "accountAnonymousUid": accountAnonymousUid, "itemId": itemId, "pricingId": pricingId, "quantity": quantity, "reset": reset, "custom": custom]
     }
 
     public var accountUid: Swift.Optional<String?> {
@@ -267,20 +257,10 @@ public enum DashXGql {
     public var graphQLMap: GraphQLMap
 
     /// - Parameters:
-    ///   - accountType
     ///   - accountUid
     ///   - accountAnonymousUid
-    public init(accountType: Swift.Optional<String?> = nil, accountUid: Swift.Optional<String?> = nil, accountAnonymousUid: Swift.Optional<String?> = nil) {
-      graphQLMap = ["accountType": accountType, "accountUid": accountUid, "accountAnonymousUid": accountAnonymousUid]
-    }
-
-    public var accountType: Swift.Optional<String?> {
-      get {
-        return graphQLMap["accountType"] as? Swift.Optional<String?> ?? Swift.Optional<String?>.none
-      }
-      set {
-        graphQLMap.updateValue(newValue, forKey: "accountType")
-      }
+    public init(accountUid: Swift.Optional<String?> = nil, accountAnonymousUid: Swift.Optional<String?> = nil) {
+      graphQLMap = ["accountUid": accountUid, "accountAnonymousUid": accountAnonymousUid]
     }
 
     public var accountUid: Swift.Optional<String?> {
@@ -385,7 +365,6 @@ public enum DashXGql {
     public var graphQLMap: GraphQLMap
 
     /// - Parameters:
-    ///   - accountType
     ///   - uid
     ///   - anonymousUid
     ///   - email
@@ -393,17 +372,8 @@ public enum DashXGql {
     ///   - name
     ///   - firstName
     ///   - lastName
-    public init(accountType: Swift.Optional<String?> = nil, uid: Swift.Optional<String?> = nil, anonymousUid: Swift.Optional<String?> = nil, email: Swift.Optional<String?> = nil, phone: Swift.Optional<String?> = nil, name: Swift.Optional<String?> = nil, firstName: Swift.Optional<String?> = nil, lastName: Swift.Optional<String?> = nil) {
-      graphQLMap = ["accountType": accountType, "uid": uid, "anonymousUid": anonymousUid, "email": email, "phone": phone, "name": name, "firstName": firstName, "lastName": lastName]
-    }
-
-    public var accountType: Swift.Optional<String?> {
-      get {
-        return graphQLMap["accountType"] as? Swift.Optional<String?> ?? Swift.Optional<String?>.none
-      }
-      set {
-        graphQLMap.updateValue(newValue, forKey: "accountType")
-      }
+    public init(uid: Swift.Optional<String?> = nil, anonymousUid: Swift.Optional<String?> = nil, email: Swift.Optional<String?> = nil, phone: Swift.Optional<String?> = nil, name: Swift.Optional<String?> = nil, firstName: Swift.Optional<String?> = nil, lastName: Swift.Optional<String?> = nil) {
+      graphQLMap = ["uid": uid, "anonymousUid": anonymousUid, "email": email, "phone": phone, "name": name, "firstName": firstName, "lastName": lastName]
     }
 
     public var uid: Swift.Optional<String?> {
@@ -682,22 +652,12 @@ public enum DashXGql {
     public var graphQLMap: GraphQLMap
 
     /// - Parameters:
-    ///   - accountType
     ///   - event
     ///   - accountUid
     ///   - accountAnonymousUid
     ///   - data
-    public init(accountType: String, event: String, accountUid: Swift.Optional<String?> = nil, accountAnonymousUid: Swift.Optional<String?> = nil, data: Swift.Optional<JSON?> = nil) {
-      graphQLMap = ["accountType": accountType, "event": event, "accountUid": accountUid, "accountAnonymousUid": accountAnonymousUid, "data": data]
-    }
-
-    public var accountType: String {
-      get {
-        return graphQLMap["accountType"] as! String
-      }
-      set {
-        graphQLMap.updateValue(newValue, forKey: "accountType")
-      }
+    public init(event: String, accountUid: Swift.Optional<String?> = nil, accountAnonymousUid: Swift.Optional<String?> = nil, data: Swift.Optional<JSON?> = nil) {
+      graphQLMap = ["event": event, "accountUid": accountUid, "accountAnonymousUid": accountAnonymousUid, "data": data]
     }
 
     public var event: String {

package/ios/DashX.swift

@@ -23,10 +23,6 @@ class DashX: RCTEventEmitter {
     func setup(_ options: NSDictionary?) {
         ConfigInterceptor.shared.publicKey = options?.value(forKey: "publicKey") as? String
 
-        if let accountType = options?.value(forKey: "accountType") {
-            dashXClient.setAccountType(to: accountType as! String)
-        }
-
         DashXAppDelegate.swizzleDidReceiveRemoteNotification()
 
         if let baseUri = options?.value(forKey: "baseUri") {

package/ios/DashXClient.swift

@@ -10,7 +10,8 @@ class DashXClient {
     private var anonymousUid: String?
     private var uid: String?
     private var deviceToken: String?
-    private var accountType: String?
+
+    private var mustSubscribe: Bool = false;
 
     private init() {
         generateAnonymousUid()
@@ -18,10 +19,10 @@ class DashXClient {
 
     func setDeviceToken(to: String) {
         self.deviceToken = to
-    }
 
-    func setAccountType(to: String) {
-        self.accountType = to
+        if (self.mustSubscribe) {
+          self.subscribe()
+        }
     }
 
     func setTargetEnvironment(to: String) {
@@ -61,9 +62,10 @@ class DashXClient {
 
         let optionsDictionary = withOptions as? [String: String]
 
+        self.uid = optionsDictionary?["uid"]
+
         let identifyAccountInput = DashXGql.IdentifyAccountInput(
-            accountType: accountType,
-            uid: uid,
+            uid: optionsDictionary?["uid"],
             anonymousUid: anonymousUid,
             email: optionsDictionary?["email"],
             phone: optionsDictionary?["phone"],
@@ -91,13 +93,7 @@ class DashXClient {
     // MARK: -- track
 
     func track(_ event: String, withData: NSDictionary?) {
-        if accountType == nil {
-            DashXLog.d(tag: #function, "AccountType not set skipping track()")
-            return
-        }
-
         let trackEventInput = DashXGql.TrackEventInput(
-            accountType: accountType!,
             event: event,
             accountUid: uid,
             accountAnonymousUid: anonymousUid,
@@ -126,10 +122,13 @@ 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 subscribeContactInput  = DashXGql.SubscribeContactInput(
@@ -247,7 +246,7 @@ class DashXClient {
         _ reject: @escaping RCTPromiseRejectBlock
     ) {
         let addItemToCartInput  = DashXGql.AddItemToCartInput(
-            accountType: self.accountType, accountUid: self.uid, accountAnonymousUid: self.anonymousUid, itemId: itemId, pricingId: pricingId, quantity: quantity, reset: reset, custom: custom as? [String: Any]
+             accountUid: self.uid, accountAnonymousUid: self.anonymousUid, itemId: itemId, pricingId: pricingId, quantity: quantity, reset: reset, custom: custom as? [String: JSONDecodable?]
         )
 
         DashXLog.d(tag: #function, "Calling addItemToCart with \(addItemToCartInput)")
@@ -272,7 +271,7 @@ class DashXClient {
         _ reject: @escaping RCTPromiseRejectBlock
     ) {
         let fetchCartInput  = DashXGql.FetchCartInput(
-            accountType: self.accountType, accountUid: self.uid, accountAnonymousUid: self.anonymousUid
+            accountUid: self.uid, accountAnonymousUid: self.anonymousUid
         )
 
         DashXLog.d(tag: #function, "Calling fetchCart with \(fetchCartInput)")

package/ios/README.md

@@ -0,0 +1,80 @@
+# iOS Native Module
+
+## Development
+
+### Obtaining Graphql schema and generating Graphql operation
+
+- Make sure to install Apollo CLI via npm:
+
+```sh
+$ npm i -g apollo
+```
+
+- In order to generate code, Apollo requires local copy of Graphql schema, to download that:
+
+```sh
+$ apollo schema:download --endpoint="https://api.dashx.com/graphql" schema.json
+```
+
+This will save a `schama.json` file in your ios directory.
+
+- Add Graphql request in `graphql` dir.
+
+- Regenerate `API.swift` using:
+
+```sh
+$ apollo client:codegen --target=swift --namespace=DashXGql --localSchemaFile=schema.json --includes="graphql/*.graphql" --passthroughCustomScalars API.swift
+```
+
+For example, if you want to generate code for `FetchContent`.
+
+- Download schema
+
+```sh
+$ apollo schema:download --endpoint="https://api.dashx.com/graphql" schema.json
+```
+
+- Add request in `graphql` dir with following contents:
+
+```graphql
+query FetchContent($input: FetchContentInput!) {
+  fetchContent(input: $input)
+}
+```
+
+- Re-generate API.swift so it includes the `FetchContent` operation
+
+```sh
+$ apollo client:codegen --target=swift --namespace=DashXGql --localSchemaFile=schema.json --includes="graphql/*.graphql" --passthroughCustomScalars API.swift
+```
+
+- Now you can use FetchContent operation like so:
+
+```swift
+let fetchContentInput  = DashXGql.FetchContentInput( // Note the DashXGql namespace
+    contentType: contentType,
+    content: content,
+    preview: preview,
+    language: language,
+    fields: fields,
+    include: include,
+    exclude: exclude
+)
+
+DashXLog.d(tag: #function, "Calling fetchContent with \(fetchContentInput)")
+
+let fetchContentQuery = DashXGql.FetchContentQuery(input: fetchContentInput)
+
+Network.shared.apollo.fetch(query: fetchContentQuery, cachePolicy: .returnCacheDataElseFetch) { result in
+  switch result {
+  case .success(let graphQLResult):
+    DashXLog.d(tag: #function, "Sent fetchContent with \(String(describing: graphQLResult))")
+    let content = graphQLResult.data?.fetchContent
+    resolve(content)
+  case .failure(let error):
+    DashXLog.d(tag: #function, "Encountered an error during fetchContent(): \(error)")
+    reject("", error.localizedDescription, error)
+  }
+
+```
+

package/ios/schema.json

@@ -906,18 +906,6 @@
         "specifiedByUrl": null,
         "fields": null,
         "inputFields": [
-          {
-            "name": "accountType",
-            "description": null,
-            "type": {
-              "kind": "SCALAR",
-              "name": "String",
-              "ofType": null
-            },
-            "defaultValue": null,
-            "isDeprecated": false,
-            "deprecationReason": null
-          },
           {
             "name": "accountUid",
             "description": null,
@@ -1274,18 +1262,6 @@
         "specifiedByUrl": null,
         "fields": null,
         "inputFields": [
-          {
-            "name": "accountType",
-            "description": null,
-            "type": {
-              "kind": "SCALAR",
-              "name": "String",
-              "ofType": null
-            },
-            "defaultValue": null,
-            "isDeprecated": false,
-            "deprecationReason": null
-          },
           {
             "name": "accountUid",
             "description": null,
@@ -9296,18 +9272,6 @@
         "specifiedByUrl": null,
         "fields": null,
         "inputFields": [
-          {
-            "name": "accountType",
-            "description": null,
-            "type": {
-              "kind": "SCALAR",
-              "name": "String",
-              "ofType": null
-            },
-            "defaultValue": null,
-            "isDeprecated": false,
-            "deprecationReason": null
-          },
           {
             "name": "accountUid",
             "description": null,
@@ -11221,18 +11185,6 @@
         "specifiedByUrl": null,
         "fields": null,
         "inputFields": [
-          {
-            "name": "accountType",
-            "description": null,
-            "type": {
-              "kind": "SCALAR",
-              "name": "String",
-              "ofType": null
-            },
-            "defaultValue": null,
-            "isDeprecated": false,
-            "deprecationReason": null
-          },
           {
             "name": "uid",
             "description": null,
@@ -30464,22 +30416,6 @@
         "specifiedByUrl": null,
         "fields": null,
         "inputFields": [
-          {
-            "name": "accountType",
-            "description": null,
-            "type": {
-              "kind": "NON_NULL",
-              "name": null,
-              "ofType": {
-                "kind": "SCALAR",
-                "name": "String",
-                "ofType": null
-              }
-            },
-            "defaultValue": null,
-            "isDeprecated": false,
-            "deprecationReason": null
-          },
           {
             "name": "event",
             "description": null,
@@ -35645,4 +35581,4 @@
       }
     ]
   }
-}
+}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@dashx/react-native",
   "title": "DashX React Native",
-  "version": "0.1.6",
+  "version": "0.1.10",
   "description": "DashX SDK for React Native",
   "main": "index.js",
   "files": [