react-native-smallcase-gateway 1.3.3 → 1.4.2

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.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)
+
+
+### Bug Fixes
+
+* android native module for dmbranding ([df816f6](https://github.com/smallcase/react-native-smallcase-gateway/commit/df816f6dfa987dfdfc6297aec362fdb2c7d1e3c3))
+* dm partner branding ([78fb73f](https://github.com/smallcase/react-native-smallcase-gateway/commit/78fb73f56055c74eecebcff03c7560a794c06c7f))
+* iOS null issue & Android def val ([a852397](https://github.com/smallcase/react-native-smallcase-gateway/commit/a852397e2aa4e0ffc6669f0345cbd93f2e63a6b8))
+* method signature for ios native dm ([daedabc](https://github.com/smallcase/react-native-smallcase-gateway/commit/daedabca1180b16c3eacd2c956a51b8d63457435))
+* Platform check for dm branding ([0d80e79](https://github.com/smallcase/react-native-smallcase-gateway/commit/0d80e797b80e4c92e940b2763da81299ba05c9c6))
+* type error ([e2b1394](https://github.com/smallcase/react-native-smallcase-gateway/commit/e2b139426a488a94bfe514265a8599c81ffb31b8))
+
 ### [1.3.3](https://github.com/smallcase/react-native-smallcase-gateway/compare/v1.3.2...v1.3.3) (2022-06-02)
 
 

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.3.2'
+    implementation 'com.smallcase.gateway:sdk:3.4.3'
     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

@@ -1,9 +1,6 @@
 package com.smallcase.gateway.reactnative
 
-import android.content.ClipboardManager
-import android.content.Context
 import android.util.Log
-import android.widget.Toast
 import com.facebook.react.bridge.*
 import com.smallcase.gateway.data.SmallcaseGatewayListeners
 import com.smallcase.gateway.data.SmallcaseLogoutListener
@@ -14,6 +11,8 @@ 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
+import com.smallcase.gateway.portal.SmallplugPartnerProps
+import kotlin.Error
 
 
 class SmallcaseGatewayModule(reactContext: ReactApplicationContext?) : ReactContextBaseJavaModule(reactContext!!) {
@@ -26,13 +25,7 @@ class SmallcaseGatewayModule(reactContext: ReactApplicationContext?) : ReactCont
     }
 
     @ReactMethod
-    fun setConfigEnvironment(
-            envName: String,
-            gateway: String,
-            isLeprechaunActive: Boolean,
-            isAmoEnabled: Boolean,
-            preProvidedBrokers: ReadableArray,
-            promise: Promise) {
+    fun setConfigEnvironment(envName: String, gateway: String, isLeprechaunActive: Boolean, isAmoEnabled: Boolean, preProvidedBrokers: ReadableArray, promise: Promise) {
 
         try {
             val brokerList = ArrayList<String>()
@@ -45,25 +38,17 @@ class SmallcaseGatewayModule(reactContext: ReactApplicationContext?) : ReactCont
 
             val protocol = getProtocol(envName)
 
-            val env = Environment(
-                    gateway = gateway,
-                    buildType = protocol,
-                    isAmoEnabled = isAmoEnabled,
-                    preProvidedBrokers = brokerList,
-                    isLeprachaunActive = isLeprechaunActive
-            )
-
-            SmallcaseGatewaySdk.setConfigEnvironment(
-                    environment = env,
-                    smallcaseGatewayListeners = object : SmallcaseGatewayListeners {
-                        override fun onGatewaySetupSuccessfull() {
-                            promise.resolve(true)
-                        }
-
-                        override fun onGatewaySetupFailed(error: String) {
-                            promise.reject(Throwable(error))
-                        }
-                    })
+            val env = Environment(gateway = gateway, buildType = protocol, isAmoEnabled = isAmoEnabled, preProvidedBrokers = brokerList, isLeprachaunActive = isLeprechaunActive)
+
+            SmallcaseGatewaySdk.setConfigEnvironment(environment = env, smallcaseGatewayListeners = object : SmallcaseGatewayListeners {
+                override fun onGatewaySetupSuccessfull() {
+                    promise.resolve(true)
+                }
+
+                override fun onGatewaySetupFailed(error: String) {
+                    promise.reject(Throwable(error))
+                }
+            })
         } catch (e: Exception) {
             promise.reject(e)
         }
@@ -86,19 +71,17 @@ class SmallcaseGatewayModule(reactContext: ReactApplicationContext?) : ReactCont
         Log.d(TAG, "init: start")
 
         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)
-                        promise.reject("error", err)
-                    }
+        SmallcaseGatewaySdk.init(authRequest = initReq, gatewayInitialisationListener = object : DataListener<InitialisationResponse> {
+            override fun onFailure(errorCode: Int, errorMessage: String) {
+                val err = createErrorJSON(errorCode, errorMessage, null)
+                promise.reject("error", err)
+            }
 
-                    override fun onSuccess(response: InitialisationResponse) {
-                        promise.resolve(true)
-                    }
+            override fun onSuccess(response: InitialisationResponse) {
+                promise.resolve(true)
+            }
 
-                })
+        })
     }
 
     @ReactMethod
@@ -115,22 +98,21 @@ class SmallcaseGatewayModule(reactContext: ReactApplicationContext?) : ReactCont
         val activity = currentActivity;
         if (activity != null) {
             val utm = readableMapToStrHashMap(utmParams)
-            SmallcaseGatewaySdk.triggerTransaction(
-                    utmParams = utm,
-                    activity = activity,
-                    transactionId = transactionId,
-                    preProvidedBrokers = safeBrokerList,
-                    transactionResponseListener = object : TransactionResponseListener {
-                        override fun onSuccess(transactionResult: TransactionResult) {
-                            val res = resultToWritableMap(transactionResult, true)
-                            promise.resolve(res)
-                        }
-
-                        override fun onError(errorCode: Int, errorMessage: String, data: String?) {
-                            val err = createErrorJSON(errorCode, errorMessage, data)
-                            promise.reject("error", err)
-                        }
-                    })
+            SmallcaseGatewaySdk.triggerTransaction(utmParams = utm,
+                activity = activity,
+                transactionId = transactionId,
+                preProvidedBrokers = safeBrokerList,
+                transactionResponseListener = object : TransactionResponseListener {
+                    override fun onSuccess(transactionResult: TransactionResult) {
+                        val res = resultToWritableMap(transactionResult, true)
+                        promise.resolve(res)
+                    }
+
+                    override fun onError(errorCode: Int, errorMessage: String, data: String?) {
+                        val err = createErrorJSON(errorCode, errorMessage, data)
+                        promise.reject("error", err)
+                    }
+                })
         } else {
             promise.reject(Throwable("no activity"))
         }
@@ -140,19 +122,16 @@ class SmallcaseGatewayModule(reactContext: ReactApplicationContext?) : ReactCont
     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)
-                    }
+            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)
-                    }
+                override fun onFailure(errorCode: Int, errorMessage: String) {
+                    val err = createErrorJSON(errorCode, errorMessage, null)
+                    promise.reject("error", err)
                 }
-            )
+            })
         }
     }
 
@@ -172,7 +151,51 @@ class SmallcaseGatewayModule(reactContext: ReactApplicationContext?) : ReactCont
                 promise.resolve(res)
             }
 
-        })
+        }, smallplugPartnerProps = SmallplugPartnerProps(headerColor = "#2F363F", backIconColor = "ffffff"))
+    }
+
+    @ReactMethod
+    fun launchSmallplugWithBranding(targetEndpoint: String, params: String, readableMap: ReadableMap?, promise: Promise) {
+
+        fun getColorValue(value: Any?, defaultValue: String): String {
+            return when (value) {
+                is String -> {
+                    if (value.length < 6) defaultValue else if (!value.contains("#")) "#$value" else value
+                }
+                else -> {
+                    defaultValue
+                }
+            }
+        }
+        Log.d(TAG, "launchSmallplugWithBranding: start")
+
+        var partnerProps: SmallplugPartnerProps? = SmallplugPartnerProps(headerColor = "#2F363F", backIconColor = "ffffff")
+
+        try {
+            partnerProps = readableMap?.toHashMap()?.let { map ->
+                val hc = getColorValue(map["headerColor"], "#2F363F")
+                val ho = map["headerOpacity"]?.let { if (it is Double) it else 1.0 } ?: 1.0
+                val bc = getColorValue(map["backIconColor"], "#ffffff")
+                val bo = map["backIconOpacity"]?.let { if (it is Double) it else 1.0 } ?: 1.0
+                SmallplugPartnerProps(headerColor = hc, headerOpacity = ho, backIconColor = bc, backIconOpacity = bo)
+            }
+        } catch (e: Throwable) {
+        }
+
+
+        SmallcaseGatewaySdk.launchSmallPlug(currentActivity!!, SmallplugData(targetEndpoint, params), object : SmallPlugResponseListener {
+            override fun onFailure(errorCode: Int, errorMessage: String) {
+                val err = createErrorJSON(errorCode, errorMessage, null)
+
+                promise.reject("error", err)
+            }
+
+            override fun onSuccess(smallPlugResult: SmallPlugResult) {
+                val res = resultToWritableMap(smallPlugResult)
+                promise.resolve(res)
+            }
+
+        }, partnerProps)
     }
 
     @ReactMethod
@@ -196,18 +219,16 @@ class SmallcaseGatewayModule(reactContext: ReactApplicationContext?) : ReactCont
     fun logoutUser(promise: Promise) {
         val activity = currentActivity;
         if (activity != null) {
-            SmallcaseGatewaySdk.logoutUser(
-                    activity = activity,
-                    logoutListener = object : SmallcaseLogoutListener {
-                        override fun onLogoutSuccessfull() {
-                            promise.resolve(true)
-                        }
-
-                        override fun onLogoutFailed(errorCode: Int, error: String) {
-                            val err = createErrorJSON(errorCode, error, null)
-                            promise.reject("error", err)
-                        }
-                    })
+            SmallcaseGatewaySdk.logoutUser(activity = activity, logoutListener = object : SmallcaseLogoutListener {
+                override fun onLogoutSuccessfull() {
+                    promise.resolve(true)
+                }
+
+                override fun onLogoutFailed(errorCode: Int, error: String) {
+                    val err = createErrorJSON(errorCode, error, null)
+                    promise.reject("error", err)
+                }
+            })
         }
     }
 
@@ -215,11 +236,7 @@ class SmallcaseGatewayModule(reactContext: ReactApplicationContext?) : ReactCont
     fun triggerLeadGen(userDetails: ReadableMap, utmData: ReadableMap) {
         val activity = currentActivity;
         if (activity != null) {
-            SmallcaseGatewaySdk.triggerLeadGen(
-                    activity=activity,
-                    utmParams = readableMapToStrHashMap(utmData),
-                    params = readableMapToStrHashMap(userDetails)
-            )
+            SmallcaseGatewaySdk.triggerLeadGen(activity = activity, utmParams = readableMapToStrHashMap(utmData), params = readableMapToStrHashMap(userDetails))
         }
     }
 
@@ -228,7 +245,7 @@ class SmallcaseGatewayModule(reactContext: ReactApplicationContext?) : ReactCont
         val activity = currentActivity
         if (activity != null) {
 
-            SmallcaseGatewaySdk.triggerLeadGen(activity, readableMapToStrHashMap(userDetails), object: LeadGenResponseListener {
+            SmallcaseGatewaySdk.triggerLeadGen(activity, readableMapToStrHashMap(userDetails), object : LeadGenResponseListener {
                 override fun onSuccess(leadResponse: String) {
                     promise.resolve(leadResponse)
                 }

package/ios/SmallcaseGateway.m

@@ -299,6 +299,61 @@ RCT_REMAP_METHOD(launchSmallplug,
     });
 }
 
+RCT_REMAP_METHOD(launchSmallplugWithBranding,
+                 targetEndpoint:(NSString *)targetEndpoint
+                 params:(NSString *)params
+                 headerColor:(NSString *)headerColor
+                 headerOpacity:(nonnull NSNumber *)headerOpacity
+                 backIconColor:(NSString *)backIconColor
+                 backIconOpacity:(nonnull NSNumber *)backIconOpacity
+                 launchSmallplugWithResolver:(RCTPromiseResolveBlock)resolve
+                 rejecter:(RCTPromiseRejectBlock)reject)
+{
+    dispatch_async(dispatch_get_main_queue(), ^(void) {
+        
+        SmallplugData *smallplugData = [[SmallplugData alloc] init:targetEndpoint :params];
+        SmallplugUiConfig *smallplugUiConfig = [[SmallplugUiConfig alloc] initWithSmallplugHeaderColor:headerColor headerColorOpacity:headerOpacity backIconColor:backIconColor backIconColorOpacity:backIconOpacity];
+        
+        [SCGateway.shared launchSmallPlugWithPresentingController:[[[UIApplication sharedApplication] keyWindow] rootViewController] smallplugData:smallplugData smallplugUiConfig:smallplugUiConfig completion:^(id smallplugResponse, NSError * error) {
+            
+            NSMutableDictionary *responseDict = [[NSMutableDictionary alloc] init];
+            
+            if (error != nil) {
+                NSLog(@"%@", error.domain);
+                double delayInSeconds = 0.5;
+                dispatch_time_t popTime = dispatch_time(DISPATCH_TIME_NOW, (int64_t)(delayInSeconds * NSEC_PER_SEC));
+                dispatch_after(popTime, dispatch_get_main_queue(), ^(void) {
+                    NSMutableDictionary *responseDict = [[NSMutableDictionary alloc] init];
+                    [responseDict setValue:[NSNumber numberWithBool:false] forKey:@"success"];
+                    [responseDict setValue:[NSNumber numberWithInteger:error.code]  forKey:@"errorCode"];
+                    [responseDict setValue:error.domain  forKey:@"error"];
+                    
+                    resolve(responseDict);
+                    return;
+                });
+            } else {
+                
+                if ([smallplugResponse isKindOfClass: [NSString class]]) {
+                    NSLog(@"%@", smallplugResponse);
+                    
+                    [responseDict setValue:[NSNumber numberWithBool: true] forKey:@"success"];
+                    [responseDict setValue:smallplugResponse forKey:@"smallcaseAuthToken"];
+                    
+                    double delayInSeconds = 0.5;
+                    dispatch_time_t popTime = dispatch_time(DISPATCH_TIME_NOW, (int64_t)(delayInSeconds * NSEC_PER_SEC));
+                    dispatch_after(popTime, dispatch_get_main_queue(), ^(void) {
+                        
+                        resolve(responseDict);
+                        return;
+                        
+                    });
+                }
+            }
+            
+        }];
+    });
+}
+
 RCT_REMAP_METHOD(archiveSmallcase,
                  iscid:(NSString *)iscid
                  initWithResolver:(RCTPromiseResolveBlock)resolve

package/package.json

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

package/react-native-smallcase-gateway.podspec

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

package/src/SmallcaseGateway.js

@@ -1,6 +1,6 @@
-import { NativeModules } from "react-native";
+import { NativeModules, Platform } from "react-native";
 import { ENV } from "./constants";
-import { safeObject } from "./util";
+import { safeObject, platformSpecificColorHex } from "./util";
 import { version } from "../package.json";
 const { SmallcaseGateway: SmallcaseGatewayNative } = NativeModules;
 
@@ -24,6 +24,12 @@ const { SmallcaseGateway: SmallcaseGatewayNative } = NativeModules;
  * @property {String} email - email of user
  * @property {String} contact - contact of user
  * @property {String} pinCode - pin-code of user
+ * 
+ * @typedef {Object} SmallplugUiConfig
+ * @property {String} headerColor - color of the header background
+ * @property {Number} headerOpacity - opacity of the header background
+ * @property {String} backIconColor - color of the back icon
+ * @property {Number} backIconOpacity - opacity of the back icon
  */
 
 let defaultBrokerList = [];
@@ -36,7 +42,7 @@ const setConfigEnvironment = async (envConfig) => {
   const safeConfig = safeObject(envConfig);
 
   await SmallcaseGatewayNative.setHybridSdkVersion(version);
-  
+
   const {
     brokerList,
     gatewayName,
@@ -115,6 +121,45 @@ const launchSmallplug = async (targetEndpoint, params) => {
 
 }
 
+const safeGatewayName = typeof gatewayName === "string" ? gatewayName : "";
+/**
+ * launches smallcases module
+ * 
+ * @param {string} targetEndpoint
+ * @param {string} params
+ * @param {string} headerColor
+ * @param {number} headerOpacity
+ * @param {string} backIconColor
+ * @param {number} backIconOpacity
+ */
+const launchSmallplugWithBranding = async (targetEndpoint, params, headerColor, headerOpacity, backIconColor, backIconOpacity) => {
+  const safeEndpoint = typeof targetEndpoint === "string" ? targetEndpoint : ""
+  const safeParams = typeof params === "string" ? params : ""
+  const safeHeaderColor = typeof headerColor === "string" ? headerColor : platformSpecificColorHex("2F363F") 
+  const safeHeaderOpacity = typeof headerOpacity === "number" ? headerOpacity : 1
+  const safeBackIconColor = typeof backIconColor === "string" ? backIconColor : platformSpecificColorHex("FFFFFF")
+  const safeBackIconOpacity = typeof backIconOpacity === "number" ? backIconOpacity : 1
+
+  return Platform.OS === 'android' ?
+    SmallcaseGatewayNative.launchSmallplugWithBranding(
+      safeEndpoint, safeParams,
+      {
+        headerColor: safeHeaderColor,
+        headerOpacity: safeHeaderOpacity,
+        backIconColor: safeBackIconColor,
+        backIconOpacity: safeBackIconOpacity
+      })
+    : SmallcaseGatewayNative.launchSmallplugWithBranding(
+      safeEndpoint,
+      safeParams,
+      safeHeaderColor,
+      safeHeaderOpacity,
+      safeBackIconColor,
+      safeBackIconOpacity
+    );
+
+}
+
 /**
  * Logs the user out and removes the web session.
  *
@@ -154,7 +199,7 @@ const triggerLeadGen = (userDetails, utmParams) => {
  * @param {userDetails} [userDetails]
  * * @returns {Promise}
  */
- const triggerLeadGenWithStatus = async (userDetails) => {
+const triggerLeadGenWithStatus = async (userDetails) => {
   const safeParams = safeObject(userDetails);
 
   return SmallcaseGatewayNative.triggerLeadGenWithStatus(safeParams);
@@ -189,6 +234,7 @@ const SmallcaseGateway = {
   triggerTransaction,
   setConfigEnvironment,
   launchSmallplug,
+  launchSmallplugWithBranding,
   getSdkVersion,
   showOrders
 };

package/src/util.js

@@ -9,3 +9,10 @@
 export const safeObject = (obj) => {
   return obj && typeof obj === "object" ? obj : {};
 };
+
+export function platformSpecificColorHex(hex) {
+  if (Platform.OS === 'android') {
+    return `#${hex}`
+  }
+  return hex
+}