@castleio/react-native-castle 1.1.3 → 2.0.0

package/android/build.gradle

@@ -9,7 +9,7 @@ buildscript {
   }
 
   dependencies {
-    classpath 'com.android.tools.build:gradle:7.0.2'
+    classpath 'com.android.tools.build:gradle:7.1.2'
     // noinspection DifferentKotlinGradleVersion
     classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
   }
@@ -125,5 +125,5 @@ dependencies {
   // noinspection GradleDynamicVersion
   api 'com.facebook.react:react-native:+'
   implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
-  api 'io.castle.android:castle:2.1.3'
+  api 'io.castle.android:castle:3.0.0'
 }

package/android/gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

package/android/gradle.properties

@@ -1,4 +1,5 @@
-Castle_kotlinVersion=1.5.10
-Castle_compileSdkVersion=30
-Castle_buildToolsVersion=30.0.2
-Castle_targetSdkVersion=30
+Castle_kotlinVersion=1.6.10
+Castle_compileSdkVersion=31
+Castle_buildToolsVersion=30.0.3
+Castle_targetSdkVersion=31
+android.useAndroidX=true

package/android/src/main/java/com/reactnativecastle/CastleModule.kt

@@ -16,11 +16,6 @@ class CastleModule(reactContext: ReactApplicationContext) : ReactContextBaseJava
       promise.resolve(Castle.requestTokenHeaderName)
     }
 
-    @ReactMethod
-    fun clientIdHeaderName(promise: Promise) {
-      promise.resolve(Castle.clientIdHeaderName)
-    }
-
     @ReactMethod
     fun configure(options: ReadableMap?, promise: Promise) {
       if (options != null) {
@@ -36,15 +31,6 @@ class CastleModule(reactContext: ReactApplicationContext) : ReactContextBaseJava
         if (options.hasKey("flushLimit")) {
             builder.flushLimit(options.getInt("flushLimit"))
         }
-        if (options.hasKey("useCloudflareApp")) {
-            builder.useCloudflareApp(options.getBoolean("useCloudflareApp"))
-        }
-        if (options.hasKey("apiDomain")) {
-            builder.apiDomain(options.getString("apiDomain"))
-        }
-        if (options.hasKey("apiPath")) {
-            builder.apiPath(options.getString("apiPath"))
-        }
         if (options.hasKey("baseURLAllowList")) {
             val array = options.getArray("baseURLAllowList")
             array?.let {
@@ -77,28 +63,23 @@ class CastleModule(reactContext: ReactApplicationContext) : ReactContextBaseJava
     }
 
     @ReactMethod
-    fun identify(identifier: String, traits: ReadableMap) {
-      var traitsMap = mutableMapOf<String, String>()
-      val itr = traits.keySetIterator()
-      while (itr.hasNextKey()) {
-        val key = itr.nextKey()
-        if (traits.getType(key) == ReadableType.String) {
-          val value = traits.getString(key)
-          value?.let { traitsMap.put(key, it) }
-        }
-      }
+    fun userJwt(userJwt: String) {
+      Castle.userJwt(userJwt)
+    }
 
-      Castle.identify(identifier, traitsMap)
+    @ReactMethod
+    fun custom(name: String) {
+      Castle.custom(name)
     }
 
     @ReactMethod
-    fun secure(signature: String) {
-      Castle.secure(signature)
+    fun customWithProperties(name: String, properties: ReadableMap) {
+      Castle.custom(name, properties.toHashMap())
     }
 
     @ReactMethod
-    fun screen(screenName: String) {
-      Castle.screen(screenName)
+    fun screen(name: String) {
+      Castle.screen(name)
     }
 
     @ReactMethod
@@ -116,35 +97,19 @@ class CastleModule(reactContext: ReactApplicationContext) : ReactContextBaseJava
       Castle.reset()
     }
 
-    @ReactMethod
-    fun isWhitelistUrl(url: String, promise: Promise) {
-      promise.resolve(true)
-
-    }
-
     @ReactMethod
     fun baseUrl(promise: Promise) {
       promise.resolve(Castle.baseUrl())
     }
 
-    @ReactMethod
-    fun clientId(promise: Promise) {
-      promise.resolve(Castle.createRequestToken())
-    }
-
     @ReactMethod
     fun createRequestToken(promise: Promise) {
       promise.resolve(Castle.createRequestToken())
     }
 
     @ReactMethod
-    fun userId(promise: Promise) {
-      promise.resolve(Castle.userId())
-    }
-
-    @ReactMethod
-    fun userSignature(promise: Promise) {
-      promise.resolve(Castle.userSignature())
+    fun userJwt(promise: Promise) {
+      promise.resolve(Castle.userJwt())
     }
 
     @ReactMethod

package/ios/RCTCastle.m

@@ -11,16 +11,6 @@ RCT_EXPORT_MODULE()
     return dispatch_get_main_queue();
 }
 
-/**
- Get client id header name
- */
-RCT_EXPORT_METHOD(clientIdHeaderName
-                  :(RCTPromiseResolveBlock)resolver
-                  :(RCTPromiseRejectBlock)rejecter)
-{
-    resolver(CastleClientIdHeaderName);
-}
-
 /**
  Get request token header name
  */
@@ -60,18 +50,6 @@ RCT_EXPORT_METHOD(configure:(nonnull NSDictionary *)options
         configuration.flushLimit = [options[@"flushLimit"] integerValue];
     }
     
-    if (options[@"useCloudflareApp"]) {
-        configuration.useCloudflareApp = [options[@"useCloudflareApp"] boolValue];
-    }
-    
-    if (options[@"apiDomain"]) {
-        configuration.apiDomain = [options[@"apiDomain"] stringValue];
-    }
-    
-    if (options[@"apiPath"]) {
-        configuration.apiPath = [options[@"apiPath"] stringValue];
-    }
-    
     if (options[@"baseURLAllowList"]) {
         configuration.baseURLAllowList = options[@"baseURLAllowList"];
     }
@@ -116,26 +94,34 @@ RCT_EXPORT_METHOD(resetConfiguration
 #pragma mark - Tracking
 
 /**
- Track identify event with specified user identity. User identity will be persisted. A call to identify or reset will clear the stored user identity.
- Provided user traits will be included in the identify event sent to the Castle API.
+ Set user jwt, will be persisted. A call to userJwt or reset will clear the stored user identity.
  
- @param identifier user id
- @param traits user traits
+ @param userJwt user jwt
  */
-RCT_EXPORT_METHOD(identify:(NSString *)identifier traits:(NSDictionary *)traits)
+RCT_EXPORT_METHOD(userJwt:(NSString *)userJwt)
 {
-    [Castle identify:identifier traits:traits];
+    [Castle setUserJwt:userJwt];
 }
 
 /**
- Set user signature and enable secure mode. User signature will be included in all events after it has been set and will be persisted.
- A stored user signature will be removed when the user signature or reset methods are called.
+ Track custom event with a specified name
  
- @param signature User signature (SHA-256 HMAC in hex format)
+ @param name Event name
  */
-RCT_EXPORT_METHOD(secure:(NSString *)signature)
+RCT_EXPORT_METHOD(custom:(NSString *)name)
 {
-    [Castle secure:signature];
+    [Castle customWithName:name];
+}
+
+/**
+ Track custom event with a specified name and properties
+ 
+ @param name Event name
+ @param properties Properties
+ */
+RCT_EXPORT_METHOD(customWithProperties:(NSString *)name properties:(NSDictionary *)properties)
+{
+    [Castle customWithName:name properties:properties];
 }
 
 /**
@@ -145,7 +131,7 @@ RCT_EXPORT_METHOD(secure:(NSString *)signature)
  */
 RCT_EXPORT_METHOD(screen:(NSString *)screenName)
 {
-    [Castle screen:screenName];
+    [Castle screenWithName:screenName];
 }
 
 /**
@@ -189,19 +175,6 @@ RCT_EXPORT_METHOD(baseUrl
 
 #pragma mark - Metadata
 
-/**
- Get client id
-
- @return request token
- */
-RCT_EXPORT_METHOD(clientId
-                  :(RCTPromiseResolveBlock)resolver
-                  :(RCTPromiseRejectBlock)rejecter)
-{
-    NSString *clientId = [Castle createRequestToken];
-    return resolver(clientId);
-}
-
 /**
  Create request token
  
@@ -211,34 +184,8 @@ RCT_EXPORT_METHOD(createRequestToken
                   :(RCTPromiseResolveBlock)resolver
                   :(RCTPromiseRejectBlock)rejecter)
 {
-    NSString *clientId = [Castle createRequestToken];
-    return resolver(clientId);
-}
-
-/**
- Get stored user id from last identify call, returns nil if not set
- 
- @return User Id
- */
-RCT_EXPORT_METHOD(userId
-                  :(RCTPromiseResolveBlock)resolver
-                  :(RCTPromiseRejectBlock)rejecter)
-{
-    NSString *userId = [Castle userId];
-    return resolver(userId);
-}
-
-/**
- Get stored signature from secure call, returns nil if not set
- 
- @return Signature
- */
-RCT_EXPORT_METHOD(userSignature
-                  :(RCTPromiseResolveBlock)resolver
-                  :(RCTPromiseRejectBlock)rejecter)
-{
-    NSString *userSignature = [Castle userSignature];
-    return resolver(userSignature);
+    NSString *token = [Castle createRequestToken];
+    return resolver(token);
 }
 
 /**

package/lib/commonjs/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["index.tsx"],"names":["Castle","NativeModules","Error"],"mappings":";;;;;;;AAAA;;AAwCO,MAAM;AAAEA,EAAAA;AAAF,IAAaC,0BAAnB;;;AAEP,IAAI,CAACD,MAAL,EAAa;AACX,QAAM,IAAIE,KAAJ,CAAU,sCAAV,CAAN;AACD;;eAEcF,M","sourcesContent":["import { NativeModules } from 'react-native';\n\nexport interface Configuration {\n  publishableKey: string;\n  debugLoggingEnabled?: boolean;\n  maxQueueLimit?: number;\n  flushLimit?: number;\n  useCloudflareApp?: boolean;\n  apiDomain?: string;\n  apiPath?: string;\n  baseURLAllowList?: string[];\n}\n\nexport type JsonValue = boolean | number | string | null | JsonList | JsonMap;\nexport interface JsonMap {\n  [key: string]: JsonValue;\n  [index: number]: JsonValue;\n}\nexport interface JsonList extends Array<JsonValue> {}\n\ntype CastleType = {\n  configure(configuration: Configuration): Promise<void>;\n  configureWithPublishableKey(publishableKey: string): Promise<void>;\n  identify(userId: string, traits: JsonMap): Promise<void>;\n  secure(identifier: string): Promise<string>;\n  screen(name: string): Promise<void>;\n  flush(): Promise<void>;\n  flushIfNeeded(url: string): Promise<boolean>;\n  reset(): Promise<void>;\n  baseUrl(): Promise<string>;\n  clientId(): Promise<string>;\n  clientIdHeaderName(): Promise<string>;\n  createRequestToken(): Promise<string>;\n  requestTokenHeaderName(): Promise<string>;\n  userId(): Promise<string>;\n  userSignature(): Promise<string>;\n  userAgent(): Promise<string>;\n  queueSize(): Promise<number>;\n};\n\nexport const { Castle } = NativeModules;\n\nif (!Castle) {\n  throw new Error('Failed to load Castle native module.');\n}\n\nexport default Castle as CastleType;\n"]}
+{"version":3,"sources":["index.tsx"],"names":["Castle","NativeModules","Error"],"mappings":";;;;;;;AAAA;;AAqCO,MAAM;AAAEA,EAAAA;AAAF,IAAaC,0BAAnB;;;AAEP,IAAI,CAACD,MAAL,EAAa;AACX,QAAM,IAAIE,KAAJ,CAAU,sCAAV,CAAN;AACD;;eAEcF,M","sourcesContent":["import { NativeModules } from 'react-native';\n\nexport interface Configuration {\n  publishableKey: string;\n  debugLoggingEnabled?: boolean;\n  maxQueueLimit?: number;\n  flushLimit?: number;\n  useCloudflareApp?: boolean;\n  apiDomain?: string;\n  apiPath?: string;\n  baseURLAllowList?: string[];\n}\n\nexport type JsonValue = boolean | number | string | null | JsonList | JsonMap;\nexport interface JsonMap {\n  [key: string]: JsonValue;\n  [index: number]: JsonValue;\n}\nexport interface JsonList extends Array<JsonValue> {}\n\ntype CastleType = {\n  configure(configuration: Configuration): Promise<void>;\n  configureWithPublishableKey(publishableKey: string): Promise<void>;\n  userJwt(userJwt: string): Promise<void>;\n  screen(name: string): Promise<void>;\n  custom(name: string): Promise<void>;\n  customWithProperties(name: string, properties: JsonMap): Promise<void>;\n  flush(): Promise<void>;\n  flushIfNeeded(url: string): Promise<boolean>;\n  reset(): Promise<void>;\n  baseUrl(): Promise<string>;\n  createRequestToken(): Promise<string>;\n  requestTokenHeaderName(): Promise<string>;\n  userAgent(): Promise<string>;\n  queueSize(): Promise<number>;\n};\n\nexport const { Castle } = NativeModules;\n\nif (!Castle) {\n  throw new Error('Failed to load Castle native module.');\n}\n\nexport default Castle as CastleType;\n"]}

package/lib/module/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["index.tsx"],"names":["NativeModules","Castle","Error"],"mappings":"AAAA,SAASA,aAAT,QAA8B,cAA9B;AAwCA,OAAO,MAAM;AAAEC,EAAAA;AAAF,IAAaD,aAAnB;;AAEP,IAAI,CAACC,MAAL,EAAa;AACX,QAAM,IAAIC,KAAJ,CAAU,sCAAV,CAAN;AACD;;AAED,eAAeD,MAAf","sourcesContent":["import { NativeModules } from 'react-native';\n\nexport interface Configuration {\n  publishableKey: string;\n  debugLoggingEnabled?: boolean;\n  maxQueueLimit?: number;\n  flushLimit?: number;\n  useCloudflareApp?: boolean;\n  apiDomain?: string;\n  apiPath?: string;\n  baseURLAllowList?: string[];\n}\n\nexport type JsonValue = boolean | number | string | null | JsonList | JsonMap;\nexport interface JsonMap {\n  [key: string]: JsonValue;\n  [index: number]: JsonValue;\n}\nexport interface JsonList extends Array<JsonValue> {}\n\ntype CastleType = {\n  configure(configuration: Configuration): Promise<void>;\n  configureWithPublishableKey(publishableKey: string): Promise<void>;\n  identify(userId: string, traits: JsonMap): Promise<void>;\n  secure(identifier: string): Promise<string>;\n  screen(name: string): Promise<void>;\n  flush(): Promise<void>;\n  flushIfNeeded(url: string): Promise<boolean>;\n  reset(): Promise<void>;\n  baseUrl(): Promise<string>;\n  clientId(): Promise<string>;\n  clientIdHeaderName(): Promise<string>;\n  createRequestToken(): Promise<string>;\n  requestTokenHeaderName(): Promise<string>;\n  userId(): Promise<string>;\n  userSignature(): Promise<string>;\n  userAgent(): Promise<string>;\n  queueSize(): Promise<number>;\n};\n\nexport const { Castle } = NativeModules;\n\nif (!Castle) {\n  throw new Error('Failed to load Castle native module.');\n}\n\nexport default Castle as CastleType;\n"]}
+{"version":3,"sources":["index.tsx"],"names":["NativeModules","Castle","Error"],"mappings":"AAAA,SAASA,aAAT,QAA8B,cAA9B;AAqCA,OAAO,MAAM;AAAEC,EAAAA;AAAF,IAAaD,aAAnB;;AAEP,IAAI,CAACC,MAAL,EAAa;AACX,QAAM,IAAIC,KAAJ,CAAU,sCAAV,CAAN;AACD;;AAED,eAAeD,MAAf","sourcesContent":["import { NativeModules } from 'react-native';\n\nexport interface Configuration {\n  publishableKey: string;\n  debugLoggingEnabled?: boolean;\n  maxQueueLimit?: number;\n  flushLimit?: number;\n  useCloudflareApp?: boolean;\n  apiDomain?: string;\n  apiPath?: string;\n  baseURLAllowList?: string[];\n}\n\nexport type JsonValue = boolean | number | string | null | JsonList | JsonMap;\nexport interface JsonMap {\n  [key: string]: JsonValue;\n  [index: number]: JsonValue;\n}\nexport interface JsonList extends Array<JsonValue> {}\n\ntype CastleType = {\n  configure(configuration: Configuration): Promise<void>;\n  configureWithPublishableKey(publishableKey: string): Promise<void>;\n  userJwt(userJwt: string): Promise<void>;\n  screen(name: string): Promise<void>;\n  custom(name: string): Promise<void>;\n  customWithProperties(name: string, properties: JsonMap): Promise<void>;\n  flush(): Promise<void>;\n  flushIfNeeded(url: string): Promise<boolean>;\n  reset(): Promise<void>;\n  baseUrl(): Promise<string>;\n  createRequestToken(): Promise<string>;\n  requestTokenHeaderName(): Promise<string>;\n  userAgent(): Promise<string>;\n  queueSize(): Promise<number>;\n};\n\nexport const { Castle } = NativeModules;\n\nif (!Castle) {\n  throw new Error('Failed to load Castle native module.');\n}\n\nexport default Castle as CastleType;\n"]}

package/lib/typescript/index.d.ts

@@ -18,19 +18,16 @@ export interface JsonList extends Array<JsonValue> {
 declare type CastleType = {
     configure(configuration: Configuration): Promise<void>;
     configureWithPublishableKey(publishableKey: string): Promise<void>;
-    identify(userId: string, traits: JsonMap): Promise<void>;
-    secure(identifier: string): Promise<string>;
+    userJwt(userJwt: string): Promise<void>;
     screen(name: string): Promise<void>;
+    custom(name: string): Promise<void>;
+    customWithProperties(name: string, properties: JsonMap): Promise<void>;
     flush(): Promise<void>;
     flushIfNeeded(url: string): Promise<boolean>;
     reset(): Promise<void>;
     baseUrl(): Promise<string>;
-    clientId(): Promise<string>;
-    clientIdHeaderName(): Promise<string>;
     createRequestToken(): Promise<string>;
     requestTokenHeaderName(): Promise<string>;
-    userId(): Promise<string>;
-    userSignature(): Promise<string>;
     userAgent(): Promise<string>;
     queueSize(): Promise<number>;
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@castleio/react-native-castle",
-  "version": "1.1.3",
+  "version": "2.0.0",
   "description": "Castle SDK for React Native",
   "main": "lib/commonjs/index",
   "module": "lib/module/index",

package/react-native-castle.podspec

@@ -16,5 +16,5 @@ Pod::Spec.new do |s|
   s.source_files = "ios/**/*.{h,m,mm,swift}"
 
   s.dependency "React-Core"
-  s.dependency "Castle", "2.1.6"
+  s.dependency "Castle", "3.0.1"
 end

package/src/index.tsx

@@ -21,19 +21,16 @@ export interface JsonList extends Array<JsonValue> {}
 type CastleType = {
   configure(configuration: Configuration): Promise<void>;
   configureWithPublishableKey(publishableKey: string): Promise<void>;
-  identify(userId: string, traits: JsonMap): Promise<void>;
-  secure(identifier: string): Promise<string>;
+  userJwt(userJwt: string): Promise<void>;
   screen(name: string): Promise<void>;
+  custom(name: string): Promise<void>;
+  customWithProperties(name: string, properties: JsonMap): Promise<void>;
   flush(): Promise<void>;
   flushIfNeeded(url: string): Promise<boolean>;
   reset(): Promise<void>;
   baseUrl(): Promise<string>;
-  clientId(): Promise<string>;
-  clientIdHeaderName(): Promise<string>;
   createRequestToken(): Promise<string>;
   requestTokenHeaderName(): Promise<string>;
-  userId(): Promise<string>;
-  userSignature(): Promise<string>;
   userAgent(): Promise<string>;
   queueSize(): Promise<number>;
 };