react-native-smallcase-gateway 1.4.0 → 1.5.0

package/CHANGELOG.md

@@ -2,6 +2,33 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+## [1.5.0](https://github.com/smallcase/react-native-smallcase-gateway/compare/v1.4.2...v1.5.0) (2022-08-01)
+
+
+### Features
+
+* added error data for transactional errors ([e50e977](https://github.com/smallcase/react-native-smallcase-gateway/commit/e50e977dda6c15f4ed3c4e40932f851e7a3bebce))
+* added signup key for all transactional intents ([6f00f57](https://github.com/smallcase/react-native-smallcase-gateway/commit/6f00f57cf2f24f6896019ca17f7603508477161d))
+
+
+### Bug Fixes
+
+* added `data` in DataListener error callback ([0481520](https://github.com/smallcase/react-native-smallcase-gateway/commit/0481520ace7730d137400808b05b037787d73296))
+* build fails on gradle 7 ([28f79fd](https://github.com/smallcase/react-native-smallcase-gateway/commit/28f79fd53dd2400412f7286442f7b6031287c063))
+* data not appended in init and show orders ([07a2a61](https://github.com/smallcase/react-native-smallcase-gateway/commit/07a2a61dd2add4a3cf7b7e4d59a70bb6c750c0bc))
+* error data not being returned for intent_not_enabled_for_broker 3000 error ([53b4bfd](https://github.com/smallcase/react-native-smallcase-gateway/commit/53b4bfd52c7dee4aed647e04493e4d1e23402406))
+* http for artifactory url ([b7934dc](https://github.com/smallcase/react-native-smallcase-gateway/commit/b7934dc28353508f36aa9ec23d1ebac36d74bf29))
+* unsafe params on launchSmallplug ([a6752cb](https://github.com/smallcase/react-native-smallcase-gateway/commit/a6752cb9d41eb0f55c997fa1712a26c0e72d7472))
+
+### [1.4.2](https://github.com/smallcase/react-native-smallcase-gateway/compare/v1.4.0...v1.4.2) (2022-07-21)
+
+
+### Bug Fixes
+
+* version not null ([479109d](https://github.com/smallcase/react-native-smallcase-gateway/commit/479109d9d491a853f1d09744fe2f36fffb1409dc))
+
+### [1.4.1](https://github.com/smallcase/react-native-smallcase-gateway/compare/v1.4.0...v1.4.1) (2022-06-27)
+
 ## [1.4.0](https://github.com/smallcase/react-native-smallcase-gateway/compare/v1.3.3...v1.4.0) (2022-06-23)
 
 

package/android/build.gradle

@@ -10,7 +10,7 @@ def safeExtGet(prop, fallback) {
 def kotlin_version = safeExtGet('kotlinVersion', '1.3.71')
 
 apply plugin: 'com.android.library'
-apply plugin: 'maven'
+
 
 buildscript {
     // Buildscript is evaluated before everything else so we can't use getExtOrDefault
@@ -39,7 +39,6 @@ buildscript {
 }
 
 apply plugin: 'com.android.library'
-apply plugin: 'maven'
 apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-android-extensions'
 
@@ -61,7 +60,7 @@ repositories {
     // ref: https://www.baeldung.com/maven-local-repository
     mavenLocal()
     maven {
-        url "http://artifactory.smallcase.com/artifactory/gradle-dev-local"
+        url "https://artifactory.smallcase.com/artifactory/gradle-dev-local"
         credentials {
             username "react_native_user"
             password "reactNativeUser123"
@@ -82,80 +81,7 @@ repositories {
 dependencies {
     //noinspection GradleDynamicVersion
     implementation 'com.facebook.react:react-native:+'  // From node_modules
-    implementation 'com.smallcase.gateway:sdk:3.4.0'
+    implementation 'com.smallcase.gateway:sdk:3.5.2'
     implementation "androidx.core:core-ktx:1.3.1"
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
 }
-
-def configureReactNativePom(def pom) {
-    def packageJson = new groovy.json.JsonSlurper().parseText(file('../package.json').text)
-
-    pom.project {
-        name packageJson.title
-        artifactId packageJson.name
-        version = packageJson.version
-        group = "com.smallcase.gateway.reactnative"
-        description packageJson.description
-        url packageJson.repository.baseUrl
-
-        licenses {
-            license {
-                name packageJson.license
-                url packageJson.repository.baseUrl + '/blob/master/' + packageJson.licenseFilename
-                distribution 'repo'
-            }
-        }
-
-        developers {
-            developer {
-                id packageJson.author.username
-                name packageJson.author.name
-            }
-        }
-    }
-}
-
-afterEvaluate { project ->
-    // some Gradle build hooks ref:
-    // https://www.oreilly.com/library/view/gradle-beyond-the/9781449373801/ch03.html
-    task androidJavadoc(type: Javadoc) {
-        source = android.sourceSets.main.java.srcDirs
-        classpath += files(android.bootClasspath)
-        classpath += files(project.getConfigurations().getByName('compile').asList())
-        include '**/*.java'
-    }
-
-    task androidJavadocJar(type: Jar, dependsOn: androidJavadoc) {
-        classifier = 'javadoc'
-        from androidJavadoc.destinationDir
-    }
-
-    task androidSourcesJar(type: Jar) {
-        classifier = 'sources'
-        from android.sourceSets.main.java.srcDirs
-        include '**/*.java'
-    }
-
-    android.libraryVariants.all { variant ->
-        def name = variant.name.capitalize()
-        def javaCompileTask = variant.javaCompileProvider.get()
-
-        task "jar${name}"(type: Jar, dependsOn: javaCompileTask) {
-            from javaCompileTask.destinationDir
-        }
-    }
-
-    artifacts {
-        archives androidSourcesJar
-        archives androidJavadocJar
-    }
-
-    task installArchives(type: Upload) {
-        configuration = configurations.archives
-        repositories.mavenDeployer {
-            // Deploy to react-native-event-bridge/maven, ready to publish to npm
-            repository url: "file://${projectDir}/../android/maven"
-            configureReactNativePom pom
-        }
-    }
-}

package/android/src/main/java/com/smallcase/gateway/reactnative/SmallcaseGatewayModule.kt

@@ -72,8 +72,8 @@ class SmallcaseGatewayModule(reactContext: ReactApplicationContext?) : ReactCont
 
         val initReq = InitRequest(sdkToken)
         SmallcaseGatewaySdk.init(authRequest = initReq, gatewayInitialisationListener = object : DataListener<InitialisationResponse> {
-            override fun onFailure(errorCode: Int, errorMessage: String) {
-                val err = createErrorJSON(errorCode, errorMessage, null)
+            override fun onFailure(errorCode: Int, errorMessage: String, data: String?) {
+                val err = createErrorJSON(errorCode, errorMessage, data)
                 promise.reject("error", err)
             }
 
@@ -127,8 +127,8 @@ class SmallcaseGatewayModule(reactContext: ReactApplicationContext?) : ReactCont
                     promise.resolve(true)
                 }
 
-                override fun onFailure(errorCode: Int, errorMessage: String) {
-                    val err = createErrorJSON(errorCode, errorMessage, null)
+                override fun onFailure(errorCode: Int, errorMessage: String, data: String?) {
+                    val err = createErrorJSON(errorCode, errorMessage, data)
                     promise.reject("error", err)
                 }
             })
@@ -208,7 +208,7 @@ class SmallcaseGatewayModule(reactContext: ReactApplicationContext?) : ReactCont
                 promise.resolve(response)
             }
 
-            override fun onFailure(errorCode: Int, errorMessage: String) {
+            override fun onFailure(errorCode: Int, errorMessage: String, data: String?) {
                 val err = createErrorJSON(errorCode, errorMessage, null)
                 promise.reject("error", err)
             }

package/ios/SmallcaseGateway.m

@@ -8,6 +8,7 @@
 
 RCT_EXPORT_MODULE()
 
+//MARK: SDK version helpers
 RCT_REMAP_METHOD(setHybridSdkVersion, sdkVersion: (NSString *)sdkVersion) {
     [SCGateway.shared setSDKTypeWithType:@"react-native"];
     [SCGateway.shared setHybridSDKVersionWithVersion:sdkVersion];
@@ -26,6 +27,7 @@ RCT_REMAP_METHOD(getSdkVersion,
     resolve(result);
 }
 
+//MARK: SDK setup
 RCT_REMAP_METHOD(setConfigEnvironment,
                  envName:(NSString *)envName
                  gateway:(NSString *)gateway
@@ -33,8 +35,7 @@ RCT_REMAP_METHOD(setConfigEnvironment,
                  isAmoEnabled: (BOOL *)isAmoEnabled
                  preProvidedBrokers: (NSArray *)preProvidedBrokers
                  setConfigEnvironmentWithResolver:(RCTPromiseResolveBlock)resolve
-                 rejecter:(RCTPromiseRejectBlock)reject)
-{
+                 rejecter:(RCTPromiseRejectBlock)reject) {
     NSInteger environment = EnvironmentProduction;
 
     if([envName isEqualToString:@"production"]) {
@@ -53,10 +54,8 @@ RCT_REMAP_METHOD(setConfigEnvironment,
                              isLeprechaunActive:isLeprechaunActive
                              isAmoEnabled:isAmoEnabled];
 
-    [SCGateway.shared setupWithConfig: config completion:^(BOOL success,NSError * error)
-     {
-        if(success)
-        {
+    [SCGateway.shared setupWithConfig: config completion:^(BOOL success,NSError * error) {
+        if(success) {
             resolve(@(YES));
         } else {
             NSMutableDictionary *responseDict = [[NSMutableDictionary alloc] init];
@@ -67,20 +66,20 @@ RCT_REMAP_METHOD(setConfigEnvironment,
 
             reject(@"setConfigEnvironment", @"Env setup failed", err);
         }
+        
     }];
 }
 
+//MARK: SDK init
 RCT_REMAP_METHOD(init,
                  sdkToken:(NSString *)sdkToken
                  initWithResolver:(RCTPromiseResolveBlock)resolve
-                 rejecter:(RCTPromiseRejectBlock)reject)
-{
+                 rejecter:(RCTPromiseRejectBlock)reject) {
     [SCGateway.shared initializeGatewayWithSdkToken:sdkToken completion:^(BOOL success, NSError * error) {
-        if(success){
+        if(success) {
             resolve(@(YES));
         } else {
-            if(error != nil)
-            {
+            if(error != nil) {
                 NSMutableDictionary *responseDict = [[NSMutableDictionary alloc] init];
                 [responseDict setValue:[NSNumber numberWithInteger:error.code]  forKey:@"errorCode"];
                 [responseDict setValue:error.domain  forKey:@"errorMessage"];
@@ -95,13 +94,13 @@ RCT_REMAP_METHOD(init,
     }];
 }
 
+//MARK: Trigger Transaction
 RCT_REMAP_METHOD(triggerTransaction,
                  transactionId:(NSString *)transactionId
                  utmParams:(NSDictionary *)utmParams
                  brokerList:(NSArray *)brokerList
                  triggerTransactionWithResolver:(RCTPromiseResolveBlock)resolve
-                 rejecter:(RCTPromiseRejectBlock)reject)
-{
+                 rejecter:(RCTPromiseRejectBlock)reject) {
     dispatch_async(dispatch_get_main_queue(), ^(void) {
         [SCGateway.shared
          triggerTransactionFlowWithTransactionId:transactionId
@@ -113,6 +112,7 @@ RCT_REMAP_METHOD(triggerTransaction,
                 NSMutableDictionary *responseDict = [[NSMutableDictionary alloc] init];
                 [responseDict setValue:[NSNumber numberWithInteger:error.code]  forKey:@"errorCode"];
                 [responseDict setValue:error.domain  forKey:@"errorMessage"];
+                [responseDict setValue:[error.userInfo objectForKey: @"data"] forKey:@"data"];
 
                 NSError *err = [[NSError alloc] initWithDomain:error.domain code:error.code userInfo:responseDict];
 
@@ -123,7 +123,7 @@ RCT_REMAP_METHOD(triggerTransaction,
             NSMutableDictionary *responseDict =  [[NSMutableDictionary alloc] init];
             [responseDict setValue:[NSNumber numberWithBool:true] forKey:@"success"];
 
-            // intent - transaction
+            //MARK: intent - transaction
             if ([response isKindOfClass: [ObjcTransactionIntentTransaction class]]) {
                 ObjcTransactionIntentTransaction *trxResponse = response;
                 [responseDict setObject:@"TRANSACTION"  forKey:@"transaction"];
@@ -136,7 +136,7 @@ RCT_REMAP_METHOD(triggerTransaction,
                 return;
             }
 
-            // intent - connect
+            //MARK: intent - connect
             if([response isKindOfClass: [ObjCTransactionIntentConnect class]]) {
                 ObjCTransactionIntentConnect *trxResponse = response;
                 [responseDict setValue:@"CONNECT"  forKey:@"transaction"];
@@ -149,7 +149,7 @@ RCT_REMAP_METHOD(triggerTransaction,
                 return;
             }
 
-            // intent - holdings import
+            //MARK: intent - holdings import
             if([response isKindOfClass: [ObjcTransactionIntentHoldingsImport class]]) {
                 ObjcTransactionIntentHoldingsImport *trxResponse = response;
                 [responseDict setValue:@"HOLDING_IMPORT"  forKey:@"transaction"];
@@ -158,13 +158,14 @@ RCT_REMAP_METHOD(triggerTransaction,
                 [dict setValue: trxResponse.authToken  forKey:@"smallcaseAuthToken"];
                 [dict setValue: trxResponse.transactionId forKey:@"transactionId"];
                 [dict setValue: trxResponse.broker forKey:@"broker"];
+                [dict setValue: trxResponse.signup forKey:@"signup"];
 
                 [responseDict setValue:dict forKey:@"data"];
                 resolve(responseDict);
                 return;
             }
 
-            // intent - fetch funds
+            //MARK: intent - fetch funds
             if([response isKindOfClass: [ObjcTransactionIntentFetchFunds class]]) {
                 ObjcTransactionIntentFetchFunds *trxResponse = response;
                 [responseDict setValue:@"FETCH_FUNDS"  forKey:@"transaction"];
@@ -172,7 +173,8 @@ RCT_REMAP_METHOD(triggerTransaction,
                 NSMutableDictionary *dict = [[NSMutableDictionary alloc] init];
                 [dict setValue: trxResponse.authToken  forKey:@"smallcaseAuthToken"];
                 [dict setValue: trxResponse.transactionId forKey:@"transactionId"];
-
+                [dict setValue: trxResponse.signup forKey:@"signup"];
+                
                 [dict setValue:[NSNumber numberWithDouble:trxResponse.fund] forKey:@"fund"];
 
                 [responseDict setValue:dict forKey:@"data"];
@@ -180,7 +182,7 @@ RCT_REMAP_METHOD(triggerTransaction,
                 return;
             }
 
-            // intent - sip setup
+            //MARK: intent - sip setup
             if([response isKindOfClass: [ObjcTransactionIntentSipSetup class]]) {
                 ObjcTransactionIntentSipSetup *trxResponse = response;
                 [responseDict setValue:@"SIP_SETUP"  forKey:@"transaction"];
@@ -196,6 +198,7 @@ RCT_REMAP_METHOD(triggerTransaction,
                 [dict setValue: trxResponse.scid forKey:@"scid"];
                 [dict setValue: trxResponse.sipActive ? @"YES" : @"NO" forKey:@"sipActive"];
                 [dict setValue: [NSNumber numberWithDouble: trxResponse.sipAmount] forKey:@"sipAmount"];
+                [dict setValue: trxResponse.signup forKey:@"signup"];
 
                 [responseDict setValue:dict forKey:@"data"];
                 resolve(responseDict);
@@ -203,7 +206,7 @@ RCT_REMAP_METHOD(triggerTransaction,
             }
 
 
-            // intent - authorize holdings
+            //MARK: intent - authorize holdings
             if([response isKindOfClass: [ObjcTransactionIntentAuthoriseHoldings class]]) {
                 ObjcTransactionIntentAuthoriseHoldings *trxResponse = response;
                 [responseDict setValue:@"AUTHORISE_HOLDINGS"  forKey:@"transaction"];
@@ -211,7 +214,8 @@ RCT_REMAP_METHOD(triggerTransaction,
                 NSMutableDictionary *dict = [[NSMutableDictionary alloc] init];
                 [dict setValue: trxResponse.authToken  forKey:@"smallcaseAuthToken"];
                 [dict setValue: trxResponse.transactionId forKey:@"transactionId"];
-
+                [dict setValue: trxResponse.signup forKey:@"signup"];
+                
                 [dict setValue: [NSNumber numberWithBool:trxResponse.status] forKey:@"status"];
 
                 [responseDict setValue:dict forKey:@"data"];
@@ -226,10 +230,10 @@ RCT_REMAP_METHOD(triggerTransaction,
     });
 }
 
+//MARK: Show orders
 RCT_REMAP_METHOD(showOrders,
                  showOrdersWithResolver: (RCTPromiseResolveBlock)resolve
-                 rejecter:(RCTPromiseRejectBlock)reject)
-{
+                 rejecter:(RCTPromiseRejectBlock)reject) {
     dispatch_async(dispatch_get_main_queue(), ^(void) {
         
         NSMutableDictionary *responseDict = [[NSMutableDictionary alloc] init];
@@ -243,18 +247,19 @@ RCT_REMAP_METHOD(showOrders,
             } else {
                 [responseDict setValue:[NSNumber numberWithInteger:error.code]  forKey:@"errorCode"];
                 [responseDict setValue:error.domain  forKey:@"error"];
+                [responseDict setValue:[error.userInfo objectForKey: @"data"] forKey:@"data"];
                 resolve(responseDict);
             }
         }];
     });
 }
 
+//MARK: smallplug
 RCT_REMAP_METHOD(launchSmallplug,
                   targetEndpoint:(NSString *)targetEndpoint
                   params:(NSString *)params
                   launchSmallplugWithResolver:(RCTPromiseResolveBlock)resolve
-                 rejecter:(RCTPromiseRejectBlock)reject)
-{
+                 rejecter:(RCTPromiseRejectBlock)reject) {
     dispatch_async(dispatch_get_main_queue(), ^(void) {
        
         SmallplugData *smallplugData = [[SmallplugData alloc] init:targetEndpoint :params];
@@ -299,6 +304,7 @@ RCT_REMAP_METHOD(launchSmallplug,
     });
 }
 
+//MARK: smallplug with branding
 RCT_REMAP_METHOD(launchSmallplugWithBranding,
                  targetEndpoint:(NSString *)targetEndpoint
                  params:(NSString *)params
@@ -354,11 +360,11 @@ RCT_REMAP_METHOD(launchSmallplugWithBranding,
     });
 }
 
+//MARK: Archive smallcase
 RCT_REMAP_METHOD(archiveSmallcase,
                  iscid:(NSString *)iscid
                  initWithResolver:(RCTPromiseResolveBlock)resolve
-                 rejecter:(RCTPromiseRejectBlock)reject)
-{
+                 rejecter:(RCTPromiseRejectBlock)reject) {
     [SCGateway.shared markSmallcaseArchiveWithIscid:iscid completion: ^(id response, NSError * error) {
         if(error != nil) {
             NSMutableDictionary *responseDict = [[NSMutableDictionary alloc] init];
@@ -382,11 +388,11 @@ RCT_REMAP_METHOD(archiveSmallcase,
     }];
 }
 
+//MARK: Lead Gen
 RCT_REMAP_METHOD(triggerLeadGenWithStatus,
                  userParams: (NSDictionary *)userParams
                  leadGenGenWithResolver: (RCTPromiseResolveBlock)resolve
-                 rejecter:(RCTPromiseRejectBlock)reject)
-{
+                 rejecter:(RCTPromiseRejectBlock)reject) {
     dispatch_async(dispatch_get_main_queue(), ^(void) {
         
         [SCGateway.shared triggerLeadGenWithPresentingController:[[[UIApplication sharedApplication] keyWindow] rootViewController] params:userParams
@@ -398,17 +404,16 @@ RCT_REMAP_METHOD(triggerLeadGenWithStatus,
     });
 }
 
-RCT_EXPORT_METHOD(triggerLeadGen: (NSDictionary *)userParams utmParams:(NSDictionary *)utmParams)
-{
+RCT_EXPORT_METHOD(triggerLeadGen: (NSDictionary *)userParams utmParams:(NSDictionary *)utmParams) {
     dispatch_async(dispatch_get_main_queue(), ^(void) {
         [SCGateway.shared triggerLeadGenWithPresentingController:[[[UIApplication sharedApplication] keyWindow] rootViewController] params:userParams utmParams: utmParams];
     });
 }
 
+//MARK: User logout
 RCT_REMAP_METHOD(logoutUser,
                  logoutUserWithResolver:(RCTPromiseResolveBlock)resolve
-                 rejecter:(RCTPromiseRejectBlock)reject)
-{
+                 rejecter:(RCTPromiseRejectBlock)reject) {
     dispatch_async(dispatch_get_main_queue(), ^(void) {
         [SCGateway.shared
             logoutUserWithPresentingController:[[[UIApplication sharedApplication] keyWindow] rootViewController]

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "react-native-smallcase-gateway",
   "title": "React Native Smallcase Gateway",
-  "version": "1.4.0",
+  "version": "1.5.0",
   "description": "smallcase gateway bindings for react native",
   "main": "index.js",
   "files": [

package/react-native-smallcase-gateway.podspec

@@ -23,7 +23,6 @@ Pod::Spec.new do |s|
   s.requires_arc = true
 
   s.dependency "React-Core"
-  s.dependency 'SCGateway', '3.4.3'
-  s.dependency "Mixpanel-swift"
+  s.dependency 'SCGateway', '3.5.2'
 end
 

package/src/SmallcaseGateway.js

@@ -110,13 +110,13 @@ const triggerTransaction = async (transactionId, utmParams, brokerList) => {
  * @param {string} targetEndpoint
  * @param {string} params
  */
-const launchSmallplug = async (targetEndpoint, params) => {
-  const safeEndpoint = safeObject(targetEndpoint);
-  const safeParams = safeObject(params);
+ const launchSmallplug = async (targetEndpoint, params) => {
+  const safeEndpoint = typeof targetEndpoint === "string" ? targetEndpoint : ""
+  const safeParams = typeof params === "string" ? params : ""
 
   return SmallcaseGatewayNative.launchSmallplug(
-    targetEndpoint,
-    params
+    safeEndpoint,
+    safeParams
   );
 
 }