react-native-smallcase-gateway 1.0.1 → 1.2.0

package/CHANGELOG.md

@@ -2,6 +2,27 @@
 
 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.2.0](https://github.com/smallcase/react-native-smallcase-gateway/compare/v1.1.0...v1.2.0) (2022-05-17)
+
+
+### Features
+
+* show orders ([5ea8109](https://github.com/smallcase/react-native-smallcase-gateway/commit/5ea8109911ddd1f38dc666fb6815f10112bcce74))
+
+## [1.1.0](https://github.com/smallcase/react-native-smallcase-gateway/compare/v1.0.2...v1.1.0) (2022-04-07)
+
+
+### Bug Fixes
+
+* transaction error response in onSuccess callback ([6d36aeb](https://github.com/smallcase/react-native-smallcase-gateway/commit/6d36aebc0af379d7d7782baa7e59bc3092654d76))
+
+### [1.0.2](https://github.com/smallcase/react-native-smallcase-gateway/compare/v1.0.0...v1.0.2) (2022-04-04)
+
+
+### Features
+
+* log SDK version with transactionId ([8b833b3](https://github.com/smallcase/react-native-smallcase-gateway/commit/8b833b366c0b8f9a030f920134d82c0f84fa6c7f))
+
 ### [1.0.1](https://github.com/smallcase/react-native-smallcase-gateway/compare/v1.0.0...v1.0.1) (2022-03-15)
 
 ## [1.0.0](https://github.com/smallcase/react-native-smallcase-gateway/compare/v0.10.0...v1.0.0) (2022-01-21)

package/android/build.gradle

@@ -82,7 +82,7 @@ repositories {
 dependencies {
     //noinspection GradleDynamicVersion
     implementation 'com.facebook.react:react-native:+'  // From node_modules
-    implementation 'com.smallcase.gateway:sdk:3.1.13'
+    implementation 'com.smallcase.gateway:sdk:3.2.0'
     implementation "androidx.core:core-ktx:1.3.1"
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
 }

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

@@ -13,6 +13,7 @@ import com.smallcase.gateway.data.listeners.TransactionResponseListener
 import com.smallcase.gateway.data.models.*
 import com.smallcase.gateway.data.requests.InitRequest
 import com.smallcase.gateway.portal.SmallcaseGatewaySdk
+import com.smallcase.gateway.data.listeners.LeadGenResponseListener
 
 
 class SmallcaseGatewayModule(reactContext: ReactApplicationContext?) : ReactContextBaseJavaModule(reactContext!!) {
@@ -32,7 +33,6 @@ class SmallcaseGatewayModule(reactContext: ReactApplicationContext?) : ReactCont
             isAmoEnabled: Boolean,
             preProvidedBrokers: ReadableArray,
             promise: Promise) {
-        Log.d(TAG, "setConfigEnvironment: start")
 
         try {
             val brokerList = ArrayList<String>()
@@ -69,6 +69,18 @@ class SmallcaseGatewayModule(reactContext: ReactApplicationContext?) : ReactCont
         }
     }
 
+    @ReactMethod
+    fun setHybridSdkVersion(sdkVersion: String) {
+        SmallcaseGatewaySdk.setSDKType("react-native")
+        SmallcaseGatewaySdk.setHybridSDKVersion(sdkVersion)
+    }
+
+    @ReactMethod
+    fun getSdkVersion(reactNativeSdkVersion: String, promise: Promise) {
+        val sdkString = "android:${SmallcaseGatewaySdk.getSdkVersion()},react-native:$reactNativeSdkVersion"
+        promise.resolve(sdkString)
+    }
+
     @ReactMethod
     fun init(sdkToken: String, promise: Promise) {
         Log.d(TAG, "init: start")
@@ -78,7 +90,7 @@ class SmallcaseGatewayModule(reactContext: ReactApplicationContext?) : ReactCont
                 authRequest = initReq,
                 gatewayInitialisationListener = object : DataListener<InitialisationResponse> {
                     override fun onFailure(errorCode: Int, errorMessage: String) {
-                        val err = createErrorJSON(errorCode, errorMessage)
+                        val err = createErrorJSON(errorCode, errorMessage, null)
                         promise.reject("error", err)
                     }
 
@@ -110,21 +122,15 @@ class SmallcaseGatewayModule(reactContext: ReactApplicationContext?) : ReactCont
                     preProvidedBrokers = safeBrokerList,
                     transactionResponseListener = object : TransactionResponseListener {
                         override fun onSuccess(transactionResult: TransactionResult) {
-                            if (transactionResult.success) {
-                                val res = resultToWritableMap(transactionResult)
-                                promise.resolve(res)
-                            } else {
-                                val err = createErrorJSON(
-                                        transactionResult.errorCode,
-                                        transactionResult.error
-                                )
-                                promise.reject("error", err)
-                            }
+
+                            val res = resultToWritableMap(transactionResult)
+                            promise.resolve(res)
+
 
                         }
 
-                        override fun onError(errorCode: Int, errorMessage: String) {
-                            val err = createErrorJSON(errorCode, errorMessage)
+                        override fun onError(errorCode: Int, errorMessage: String, data: String?) {
+                            val err = createErrorJSON(errorCode, errorMessage, data)
                             promise.reject("error", err)
                         }
                     })
@@ -133,13 +139,33 @@ class SmallcaseGatewayModule(reactContext: ReactApplicationContext?) : ReactCont
         }
     }
 
+    @ReactMethod
+    fun showOrders(promise: Promise) {
+        val activity = currentActivity;
+        if (activity != null) {
+            SmallcaseGatewaySdk.showOrders(
+                activity = activity,
+                showOrdersResponseListener = object : DataListener<Any> {
+                    override fun onSuccess(response: Any) {
+                        promise.resolve(true)
+                    }
+
+                    override fun onFailure(errorCode: Int, errorMessage: String) {
+                        val err = createErrorJSON(errorCode, errorMessage, null)
+                        promise.reject("error", err)
+                    }
+                }
+            )
+        }
+    }
+
     @ReactMethod
     fun launchSmallplug(targetEndpoint: String, params: String, promise: Promise) {
         Log.d(TAG, "launchSmallplug: start")
 
         SmallcaseGatewaySdk.launchSmallPlug(currentActivity!!, SmallplugData(targetEndpoint, params), object : SmallPlugResponseListener {
             override fun onFailure(errorCode: Int, errorMessage: String) {
-                val err = createErrorJSON(errorCode, errorMessage)
+                val err = createErrorJSON(errorCode, errorMessage, null)
 
                 promise.reject("error", err)
             }
@@ -163,7 +189,7 @@ class SmallcaseGatewayModule(reactContext: ReactApplicationContext?) : ReactCont
             }
 
             override fun onFailure(errorCode: Int, errorMessage: String) {
-                val err = createErrorJSON(errorCode, errorMessage)
+                val err = createErrorJSON(errorCode, errorMessage, null)
                 promise.reject("error", err)
             }
         })
@@ -181,7 +207,7 @@ class SmallcaseGatewayModule(reactContext: ReactApplicationContext?) : ReactCont
                         }
 
                         override fun onLogoutFailed(errorCode: Int, error: String) {
-                            val err = createErrorJSON(errorCode, error)
+                            val err = createErrorJSON(errorCode, error, null)
                             promise.reject("error", err)
                         }
                     })
@@ -202,27 +228,13 @@ class SmallcaseGatewayModule(reactContext: ReactApplicationContext?) : ReactCont
 
     @ReactMethod
     fun triggerLeadGenWithStatus(userDetails: ReadableMap, promise: Promise) {
-        val activity = currentActivity;
+        val activity = currentActivity
         if (activity != null) {
-            SmallcaseGatewaySdk.triggerLeadGen(activity,readableMapToStrHashMap(userDetails), object : TransactionResponseListener {
-                override fun onSuccess(transactionResult: TransactionResult) {
-                    if (transactionResult.success) {
-                        val res = resultToWritableMap(transactionResult)
-                        promise.resolve(res)
-                    } else {
-                        val err = createErrorJSON(
-                                transactionResult.errorCode,
-                                transactionResult.error
-                        )
-                        promise.reject("error", err)
-                    }
-                }
 
-                override fun onError(errorCode: Int, errorMessage: String) {
-                    val err = createErrorJSON(errorCode, errorMessage)
-                    promise.reject("error", err)
+            SmallcaseGatewaySdk.triggerLeadGen(activity, readableMapToStrHashMap(userDetails), object: LeadGenResponseListener {
+                override fun onSuccess(leadResponse: String) {
+                    promise.resolve(leadResponse)
                 }
-
             })
         }
     }
@@ -257,15 +269,11 @@ class SmallcaseGatewayModule(reactContext: ReactApplicationContext?) : ReactCont
         val writableMap: WritableMap = Arguments.createMap()
 
         writableMap.putString("data", result.data)
-        writableMap.putBoolean("success", result.success)
-        writableMap.putString("error", result.error)
-        result.errorCode?.let {
-            writableMap.putInt("errorCode", it)
-        }
         writableMap.putString("transaction", result.transaction.name)
         return writableMap
     }
 
+
     private fun resultToWritableMap(result: SmallPlugResult): WritableMap {
         val writableMap: WritableMap = Arguments.createMap()
 
@@ -275,11 +283,12 @@ class SmallcaseGatewayModule(reactContext: ReactApplicationContext?) : ReactCont
         return writableMap
     }
 
-    private fun createErrorJSON(errorCode: Int?, errorMessage: String?): WritableMap {
+    private fun createErrorJSON(errorCode: Int?, errorMessage: String?, data: String?): WritableMap {
         val errObj = Arguments.createMap()
 
         errorCode?.let { errObj.putInt("errorCode", it) }
         errorMessage?.let { errObj.putString("errorMessage", it) }
+        data?.let { errObj.putString("data", it) }
 
         return errObj
     }

package/ios/SmallcaseGateway.m

@@ -8,6 +8,24 @@
 
 RCT_EXPORT_MODULE()
 
+RCT_REMAP_METHOD(setHybridSdkVersion, sdkVersion: (NSString *)sdkVersion) {
+    [SCGateway.shared setSDKTypeWithType:@"react-native"];
+    [SCGateway.shared setHybridSDKVersionWithVersion:sdkVersion];
+}
+
+RCT_REMAP_METHOD(getSdkVersion,
+                 reactNativeSdkVersion: (NSString *)reactNativeSdkVersion
+                 initWithResolver:(RCTPromiseResolveBlock)resolve
+                 rejecter:(RCTPromiseRejectBlock)reject) {
+    
+    NSString *nativeSdkString = [NSString stringWithFormat: @"ios:%@", [SCGateway.shared getSdkVersion]];
+    NSString *reactNativeSdkString = [NSString stringWithFormat: @",react-native:%@", reactNativeSdkVersion];
+    
+    NSString *result = [nativeSdkString stringByAppendingString: reactNativeSdkString];
+    
+    resolve(result);
+}
+
 RCT_REMAP_METHOD(setConfigEnvironment,
                  envName:(NSString *)envName
                  gateway:(NSString *)gateway
@@ -75,36 +93,6 @@ RCT_REMAP_METHOD(init,
             reject(@"init", @"Error during init", error);
         }
     }];
-
-
-}
-
-RCT_REMAP_METHOD(archiveSmallcase,
-                 iscid:(NSString *)iscid
-                 initWithResolver:(RCTPromiseResolveBlock)resolve
-                 rejecter:(RCTPromiseRejectBlock)reject)
-{
-    [SCGateway.shared markSmallcaseArchiveWithIscid:iscid completion: ^(id response, NSError * error) {
-        if(error != nil) {
-            NSMutableDictionary *responseDict = [[NSMutableDictionary alloc] init];
-            [responseDict setValue:[NSNumber numberWithInteger:error.code]  forKey:@"errorCode"];
-            [responseDict setValue:error.domain  forKey:@"errorMessage"];
-            
-            NSError *err = [[NSError alloc] initWithDomain:error.domain code:error.code userInfo:responseDict];
-            
-            reject(@"archiveSmallcase", @"Error during transaction", err);
-            return;
-        }
-        
-        NSString *archiveResponseString = [[NSString alloc] initWithData:response encoding:NSUTF8StringEncoding];
-        
-        NSMutableDictionary *responseDict =  [[NSMutableDictionary alloc] init];
-        [responseDict setValue:[NSNumber numberWithBool:true] forKey:@"success"];
-       
-        [responseDict setObject:archiveResponseString forKey:@"data"];
-        resolve(responseDict);
-        return;
-    }];
 }
 
 RCT_REMAP_METHOD(triggerTransaction,
@@ -238,6 +226,29 @@ RCT_REMAP_METHOD(triggerTransaction,
     });
 }
 
+RCT_REMAP_METHOD(showOrders,
+                 showOrdersWithResolver: (RCTPromiseResolveBlock)resolve
+                 rejecter:(RCTPromiseRejectBlock)reject)
+{
+    dispatch_async(dispatch_get_main_queue(), ^(void) {
+        
+        NSMutableDictionary *responseDict = [[NSMutableDictionary alloc] init];
+        
+        [SCGateway.shared
+         showOrdersWithPresentingController:[[[UIApplication sharedApplication] keyWindow] rootViewController]
+         completion:^(BOOL success, NSError * error) {
+         
+            if(success){
+                resolve(@(YES));
+            } else {
+                [responseDict setValue:[NSNumber numberWithInteger:error.code]  forKey:@"errorCode"];
+                [responseDict setValue:error.domain  forKey:@"error"];
+                resolve(responseDict);
+            }
+        }];
+    });
+}
+
 RCT_REMAP_METHOD(launchSmallplug,
                   targetEndpoint:(NSString *)targetEndpoint
                   params:(NSString *)params
@@ -288,28 +299,38 @@ RCT_REMAP_METHOD(launchSmallplug,
     });
 }
 
-RCT_REMAP_METHOD(logoutUser,
-                 logoutUserWithResolver:(RCTPromiseResolveBlock)resolve
+RCT_REMAP_METHOD(archiveSmallcase,
+                 iscid:(NSString *)iscid
+                 initWithResolver:(RCTPromiseResolveBlock)resolve
                  rejecter:(RCTPromiseRejectBlock)reject)
 {
-    dispatch_async(dispatch_get_main_queue(), ^(void) {
-        [SCGateway.shared
-            logoutUserWithPresentingController:[[[UIApplication sharedApplication] keyWindow] rootViewController]
-            completion:^(BOOL success, NSError * error) {
-                if(success){
-                    resolve(@(YES));
-                } else {
-                    reject(@"logout", @"Error during logout", error);
-                }
-        }];
-    });
+    [SCGateway.shared markSmallcaseArchiveWithIscid:iscid completion: ^(id response, NSError * error) {
+        if(error != nil) {
+            NSMutableDictionary *responseDict = [[NSMutableDictionary alloc] init];
+            [responseDict setValue:[NSNumber numberWithInteger:error.code]  forKey:@"errorCode"];
+            [responseDict setValue:error.domain  forKey:@"errorMessage"];
+            
+            NSError *err = [[NSError alloc] initWithDomain:error.domain code:error.code userInfo:responseDict];
+            
+            reject(@"archiveSmallcase", @"Error during transaction", err);
+            return;
+        }
+        
+        NSString *archiveResponseString = [[NSString alloc] initWithData:response encoding:NSUTF8StringEncoding];
+        
+        NSMutableDictionary *responseDict =  [[NSMutableDictionary alloc] init];
+        [responseDict setValue:[NSNumber numberWithBool:true] forKey:@"success"];
+        
+        [responseDict setObject:archiveResponseString forKey:@"data"];
+        resolve(responseDict);
+        return;
+    }];
 }
 
-
 RCT_REMAP_METHOD(triggerLeadGenWithStatus,
-                  userParams: (NSDictionary *)userParams
-                  leadGenGenWithResolver: (RCTPromiseResolveBlock)resolve
-                  rejecter:(RCTPromiseRejectBlock)reject)
+                 userParams: (NSDictionary *)userParams
+                 leadGenGenWithResolver: (RCTPromiseResolveBlock)resolve
+                 rejecter:(RCTPromiseRejectBlock)reject)
 {
     dispatch_async(dispatch_get_main_queue(), ^(void) {
         
@@ -317,7 +338,7 @@ RCT_REMAP_METHOD(triggerLeadGenWithStatus,
                                                       completion:^(NSString * leadGenResponse) {
             resolve(leadGenResponse);
         }
-         ];
+        ];
         
     });
 }
@@ -329,6 +350,23 @@ RCT_EXPORT_METHOD(triggerLeadGen: (NSDictionary *)userParams utmParams:(NSDictio
     });
 }
 
+RCT_REMAP_METHOD(logoutUser,
+                 logoutUserWithResolver:(RCTPromiseResolveBlock)resolve
+                 rejecter:(RCTPromiseRejectBlock)reject)
+{
+    dispatch_async(dispatch_get_main_queue(), ^(void) {
+        [SCGateway.shared
+            logoutUserWithPresentingController:[[[UIApplication sharedApplication] keyWindow] rootViewController]
+            completion:^(BOOL success, NSError * error) {
+                if(success){
+                    resolve(@(YES));
+                } else {
+                    reject(@"logout", @"Error during logout", error);
+                }
+        }];
+    });
+}
+
 @end
 
 

package/package.json

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

package/react-native-smallcase-gateway.podspec

@@ -23,6 +23,6 @@ Pod::Spec.new do |s|
   s.requires_arc = true
 
   s.dependency "React-Core"
-  s.dependency 'SCGateway', '3.1.9'
+  s.dependency 'SCGateway', '3.1.19'
 end
 

package/src/SmallcaseGateway.js

@@ -1,6 +1,7 @@
 import { NativeModules } from "react-native";
 import { ENV } from "./constants";
 import { safeObject } from "./util";
+import { version } from "../package.json";
 const { SmallcaseGateway: SmallcaseGatewayNative } = NativeModules;
 
 /**
@@ -34,6 +35,8 @@ let defaultBrokerList = [];
 const setConfigEnvironment = async (envConfig) => {
   const safeConfig = safeObject(envConfig);
 
+  await SmallcaseGatewayNative.setHybridSdkVersion(version);
+  
   const {
     brokerList,
     gatewayName,
@@ -123,6 +126,15 @@ const logoutUser = async () => {
   return SmallcaseGatewayNative.logoutUser();
 };
 
+/**
+ * This will display a list of all the orders that a user recently placed.
+ * This includes pending, successful, and failed orders.
+ * @returns 
+ */
+const showOrders = async () => {
+  return SmallcaseGatewayNative.showOrders();
+};
+
 /**
  * triggers the lead gen flow
  *
@@ -136,20 +148,6 @@ const triggerLeadGen = (userDetails, utmParams) => {
   return SmallcaseGatewayNative.triggerLeadGen(safeParams, safeUtm);
 };
 
-// /**
-//  * triggers the lead gen flow
-//  *
-//  * @param {userDetails} [userDetails]
-//  * @param {Object} [utmParams]
-//  * * @returns {Promise}
-//  */
-// const triggerLeadGen = async (userDetails, utmParams) => {
-//   const safeParams = safeObject(userDetails);
-//   const safeUtm = safeObject(utmParams);
-
-//   return SmallcaseGatewayNative.triggerLeadGen(safeParams, safeUtm)
-// }
-
 /**
  * triggers the lead gen flow
  *
@@ -173,6 +171,15 @@ const archiveSmallcase = async (iscid) => {
   return SmallcaseGatewayNative.archiveSmallcase(safeIscid);
 };
 
+/**
+ * Returns the native android/ios and react-native sdk version
+ * (internal-tracking)
+ * @returns {Promise}
+ */
+const getSdkVersion = async () => {
+  return SmallcaseGatewayNative.getSdkVersion(version);
+}
+
 const SmallcaseGateway = {
   init,
   logoutUser,
@@ -181,7 +188,9 @@ const SmallcaseGateway = {
   archiveSmallcase,
   triggerTransaction,
   setConfigEnvironment,
-  launchSmallplug
+  launchSmallplug,
+  getSdkVersion,
+  showOrders
 };
 
 export default SmallcaseGateway;