@appboxo/react-native-sdk 1.0.32 → 1.0.34

package/README.md

@@ -30,7 +30,7 @@ export default function App() {
   }, [])
 
   const handleOpenMiniapp = () => {
-    appboxo.openMiniapp('[miniapp_id]', '[auth_payload]', {'key': 'value'});  //launch miniapp by id with auth payload and with data as {[key: string]: any} | undefined that is sent to miniapp.
+    appboxo.openMiniapp('[miniapp_id]', {'key': 'value'});  //launch miniapp by id with data as {[key: string]: any} | undefined that is sent to miniapp.
   }
 
   return (
@@ -83,7 +83,7 @@ export default function App() {
   }, [])
 
   const handleOpenMiniapp = () => {
-    appboxo.openMiniapp('[miniapp_id]', '[auth_payload]');  //launch miniapp by id with auth payload.
+    appboxo.openMiniapp('[miniapp_id]');  //launch miniapp by id
   }
 
   return (

package/android/build.gradle

@@ -1,6 +1,6 @@
-def DEFAULT_COMPILE_SDK_VERSION = 30
+def DEFAULT_COMPILE_SDK_VERSION = 33
 def DEFAULT_MIN_SDK_VERSION = 21
-def DEFAULT_TARGET_SDK_VERSION = 30
+def DEFAULT_TARGET_SDK_VERSION = 33
 
 def safeExtGet(prop, fallback) {
     rootProject.ext.has(prop) ? rootProject.ext.get(prop) : fallback
@@ -12,7 +12,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.1.3'
+        classpath "com.android.tools.build:gradle:7.4.2"
     }
 }
 
@@ -127,5 +127,5 @@ rootProject.allprojects {
 dependencies {
     //noinspection GradleDynamicVersion
     implementation 'com.facebook.react:react-native:+'  // From node_modules
-    implementation 'com.appboxo:miniapp-sdk:1.4.13'
+    implementation 'com.appboxo:sdk:1.4.19'
 }

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

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-all.zip

package/android/src/main/java/com/appboxo/RnappboxosdkModule.java

@@ -23,6 +23,7 @@ import android.os.Looper;
 import androidx.annotation.NonNull;
 
 import com.appboxo.js.params.CustomEvent;
+import com.appboxo.js.params.PaymentData;
 import com.appboxo.sdk.Appboxo;
 import com.appboxo.sdk.Config;
 import com.appboxo.sdk.Miniapp;
@@ -43,7 +44,7 @@ import java.util.HashMap;
 import java.util.Map;
 
 public class RnappboxosdkModule extends ReactContextBaseJavaModule
-        implements Miniapp.LifecycleListener, Miniapp.CustomEventListener {
+        implements Miniapp.LifecycleListener, Miniapp.CustomEventListener, Miniapp.AuthListener {
     private static final String CUSTOM_EVENTS_EVENT_NAME = "appboxo_custom_events";
     private static final String MINIAPP_LIFECYCLE_EVENT_NAME = "appboxo_miniapp_lifecycle";
 
@@ -84,9 +85,10 @@ public class RnappboxosdkModule extends ReactContextBaseJavaModule
     }
 
     @ReactMethod
-    public void openMiniapp(String appId, String payload, ReadableMap data, String theme, ReadableMap customUrlParams) {
+    public void openMiniapp(String appId, ReadableMap data, String theme, ReadableMap customUrlParams) {
         Miniapp miniapp = Appboxo.INSTANCE.getMiniapp(appId)
                 .setCustomEventListener(this)
+                .setAuthListener(this)
                 .setLifecycleListener(this);
 
         MiniappConfig.Builder configBuilder = new MiniappConfig.Builder();
@@ -125,6 +127,12 @@ public class RnappboxosdkModule extends ReactContextBaseJavaModule
         miniapp.open(reactContext);
     }
 
+    @ReactMethod
+    public void setAuthCode(String appId, String authCode) {
+        Appboxo.INSTANCE.getMiniapp(appId)
+                .setAuthCode(authCode);
+    }
+
     @Override
     public void handle(@NotNull AppboxoActivity appboxoActivity, @NotNull Miniapp miniApp, @NotNull CustomEvent customEvent) {
         WritableMap params = Arguments.createMap();
@@ -192,8 +200,16 @@ public class RnappboxosdkModule extends ReactContextBaseJavaModule
         sendEvent(MINIAPP_LIFECYCLE_EVENT_NAME, params);
     }
 
+    @Override
+    public void onAuth(@NotNull AppboxoActivity appboxoActivity, @NonNull Miniapp miniapp) {
+        WritableMap params = Arguments.createMap();
+        params.putString("app_id", miniapp.getAppId());
+        params.putString("lifecycle", "onAuth");
+        sendEvent(MINIAPP_LIFECYCLE_EVENT_NAME, params);
+    }
+
     @ReactMethod
-    void sendCustomEvent(ReadableMap map) {
+    public void sendCustomEvent(ReadableMap map) {
         try {
             String appId = map.getString("app_id");
             ReadableMap customEventMap = map.getMap("custom_event");
@@ -215,6 +231,33 @@ public class RnappboxosdkModule extends ReactContextBaseJavaModule
         }
     }
 
+    @ReactMethod
+    public void sendPaymentEvent(ReadableMap map) {
+        try {
+            String appId = map.getString("app_id");
+            ReadableMap paymentEvent = map.getMap("payment_event");
+            final PaymentData data = new PaymentData(
+                    paymentEvent.getString("transaction_token"),
+                    paymentEvent.getString("miniapp_order_id"),
+                    paymentEvent.getDouble("amount"),
+                    paymentEvent.getString("currency"),
+                    paymentEvent.getString("status"),
+                    paymentEvent.getString("hostapp_order_id"),
+                    MapUtil.toMap(paymentEvent.getMap("extra_params")));
+            final Miniapp miniapp = Appboxo.INSTANCE.getMiniapp(appId);
+            handler.post(new Runnable() {
+                @Override
+                public void run() {
+                    if (miniapp != null) {
+                        miniapp.sendPaymentResult(data);
+                    }
+                }
+            });
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
     @ReactMethod
     void hideMiniapps() {
         Appboxo.INSTANCE.hideMiniapps();

package/index.js

@@ -20,7 +20,9 @@ import lifecycleHooksListener from './js/lifecycleHooks'
 import customEvents from './js/customEvents'
 import mOpenMiniapp from './js/mOpenMiniapp'
 import mSetConfig from './js/mSetConfig'
+import mSetAuthCode from './js/mSetAuthCode'
+import paymentEvents from './js/paymentEvents'
 
-const { Rnappboxosdk: { sendCustomEvent, openMiniapp, setConfig, ...methods } } = NativeModules
+const { Rnappboxosdk: { sendCustomEvent, sendPaymentEvent, openMiniapp, setConfig, ...methods } } = NativeModules
 
-export default { ...methods, lifecycleHooksListener, openMiniapp: mOpenMiniapp, setConfig: mSetConfig, customEvents }
+export default { ...methods, lifecycleHooksListener, openMiniapp: mOpenMiniapp, setConfig: mSetConfig, customEvents, paymentEvents }

package/ios/Rnappboxosdk.m

@@ -23,6 +23,7 @@ limitations under the License.
 @end
 
 #define APPBOXO_CUSTOM_EVENT @"appboxo_custom_events"
+#define APPBOXO_PAYMENT_EVENT @"appboxo_payment_events"
 #define APPBOXO_MINIAPP_LIFECYCLE_EVENT @"appboxo_miniapp_lifecycle"
 
 @implementation Rnappboxosdk
@@ -43,10 +44,11 @@ RCT_EXPORT_METHOD(setConfig:(NSString *)clientId multitaskMode:(BOOL)multitaskMo
     [[Appboxo shared] setConfig: [[Config alloc] initWithClientId: clientId theme: globalTheme]];
 }
 
-RCT_EXPORT_METHOD(openMiniapp:(NSString *)appId payload:(NSString *)payload data:(nullable NSDictionary<NSString *,id> *)data theme:(nullable NSString *)theme customUrlParams:(nullable NSDictionary<NSString *,id> *)customUrlParams)
+RCT_EXPORT_METHOD(openMiniapp:(NSString *)appId data:(nullable NSDictionary<NSString *,id> *)data theme:(nullable NSString *)theme customUrlParams:(nullable NSDictionary<NSString *,id> *)customUrlParams)
 {
     dispatch_async(dispatch_get_main_queue(), ^{
-        Miniapp *miniapp = [[Appboxo shared] getMiniappWithAppId: appId authPayload: payload data: data];
+        Miniapp *miniapp = [[Appboxo shared] getMiniappWithAppId: appId];
+        [miniapp setData: data];
         [miniapp setDelegate:self];
 
         MiniappConfig *miniappConfig = [[MiniappConfig alloc] initWithTheme: ThemeSystem];
@@ -64,6 +66,14 @@ RCT_EXPORT_METHOD(openMiniapp:(NSString *)appId payload:(NSString *)payload data
     });
 }
 
+RCT_EXPORT_METHOD(setAuthCode:(NSString *)appId code:(NSString *)code)
+{
+    dispatch_async(dispatch_get_main_queue(), ^{
+        Miniapp *miniapp = [[Appboxo shared] getMiniappWithAppId: appId];
+        [miniapp setAuthCode: code];
+    });
+}
+
 RCT_EXPORT_METHOD(hideAllMiniApps)
 {
     dispatch_async(dispatch_get_main_queue(), ^{
@@ -82,10 +92,39 @@ RCT_EXPORT_METHOD(sendCustomEvent:(NSDictionary<NSString *,id> * _Nonnull)params
 {
     dispatch_async(dispatch_get_main_queue(), ^{
         NSString *appId = params[@"app_id"] != NULL ? params[@"app_id"] : @"";
-        NSDictionary *customEvent = params[@"custom_event"] != NULL ? params[@"custom_event"] : @{};
+        NSDictionary<NSString *, id> *customEventParams = params[@"custom_event"];
+        
+        CustomEvent *customEvent = [CustomEvent new];
+        customEvent.requestId = customEventParams[@"request_id"] != NULL ? (NSInteger) customEventParams[@"request_id"] : 0;
+        customEvent.type = customEventParams[@"type"] != NULL ? (NSString *) customEventParams[@"type"] : @"";
+        customEvent.errorType = customEventParams[@"error_type"] != NULL ? (NSString *) customEventParams[@"error_type"] : @"";
+        customEvent.payload = customEventParams[@"payload"] != NULL ? (NSDictionary<NSString *, id> *) customEventParams[@"payload"] : NULL;
+        
         Miniapp *miniapp = [[Appboxo shared] getMiniappWithAppId:appId];
         if (miniapp != NULL) {
-            [miniapp sendCustomEventWithParams:customEvent];
+            [miniapp sendCustomEvent:customEvent];
+        };
+    });
+}
+
+RCT_EXPORT_METHOD(sendPaymentEvent:(NSDictionary<NSString *,id> * _Nonnull)params)
+{
+    dispatch_async(dispatch_get_main_queue(), ^{
+        NSString *appId = params[@"app_id"] != NULL ? params[@"app_id"] : @"";
+        NSDictionary<NSString *, id> *paymentEventParams = params[@"payment_event"];
+        
+        PaymentData *paymentData = [PaymentData new];
+        paymentData.transactionToken = paymentEventParams[@"transaction_token"] != NULL ? (NSString *) paymentEventParams[@"transaction_token"] : @"";
+        paymentData.miniappOrderId = paymentEventParams[@"miniapp_order_id"] != NULL ? (NSString *) paymentEventParams[@"miniapp_order_id"] : @"";
+        paymentData.amount = paymentEventParams[@"amount"] != NULL ? [paymentEventParams[@"amount"] doubleValue] : 0;
+        paymentData.currency = paymentEventParams[@"currency"] != NULL ? (NSString *) paymentEventParams[@"currency"] : @"";
+        paymentData.status = paymentEventParams[@"status"] != NULL ? (NSString *) paymentEventParams[@"status"] : @"";
+        paymentData.hostappOrderId = paymentEventParams[@"hostapp_order_id"] != NULL ? (NSString *) paymentEventParams[@"hostapp_order_id"] : @"";
+        paymentData.extraParams = paymentEventParams[@"extra_params"] != NULL ? (NSDictionary<NSString *, id> *) paymentEventParams[@"extra_params"] : NULL;
+        
+        Miniapp *miniapp = [[Appboxo shared] getMiniappWithAppId:appId];
+        if (miniapp != NULL) {
+            [miniapp sendPaymentEvent: paymentData];
         };
     });
 }
@@ -93,35 +132,46 @@ RCT_EXPORT_METHOD(sendCustomEvent:(NSDictionary<NSString *,id> * _Nonnull)params
 
 - (NSArray<NSString *> *)supportedEvents
 {
-    return @[APPBOXO_CUSTOM_EVENT,APPBOXO_MINIAPP_LIFECYCLE_EVENT];
+    return @[APPBOXO_CUSTOM_EVENT, APPBOXO_PAYMENT_EVENT, APPBOXO_MINIAPP_LIFECYCLE_EVENT];
 }
 
-- (void)didReceiveCustomEventWithMiniapp:(Miniapp * _Nonnull)miniapp params:(NSDictionary<NSString *,id> * _Nonnull)params {
-
-    NSMutableDictionary *customEvent = [NSMutableDictionary new];
+- (void)didReceiveCustomEvent:(Miniapp *)miniapp customEvent:(CustomEvent *)customEvent {
+    NSMutableDictionary *customEventParams = [NSMutableDictionary new];
+    customEventParams[@"request_id"] = [NSNumber numberWithLong: customEvent.requestId];
+    customEventParams[@"type"] = customEvent.type;
+    customEventParams[@"error_type"] = customEvent.errorType;
 
-    if (params[@"request_id"]) {
-        customEvent[@"request_id"] = params[@"request_id"];
+    if (customEvent.payload) {
+        customEventParams[@"payload"] = customEvent.payload;
     }
 
-    if (params[@"type"]) {
-        customEvent[@"type"] = params[@"type"];
-    }
+    NSDictionary *body = @{
+        @"app_id": miniapp.appId,
+        @"custom_event": customEventParams
+    };
 
-    if (params[@"error_type"]) {
-        customEvent[@"error_type"] = params[@"error_type"];
-    }
+    [self sendEventWithName:APPBOXO_CUSTOM_EVENT body:body];
+}
 
-    if (params[@"payload"]) {
-        customEvent[@"payload"] = params[@"payload"];
+- (void)didReceivePaymentEvent:(Miniapp *)miniapp paymentData:(PaymentData *)paymentData {
+    NSMutableDictionary *paymentEventParams = [NSMutableDictionary new];
+    paymentEventParams[@"transaction_token"] = paymentData.transactionToken;
+    paymentEventParams[@"miniapp_order_id"] = paymentData.miniappOrderId;
+    paymentEventParams[@"amount"] = [NSNumber numberWithDouble:paymentData.amount];
+    paymentEventParams[@"currency"] = paymentData.currency;
+    paymentEventParams[@"status"] = paymentData.status;
+    paymentEventParams[@"hostapp_order_id"] = paymentData.hostappOrderId;
+
+    if (paymentData.extraParams) {
+        paymentEventParams[@"extra_params"] = paymentData.extraParams;
     }
 
     NSDictionary *body = @{
         @"app_id": miniapp.appId,
-        @"custom_event": customEvent
+        @"payment_event": paymentEventParams
     };
 
-    [self sendEventWithName:APPBOXO_CUSTOM_EVENT body:body];
+    [self sendEventWithName:APPBOXO_PAYMENT_EVENT body:body];
 }
 
 - (void)onLaunchMiniapp:(Miniapp *)miniapp {
@@ -170,4 +220,12 @@ RCT_EXPORT_METHOD(sendCustomEvent:(NSDictionary<NSString *,id> * _Nonnull)params
     [self sendEventWithName:APPBOXO_MINIAPP_LIFECYCLE_EVENT body:body];
 }
 
+- (void)onAuthMiniapp:(Miniapp *)miniapp {
+    NSDictionary *body = @{
+        @"app_id": miniapp.appId,
+        @"lifecycle": @"onAuth"
+    };
+    [self sendEventWithName:APPBOXO_MINIAPP_LIFECYCLE_EVENT body:body];
+}
+
 @end

package/js/mOpenMiniapp.js

@@ -1,12 +1,11 @@
 import { NativeModules } from 'react-native'
 
 /**
- * Launch miniapp by id with payload and custom data
+ * Launch miniapp by id and custom data
  * */
-const mOpenMiniapp = (miniAppId, payload, options) => {
+const mOpenMiniapp = (miniAppId, options) => {
   NativeModules.Rnappboxosdk.openMiniapp(
     miniAppId,
-    payload,
     options?.data,
     options?.theme === 'dark' || options?.theme === 'light' || options?.theme === 'system' ? options.theme : null,
     options?.extraUrlParams,

package/js/mSetAuthCode.js

@@ -0,0 +1,13 @@
+import { NativeModules } from 'react-native'
+
+/**
+ * Set auth code
+ * */
+const mAuthCode = (miniAppId, authCode) => {
+  NativeModules.Rnappboxosdk.setAuthCode(
+    miniAppId,
+    authCode,
+  )
+}
+
+export default mAuthCode

package/js/paymentEvents.js

@@ -0,0 +1,36 @@
+import { NativeEventEmitter, NativeModules } from 'react-native'
+
+/**
+ * Appboxo custom events system for handle events from miniapp and send to miniapp.
+ * */
+const paymentEvents = {
+
+  /**
+   * Subscribe to events from miniapp
+   * @param {function} eventHandler the custom event handler
+   * @param {function} errorHandler the custom event error handler
+   * @returns {function} unsubscribe events from miniapp
+   * */
+  subscribe: (eventHandler) => {
+    const appboxoPaymentEventEmitter = new NativeEventEmitter(NativeModules.Rnappboxosdk)
+    const appboxoEventListener =
+      appboxoPaymentEventEmitter.addListener('appboxo_payment_events', event => {
+          if (event.payment_event && event.app_id) {
+            eventHandler(event)
+          }
+        }
+      )
+    return () => appboxoEventListener.remove()
+  },
+
+  /**
+   * Send events to miniapp
+   * @param {AppboxoPaymentEvent} event to send to miniapp
+   * */
+  send: (event) => {
+    const { Rnappboxosdk: { sendPaymentEvent } } = NativeModules
+    sendPaymentEvent(event)
+  },
+}
+
+export default paymentEvents

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@appboxo/react-native-sdk",
   "title": "Appboxo react native sdk",
-  "version": "1.0.32",
+  "version": "1.0.34",
   "description": "Appboxo react native sdk",
   "main": "index.js",
   "files": [
@@ -35,11 +35,11 @@
   "license": "Apache-2.0",
   "readmeFilename": "README.md",
   "peerDependencies": {
-    "react": "^16.8.1",
+    "react": ">=16.8.1 <= 18.2.0",
     "react-native": ">=0.60.0-rc.0 <1.0.x"
   },
   "devDependencies": {
-    "react": "^16.9.0",
-    "react-native": "^0.61.5"
+    "react": "18.2.0",
+    "react-native": "0.72.4"
   }
 }

package/react-native-appboxosdk.podspec

@@ -22,7 +22,7 @@ Pod::Spec.new do |s|
   s.requires_arc = true
 
   s.dependency "React"
-  s.dependency 'AppBoxoSDK', '1.3.37'
+  s.dependency 'AppBoxoSDK', '1.4.12'
   # ...
   # s.dependency "..."
 end