@trycourier/courier-react-native 2.0.2 → 2.1.0

package/README.md

@@ -96,10 +96,10 @@ buildscript {
     ext {
 
         // Double check these values
-        buildToolsVersion = "32.0.0"
+        buildToolsVersion = "33.0.0"
         minSdkVersion = 23
-        compileSdkVersion = 32
-        targetSdkVersion = 32
+        compileSdkVersion = 33
+        targetSdkVersion = 33
         ..
     }
 
@@ -118,6 +118,22 @@ buildscript {
 
  
 
+### 3. Extend the `CourierReactNativeActivity`
+
+In your Android project, change your `MainActivity` to extend the `CourierReactNativeActivity`.
+
+This allows the Courier SDK to manage the current user between app sessions.
+
+```java
+import com.courierreactnative.CourierReactNativeActivity;
+
+public class MainActivity extends CourierReactNativeActivity {
+    ..
+}
+```
+
+ 
+
 # Getting Started
 
 These are all the available features of the SDK.
@@ -136,12 +152,12 @@ These are all the available features of the SDK.
                 1
             </td>
             <td align="left">
-                <a href="https://github.com/trycourier/courier-react-native/blob/feature/courier-inbox/Docs/Authentication.md">
+                <a href="https://github.com/trycourier/courier-react-native/blob/master/Docs/Authentication.md">
                     <code>Authentication</code>
                 </a>
             </td>
             <td align="left">
-                Manages user credentials between app sessions. Required if you would like to use <a href="https://github.com/trycourier/courier-react-native/blob/feature/courier-inbox/Docs/Inbox.md"><code>Courier Inbox</code></a> and <a href="https://github.com/trycourier/courier-react-native/blob/feature/courier-inbox/Docs/PushNotifications.md"><code>Push Notifications</code></a>.
+                Manages user credentials between app sessions. Required if you would like to use <a href="https://github.com/trycourier/courier-react-native/blob/master/Docs/Inbox.md"><code>Courier Inbox</code></a> and <a href="https://github.com/trycourier/courier-react-native/blob/master/Docs/PushNotifications.md"><code>Push Notifications</code></a>.
             </td>
         </tr>
         <tr width="600px">
@@ -149,7 +165,7 @@ These are all the available features of the SDK.
                 2
             </td>
             <td align="left">
-                <a href="https://github.com/trycourier/courier-react-native/blob/feature/courier-inbox/Docs/Inbox.md">
+                <a href="https://github.com/trycourier/courier-react-native/blob/master/Docs/Inbox.md">
                     <code>Courier Inbox</code>
                 </a>
             </td>
@@ -162,7 +178,7 @@ These are all the available features of the SDK.
                 3
             </td>
             <td align="left">
-                <a href="https://github.com/trycourier/courier-react-native/blob/feature/courier-inbox/Docs/PushNotifications.md">
+                <a href="https://github.com/trycourier/courier-react-native/blob/master/Docs/PushNotifications.md">
                     <code>Push Notifications</code>
                 </a>
             </td>
@@ -170,6 +186,19 @@ These are all the available features of the SDK.
                 Automatically manages push notification device tokens and gives convenient functions for handling push notification receiving and clicking.
             </td>
         </tr>
+        <tr width="600px">
+            <td align="center">
+                4
+            </td>
+            <td align="left">
+                <a href="https://github.com/trycourier/courier-react-native/blob/master/Docs/Preferences.md">
+                    <code>Preferences</code>
+                </a>
+            </td>
+            <td align="left">
+                Allow users to update which types of notifications they would like to receive.
+            </td>
+        </tr>
     </tbody>
 </table>
 
@@ -188,7 +217,7 @@ Starter projects using this SDK.
     <tbody>
         <tr width="1000px">
             <td align="left">
-                <a href="https://github.com/trycourier/courier-react-native/tree/feature/courier-inbox/example">
+                <a href="https://github.com/trycourier/courier-react-native/tree/master/example">
                     <code>Example</code>
                 </a>
             </td>

package/android/build.gradle

@@ -101,7 +101,7 @@ dependencies {
   implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
 
   // Courier Core SDK
-  api 'com.github.trycourier:courier-android:2.0.37'
+  api 'com.github.trycourier:courier-android:2.1.1'
   api 'androidx.recyclerview:recyclerview:1.3.1'
 
 }

package/android/src/main/java/com/courierreactnative/CourierReactNativeModule.kt

@@ -274,4 +274,54 @@ class CourierReactNativeModule(reactContext: ReactApplicationContext) : ReactCon
     return Courier.shared.inboxPaginationLimit.toString()
   }
 
+  @ReactMethod
+  fun getUserPreferences(paginationCursor: String, promise: Promise) {
+
+    val cursor = if (paginationCursor != "") paginationCursor else null
+
+    Courier.shared.getUserPreferences(
+      paginationCursor = cursor,
+      onSuccess = { preferences ->
+        promise.resolve(preferences.toWritableMap())
+      },
+      onFailure = { e ->
+        promise.reject(CourierEvents.COURIER_ERROR_TAG, e)
+      }
+    )
+
+  }
+
+  @ReactMethod
+  fun getUserPreferencesTopic(topicId: String, promise: Promise) {
+    Courier.shared.getUserPreferenceTopic(
+      topicId = topicId,
+      onSuccess = { topic ->
+        promise.resolve(topic.toWritableMap())
+      },
+      onFailure = { e ->
+        promise.reject(CourierEvents.COURIER_ERROR_TAG, e)
+      }
+    )
+  }
+
+  @ReactMethod
+  fun putUserPreferencesTopic(topicId: String, status: String, hasCustomRouting: Boolean, customRouting: ReadableArray, promise: Promise) {
+
+    val routing = customRouting.toArrayList().map { CourierPreferenceChannel.fromString(it as String) }
+
+    Courier.shared.putUserPreferenceTopic(
+      topicId = topicId,
+      status = CourierPreferenceStatus.fromString(status),
+      hasCustomRouting = hasCustomRouting,
+      customRouting = routing,
+      onSuccess = {
+        promise.resolve(null)
+      },
+      onFailure = { e ->
+        promise.reject(CourierEvents.COURIER_ERROR_TAG, e)
+      }
+    )
+
+  }
+
 }

package/android/src/main/java/com/courierreactnative/Extensions.kt

@@ -1,7 +1,6 @@
 package com.courierreactnative
 
-import com.courier.android.models.InboxAction
-import com.courier.android.models.InboxMessage
+import com.courier.android.models.*
 import com.facebook.react.bridge.Arguments
 import com.facebook.react.bridge.ReactContext
 import com.facebook.react.bridge.WritableArray
@@ -12,9 +11,58 @@ internal fun ReactContext.sendEvent(eventName: String, value: Any?) {
   getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter::class.java).emit(eventName, value)
 }
 
+internal fun CourierUserPreferences.toWritableMap(): WritableMap {
+
+  val map = Arguments.createMap()
+
+  val itemsArray = Arguments.createArray()
+  items.forEach { topic ->
+    itemsArray.pushMap(topic.toWritableMap())
+  }
+  map.putArray("items", itemsArray)
+
+  map.putMap("paging", paging.toWritableMap())
+
+  return map
+
+}
+
+internal fun CourierPreferenceTopic.toWritableMap(): WritableMap {
+
+  val map = Arguments.createMap()
+  map.putString("defaultStatus", defaultStatus.value)
+  map.putBoolean("hasCustomRouting", hasCustomRouting)
+  map.putString("status", status.value)
+  map.putString("topicId", topicId)
+  map.putString("topicName", topicName)
+
+  val actionsArray = Arguments.createArray()
+  customRouting.forEach { routing ->
+    actionsArray.pushString(routing.value)
+  }
+  map.putArray("customRouting", actionsArray)
+
+  return map
+
+}
+
+internal fun Paging.toWritableMap(): WritableMap {
+
+  val map = Arguments.createMap()
+
+  cursor?.let {
+    map.putString("cursor", it)
+  }
+
+  map.putBoolean("more", more)
+
+  return map
+
+}
+
 @JvmName("toWritableArrayInboxMessage")
 internal fun List<InboxMessage>.toWritableArray(): WritableArray {
-  
+
   val messagesArray = Arguments.createArray()
 
   forEach { message ->

package/courier-react-native.podspec

@@ -17,7 +17,7 @@ Pod::Spec.new do |s|
   s.source_files = "ios/**/*.{h,m,mm,swift}"
   
   # Courier Core Dependency
-  s.dependency "Courier_iOS", "2.0.4"
+  s.dependency "Courier_iOS", "2.1.3"
 
   # Use install_modules_dependencies helper to install the dependencies if React Native version >=0.71.0.
   # See https://github.com/facebook/react-native/blob/febf6b7f33fdb4904669f99d795eba4c0f95d7bf/scripts/cocoapods/new_architecture.rb#L79.

package/ios/CourierReactNative.xcodeproj/project.xcworkspace/contents.xcworkspacedata

@@ -1,4 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Workspace
    version = "1.0">
+   <FileRef
+      location = "self:">
+   </FileRef>
 </Workspace>

package/ios/CourierReactNativeModule.m

@@ -95,6 +95,33 @@ RCT_EXTERN__BLOCKING_SYNCHRONOUS_METHOD(
   setInboxPaginationLimit: (double)limit
 )
 
+RCT_EXTERN_METHOD(
+  getUserPreferences: (NSString*)paginationCursor
+  withResolver: (RCTPromiseResolveBlock)resolve
+  withRejecter: (RCTPromiseRejectBlock)reject
+)
+
+RCT_EXTERN_METHOD(
+  getUserPreferencesTopic: (NSString*)topicId
+  withResolver: (RCTPromiseResolveBlock)resolve
+  withRejecter: (RCTPromiseRejectBlock)reject
+)
+
+RCT_EXTERN_METHOD(
+  getUserPreferencesTopic: (NSString*)topicId
+  withResolver: (RCTPromiseResolveBlock)resolve
+  withRejecter: (RCTPromiseRejectBlock)reject
+)
+
+RCT_EXTERN_METHOD(
+  putUserPreferencesTopic: (NSString*)topicId
+  withStatus: (NSString*)status
+  withHasCustomRouting: (BOOL*)hasCustomRouting
+  withCustomRouting: (NSArray*)customRouting
+  withResolver: (RCTPromiseResolveBlock)resolve
+  withRejecter: (RCTPromiseRejectBlock)reject
+)
+
 RCT_EXTERN_METHOD(
   registerPushNotificationClickedOnKilledState
 )

package/ios/CourierReactNativeModule.swift

@@ -380,6 +380,57 @@ class CourierReactNativeModule: RCTEventEmitter {
         Courier.shared.inboxPaginationLimit = Int(limit)
         return String(describing: Courier.shared.inboxPaginationLimit)
     }
+    
+    @objc(getUserPreferences: withResolver: withRejecter:)
+    func getUserPreferences(paginationCursor: NSString, resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) {
+        
+        let cursor = paginationCursor != "" ? paginationCursor as String : nil
+        
+        Courier.shared.getUserPreferences(
+            paginationCursor: cursor,
+            onSuccess: { preferences in
+                resolve(preferences.toDictionary())
+            },
+            onFailure: { error in
+                reject(String(describing: error), CourierReactNativeModule.COURIER_ERROR_TAG, nil)
+            }
+        )
+        
+    }
+    
+    @objc(getUserPreferencesTopic: withResolver: withRejecter:)
+    func getUserPreferencesTopic(topicId: NSString, resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) {
+        
+        Courier.shared.getUserPreferencesTopic(
+            topicId: topicId as String,
+            onSuccess: { topic in
+                resolve(topic.toDictionary())
+            },
+            onFailure: { error in
+                reject(String(describing: error), CourierReactNativeModule.COURIER_ERROR_TAG, nil)
+            }
+        )
+        
+    }
+    
+    @objc(putUserPreferencesTopic: withStatus: withHasCustomRouting: withCustomRouting: withResolver: withRejecter:)
+        func putUserPreferencesTopic(topicId: NSString, status: NSString, hasCustomRouting: Bool, customRouting: [NSString], resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) {
+
+        
+        Courier.shared.putUserPreferencesTopic(
+            topicId: topicId as String,
+            status: CourierUserPreferencesStatus(rawValue: status as String) ?? .unknown,
+            hasCustomRouting: hasCustomRouting,
+            customRouting: customRouting.map { CourierUserPreferencesChannel(rawValue: $0 as String) ?? .unknown },
+            onSuccess: {
+                resolve(nil)
+            },
+            onFailure: { error in
+                reject(String(describing: error), CourierReactNativeModule.COURIER_ERROR_TAG, nil)
+            }
+        )
+        
+    }
 
     override func supportedEvents() -> [String]! {
         return [
@@ -432,18 +483,3 @@ extension NSDictionary {
     }
     
 }
-
-extension UNAuthorizationStatus {
-
-    var name: String {
-        switch (self) {
-        case .notDetermined: return "notDetermined"
-        case .denied: return "denied"
-        case .authorized: return "authorized"
-        case .provisional: return "provisional"
-        case .ephemeral: return "ephemeral"
-        @unknown default: return "unknown"
-        }
-    }
-
-}

package/ios/CourierReactNativeViewManager.swift

@@ -219,126 +219,3 @@ class CourierReactNativeView : UIView {
     }
     
 }
-
-internal extension InboxMessage {
-    
-    @objc func toDictionary() -> NSDictionary {
-        
-        let dictionary: [String: Any?] = [
-            "messageId": messageId,
-            "title": title,
-            "body": body,
-            "preview": preview,
-            "created": created,
-            "actions": actions?.map { $0.toDictionary() },
-            "data": data,
-            "read": isRead,
-            "opened": isOpened,
-            "archived": isArchived
-        ]
-
-        let mutableDictionary = NSMutableDictionary()
-        for (key, value) in dictionary {
-            if let unwrappedValue = value {
-                mutableDictionary[key] = unwrappedValue
-            }
-        }
-
-        return mutableDictionary
-        
-    }
-    
-}
-
-internal extension InboxAction {
-    
-    @objc func toDictionary() -> NSDictionary {
-        
-        let dictionary: [String: Any?] = [
-            "content": content,
-            "href": href,
-            "data": data
-        ]
-
-        let mutableDictionary = NSMutableDictionary()
-        for (key, value) in dictionary {
-            if let unwrappedValue = value {
-                mutableDictionary[key] = unwrappedValue
-            }
-        }
-
-        return mutableDictionary
-        
-    }
-    
-}
-
-internal extension String {
-    
-    func toRowAnimation() -> UITableView.RowAnimation {
-        
-        switch self.lowercased() {
-            case "fade": return .fade
-            case "right": return .right
-            case "left": return .left
-            case "top": return .top
-            case "bottom": return .bottom
-            case "none": return .none
-            case "middle": return .middle
-            case "automatic":
-                if #available(iOS 11.0, *) {
-                    return .automatic
-                } else {
-                    return .fade
-                }
-            default: return .fade
-        }
-        
-    }
-    
-    func toSeparatorStyle() -> UITableViewCell.SeparatorStyle {
-        
-        switch self.lowercased() {
-            case "none": return .none
-            case "singleLine": return .singleLine
-            case "singleLineEtched": return .singleLineEtched
-            default: return .singleLine
-        }
-        
-    }
-    
-    func toSelectionStyle() -> UITableViewCell.SelectionStyle? {
-        
-        switch self.lowercased() {
-            case "none": return .none
-            case "blue": return .blue
-            case "gray": return .gray
-            case "default": return .default
-            default: return .default
-        }
-        
-    }
-    
-    func toColor() -> UIColor? {
-        
-        var hexSanitized = trimmingCharacters(in: .whitespacesAndNewlines)
-        hexSanitized = hexSanitized.replacingOccurrences(of: "#", with: "")
-
-        var rgb: UInt64 = 0
-
-        Scanner(string: hexSanitized).scanHexInt64(&rgb)
-
-        guard hexSanitized.count == 6 else {
-            return nil
-        }
-
-        return UIColor(
-            red: CGFloat((rgb & 0xFF0000) >> 16) / 255.0,
-            green: CGFloat((rgb & 0x00FF00) >> 8) / 255.0,
-            blue: CGFloat(rgb & 0x0000FF) / 255.0,
-            alpha: 1.0
-        )
-        
-    }
-    
-}

package/ios/Utils.swift

@@ -0,0 +1,199 @@
+//
+//  Utils.swift
+//  courier-react-native
+//
+//  Created by Michael Miller on 10/23/23.
+//
+
+import Foundation
+import Courier_iOS
+
+extension UNAuthorizationStatus {
+
+    var name: String {
+        switch (self) {
+        case .notDetermined: return "notDetermined"
+        case .denied: return "denied"
+        case .authorized: return "authorized"
+        case .provisional: return "provisional"
+        case .ephemeral: return "ephemeral"
+        @unknown default: return "unknown"
+        }
+    }
+
+}
+
+internal extension [String: Any?] {
+    
+    func clean() -> NSMutableDictionary {
+        
+        let mutableDictionary = NSMutableDictionary()
+        for (key, value) in self {
+            if let unwrappedValue = value {
+                mutableDictionary[key] = unwrappedValue
+            }
+        }
+        
+        return mutableDictionary
+        
+    }
+    
+}
+
+internal extension CourierUserPreferences {
+    
+    @objc func toDictionary() -> NSDictionary {
+        
+        let dictionary: [String: Any?] = [
+            "items": items.map { $0.toDictionary() },
+            "paging": paging.toDictionary(),
+        ]
+
+        return dictionary.clean()
+        
+    }
+    
+}
+
+internal extension CourierUserPreferencesTopic {
+    
+    @objc func toDictionary() -> NSDictionary {
+        
+        let dictionary: [String: Any?] = [
+            "defaultStatus": defaultStatus.rawValue,
+            "hasCustomRouting": hasCustomRouting,
+            "customRouting": customRouting.map { $0.rawValue },
+            "status": status,
+            "topicId": topicId,
+            "topicName": topicName,
+        ]
+
+        return dictionary.clean()
+        
+    }
+    
+}
+
+internal extension CourierUserPreferencesPaging {
+    
+    @objc func toDictionary() -> NSDictionary {
+        
+        let dictionary: [String: Any?] = [
+            "cursor": cursor,
+            "more": more,
+        ]
+
+        return dictionary.clean()
+        
+    }
+    
+}
+
+internal extension InboxMessage {
+    
+    @objc func toDictionary() -> NSDictionary {
+        
+        let dictionary: [String: Any?] = [
+            "messageId": messageId,
+            "title": title,
+            "body": body,
+            "preview": preview,
+            "created": created,
+            "actions": actions?.map { $0.toDictionary() },
+            "data": data,
+            "read": isRead,
+            "opened": isOpened,
+            "archived": isArchived
+        ]
+        
+        return dictionary.clean()
+        
+    }
+    
+}
+
+internal extension InboxAction {
+    
+    @objc func toDictionary() -> NSDictionary {
+        
+        let dictionary: [String: Any?] = [
+            "content": content,
+            "href": href,
+            "data": data
+        ]
+
+        return dictionary.clean()
+        
+    }
+    
+}
+
+internal extension String {
+    
+    func toRowAnimation() -> UITableView.RowAnimation {
+        
+        switch self.lowercased() {
+            case "fade": return .fade
+            case "right": return .right
+            case "left": return .left
+            case "top": return .top
+            case "bottom": return .bottom
+            case "none": return .none
+            case "middle": return .middle
+            case "automatic":
+                if #available(iOS 11.0, *) {
+                    return .automatic
+                } else {
+                    return .fade
+                }
+            default: return .fade
+        }
+        
+    }
+    
+    func toSeparatorStyle() -> UITableViewCell.SeparatorStyle {
+        
+        switch self.lowercased() {
+            case "none": return .none
+            case "singleLine": return .singleLine
+            case "singleLineEtched": return .singleLineEtched
+            default: return .singleLine
+        }
+        
+    }
+    
+    func toSelectionStyle() -> UITableViewCell.SelectionStyle? {
+        
+        switch self.lowercased() {
+            case "none": return .none
+            case "blue": return .blue
+            case "gray": return .gray
+            case "default": return .default
+            default: return .default
+        }
+        
+    }
+    
+    func toColor() -> UIColor? {
+        
+        var hexSanitized = trimmingCharacters(in: .whitespacesAndNewlines)
+        hexSanitized = hexSanitized.replacingOccurrences(of: "#", with: "")
+
+        var rgb: UInt64 = 0
+
+        Scanner(string: hexSanitized).scanHexInt64(&rgb)
+
+        guard hexSanitized.count == 6 else {
+            return nil
+        }
+
+        return UIColor(
+            red: CGFloat((rgb & 0xFF0000) >> 16) / 255.0,
+            green: CGFloat((rgb & 0x00FF00) >> 8) / 255.0,
+            blue: CGFloat(rgb & 0x0000FF) / 255.0,
+            alpha: 1.0
+        )
+        
+    }
+    
+}