infobip-mobile-messaging-react-native-plugin 14.9.0 → 14.9.1

package/android/build.gradle

@@ -66,7 +66,7 @@ repositories {
 }
 
 dependencies {
-    def mmVersion = '14.14.2'
+    def mmVersion = '15.0.0'
     implementation "org.jetbrains.kotlin:kotlin-stdlib:2.1.20"
     compileOnly "com.facebook.react:react-android"
     implementation "androidx.annotation:annotation:1.9.1"

package/android/src/main/AndroidManifest.xml

@@ -1,5 +1,4 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          xmlns:tools="http://schemas.android.com/tools">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <!-- Mobile Messaging permissions -->
 
@@ -20,10 +19,7 @@
     <uses-permission android:name="android.permission.CAMERA" />
     <!-- Infobip rtc ui permissions -->
 
-    <application
-            tools:replace="android:usesCleartextTraffic"
-                   android:usesCleartextTraffic="true"
-    >
+    <application>
         <!-- Mobile Messaging components -->
         <service
             android:name="org.infobip.mobile.messaging.platform.MobileMessagingJobService"

package/android/src/main/java/org/infobip/reactlibrary/mobilemessaging/ReactNativeMobileMessagingService.kt

@@ -417,6 +417,7 @@ class ReactNativeMobileMessagingService(
                 ctx.userAttributes,
                 ctx.forceDepersonalize,
                 ctx.keepAsLead,
+                ctx.setDeviceAsPrimary,
                 object : MobileMessaging.ResultListener<User>() {
                     override fun onResult(result: Result<User, MobileMessagingError>) {
                         if (result.isSuccess()) {
@@ -448,6 +449,7 @@ class ReactNativeMobileMessagingService(
             mobileMessaging.depersonalize(object : MobileMessaging.ResultListener<SuccessPending>() {
                 override fun onResult(result: Result<SuccessPending, MobileMessagingError>) {
                     if (result.isSuccess) {
+                        mobileMessaging.setJwtSupplier { null }
                         val state = when (result.data) {
                             SuccessPending.Pending -> "pending"
                             SuccessPending.Success -> "success"
@@ -510,10 +512,25 @@ class ReactNativeMobileMessagingService(
         successCallback.invoke(readableMap)
     }
 
+    fun cleanup(successCallback: Callback, errorCallback: Callback) {
+        RNMMLogger.d(Utils.TAG, "Cleanup...")
+        try {
+            mobileMessaging.setJwtSupplier { null }
+            mobileMessaging.cleanup()
+            successCallback.invoke()
+        } catch (e: Exception) {
+            errorCallback.invoke(Utils.callbackError(e.message, null))
+        }
+    }
+
     fun setUserDataJwt(jwt: String?, successCallback: Callback, errorCallback: Callback) {
         RNMMLogger.d(Utils.TAG, "SetUserDataJwt...")
         try {
-            mobileMessaging.setJwtSupplier({ jwt })
+            if (jwt.isNullOrEmpty()) {
+                mobileMessaging.setJwtSupplier(null)
+            } else {
+                mobileMessaging.setJwtSupplier { jwt }
+            }
             successCallback.invoke()
         } catch (e: Exception) {
             errorCallback.invoke(Utils.callbackError(e.message, null))

package/android/src/newarchitecture/java/org/infobip/reactlibrary/mobilemessaging/MobileMessagingModule.kt

@@ -160,6 +160,12 @@ class MobileMessagingModule(reactContext: ReactApplicationContext) : NativeMobil
         service.showDialogForError(errorCode, successCallback, errorCallback)
     }
 
+    // Cleanup
+    override fun cleanup(successCallback: Callback, errorCallback: Callback) {
+        RNMMLogger.d(TAG, "Cleanup...")
+        service.cleanup(successCallback, errorCallback)
+    }
+
     // JWT
     override fun setUserDataJwt(jwt: String?, successCallback: Callback, errorCallback: Callback) {
         RNMMLogger.d(TAG, "SetUserDataJwt...")

package/android/src/oldarchitecture/java/org/infobip/reactlibrary/mobilemessaging/MobileMessagingModule.kt

@@ -187,6 +187,13 @@ class MobileMessagingModule(reactContext: ReactApplicationContext) : ReactContex
         service.submitEventImmediately(eventData, successCallback, errorCallback)
     }
 
+    // Cleanup
+    @ReactMethod
+    fun cleanup(successCallback: Callback, errorCallback: Callback) {
+        RNMMLogger.d(TAG, "Cleanup...")
+        service.cleanup(successCallback, errorCallback)
+    }
+
     // JWT
     @ReactMethod
     fun setUserDataJwt(jwt: String?, successCallback: Callback, errorCallback: Callback) {

package/infobip-mobile-messaging-react-native-plugin.podspec

@@ -1,7 +1,7 @@
 require "json"
 
 package = JSON.parse(File.read(File.join(__dir__, "package.json")))
-mmVersion = "15.0.0"
+mmVersion = "15.5.0"
 
 Pod::Spec.new do |s|
   s.name         = "infobip-mobile-messaging-react-native-plugin"

package/ios/MobileMessagingPlugin/RNMobileMessaging.swift

@@ -384,7 +384,8 @@ class ReactNativeMobileMessaging: RCTEventEmitter  {
         let ua = uaDict == nil ? nil : MMUserAttributes(dictRepresentation: uaDict!)
         let keepAsLead = (context["keepAsLead"] as? Bool) ?? false
         let forceDepersonalize = context["forceDepersonalize"] as? Bool ?? false
-        MobileMessaging.personalize(forceDepersonalize: forceDepersonalize, keepAsLead: keepAsLead, userIdentity: ui, userAttributes: ua) { (error) in
+        let setDeviceAsPrimary = (context["setDeviceAsPrimary"] as? Bool) ?? false
+        MobileMessaging.personalize(forceDepersonalize: forceDepersonalize, keepAsLead: keepAsLead, setDeviceAsPrimary: setDeviceAsPrimary, userIdentity: ui, userAttributes: ua) { (error) in
             if let error = error {
                 onError([error.reactNativeObject])
             } else {
@@ -396,12 +397,15 @@ class ReactNativeMobileMessaging: RCTEventEmitter  {
     @objc(depersonalize:onError:)
     func depersonalize(onSuccess: @escaping RCTResponseSenderBlock, onError: @escaping RCTResponseSenderBlock) {
         MobileMessaging.depersonalize(completion: { (status, error) in
-            if (status == MMSuccessPending.pending) {
-                onSuccess(["pending"])
-            } else if let error = error {
+            if let error = error {
                 onError([error.reactNativeObject])
             } else {
-                onSuccess(["success"])
+                MobileMessaging.jwtSupplier = nil
+                if (status == MMSuccessPending.pending) {
+                    onSuccess(["pending"])
+                } else {
+                    onSuccess(["success"])
+                }
             }
         })
     }
@@ -528,9 +532,22 @@ class ReactNativeMobileMessaging: RCTEventEmitter  {
         onError([NSError(type: .NotSupported).reactNativeObject])
     }
 
+    @objc(cleanup:onError:)
+    func cleanup(onSuccess: @escaping RCTResponseSenderBlock, onError: @escaping RCTResponseSenderBlock) {
+        MobileMessaging.jwtSupplier = nil
+        RNMobileMessagingConfiguration.saveConfigToDefaults(rawConfig: [:])
+        MobileMessaging.cleanUpAndStop(false, completion: {
+            onSuccess([])
+        })
+    }
+
     @objc(setUserDataJwt:onSuccess:onError:)
     func setUserDataJwt(jwt: String?, onSuccess: @escaping RCTResponseSenderBlock, onError: @escaping RCTResponseSenderBlock) {
-      MobileMessaging.jwtSupplier = VariableJwtSupplier(jwt: jwt)
+      if let jwt = jwt, !jwt.isEmpty {
+          MobileMessaging.jwtSupplier = VariableJwtSupplier(jwt: jwt)
+      } else {
+          MobileMessaging.jwtSupplier = nil
+      }
       onSuccess(nil)
     }
 

package/ios/MobileMessagingPlugin/RNMobileMessagingBridge.m

@@ -54,6 +54,9 @@ RCT_EXTERN_METHOD(fetchInboxMessages:(NSString *)token externalUserId:(NSString
 RCT_EXTERN_METHOD(fetchInboxMessagesWithoutToken:(NSString *)externalUserId inboxFilterOptions:(NSDictionary *)inboxFilterOptions onSuccess:(RCTResponseSenderBlock)successCallback onError:(RCTResponseSenderBlock)errorCallback)
 RCT_EXTERN_METHOD(setInboxMessagesSeen:(NSString *)externalUserId messages:(NSArray *)messages onSuccess:(RCTResponseSenderBlock)successCallback onError:(RCTResponseSenderBlock)errorCallback)
 
+/*Cleanup*/
+RCT_EXTERN_METHOD(cleanup:(RCTResponseSenderBlock)onSuccess onError:(RCTResponseSenderBlock)onError)
+
 /*JWT*/
 RCT_EXTERN_METHOD(setUserDataJwt:(NSString *)jwt onSuccess:(RCTResponseSenderBlock)successCallback onError:(RCTResponseSenderBlock)errorCallback)
 @end

package/ios/MobileMessagingPlugin/RNMobileMessagingConfiguration.swift

@@ -154,6 +154,7 @@ class RNMobileMessagingConfiguration {
     private static func serializedConfig(from rawConfig: [String: AnyObject]) -> [String: AnyObject] {
         var rawConfig = rawConfig
         rawConfig.removeValue(forKey: RNMobileMessagingConfiguration.Keys.applicationCode)
+        rawConfig.removeValue(forKey: RNMobileMessagingConfiguration.Keys.userDataJwt)
         sanitizePrivacySettings(in: &rawConfig)
 
         var serializableConfig = rawConfig.compactMapValues { value -> AnyObject? in

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "infobip-mobile-messaging-react-native-plugin",
   "title": "Infobip Mobile Messaging React Native Plugin",
-  "version": "14.9.0",
+  "version": "14.9.1",
   "description": "Infobip Mobile Messaging React Native Plugin",
   "main": "./src/index.js",
   "scripts": {

package/src/index.d.ts

@@ -147,6 +147,7 @@ declare namespace MobileMessagingReactNative {
         userAttributes?: Record<string, string | number | boolean | object[]>;
         forceDepersonalize?: boolean;
         keepAsLead?: boolean;
+        setDeviceAsPrimary?: boolean;
     }
 
     export interface Message {
@@ -723,6 +724,16 @@ declare namespace MobileMessagingReactNative {
          */
         setChatDomain(domain?: string): void;
 
+        /**
+         * Cleans up the SDK, removing all data and stopping all services.
+         * After cleanup, you should call init() again with a new configuration to restart the SDK.
+         * JWT supplier is also cleared during cleanup.
+         *
+         * @param onSuccess will be called on success
+         * @param onError will be called on error
+         */
+        cleanup(onSuccess: () => void, onError: (error: MobileMessagingError) => void): void;
+
         /**
          * Set JSON Web Token for user data operations and personalization.
          * @param jwt JWT token in predefined format

package/src/index.js

@@ -886,6 +886,19 @@ class MobileMessaging {
         RNMMChat.setChatDomain(domain);
     }
 
+    /**
+     * Cleans up the SDK, removing all data and stopping all services.
+     * After cleanup, you should call init() again with a new configuration to restart the SDK.
+     * JWT supplier is also cleared during cleanup.
+     *
+     * @name cleanup
+     * @param {Function} onSuccess will be called on success
+     * @param {Function} onError will be called on error
+     */
+    cleanup(onSuccess = function() {}, onError = function() {}) {
+        ReactNativeMobileMessaging.cleanup(onSuccess, onError);
+    }
+
     /**
      * Set JSON Web Token for user data operations and personalization.
      * @param {String} jwt JWT token in predefined format

package/src/specs/NativeMobileMessaging.ts

@@ -52,6 +52,9 @@ export interface Spec extends TurboModule {
     submitEvent(eventData: Object, onError: (error: Object) => void): void;
     submitEventImmediately(eventData: Object, onSuccess: () => void, onError: (error: Object) => void): void;
 
+    // Cleanup
+    cleanup(onSuccess: () => void, onError: (error: Object) => void): void;
+
     // JWT
     setUserDataJwt(jwt: string, onSuccess: () => void, onError: (error: Object) => void): void;