feature: enable handling input notifications

Author: tbozhikov

demo/app/messaging-view-model.ts

@@ -47,6 +47,14 @@ export class MessagingViewModel {
           title: "Not on lock screen",
           options: messaging.IosInteractiveNotificationActionOptions.authenticationRequired
         },
+        {
+          identifier: "INPUT_ACTION",
+          title: "Reply",
+          options: messaging.IosInteractiveNotificationActionOptions.foreground,
+          type: "input",
+          submitLabel: "Fire!",
+          placeholder: "Load the gun..."
+        },
         {
           identifier: "DELETE_ACTION",
           title: "Delete and open",
@@ -56,17 +64,15 @@ export class MessagingViewModel {
       model.iosSettings.interactiveSettings.categories = [
         {
           identifier: "GENERAL"
-          // actionsForDefaultContext: ['OPEN_ACTION', 'IGNORE_ACTION', 'DELETE_ACTION'],
-          // actionsForMinimalContext: ['OPEN_ACTION', 'IGNORE_ACTION', 'DELETE_ACTION']
         }
       ];
 
-      model.onNotificationActionTakenCallback = (actionIdentifier: string, message: firebase.Message) => {
+      model.onNotificationActionTakenCallback = (actionIdentifier: string, message: firebase.Message, inputText?: string) => {
         console.log(`onNotificationActionTakenCallback fired! \n\r Message: ${JSON.stringify(message)}, \n\r Action taken: ${actionIdentifier}`);
 
         alert({
           title: "Interactive push action",
-          message: `Message: ${JSON.stringify(message)}, \n\r Action taken: ${actionIdentifier}`,
+          message: `Message: ${JSON.stringify(message)}, \n\r Action taken: ${actionIdentifier}` + (inputText ? `, \n\r Input text: ${inputText}` : ""),
           okButtonText: "Nice!"
         });
       };

src/firebase.ios.ts

@@ -1776,7 +1776,7 @@ firebase.firestore.Transaction = (nativeTransaction: FIRTransaction): firestore.
 };
 
 firebase.firestore.runTransaction = (updateFunction: (transaction: firestore.Transaction) => Promise<any>): Promise<void> => {
-  return new Promise((resolve, reject) => {
+  return new Promise<void>((resolve, reject) => {
     FIRFirestore.firestore().runTransactionWithBlockCompletion(
         (nativeTransaction: FIRTransaction, err: any) => {
           const tx = new firebase.firestore.Transaction(nativeTransaction);
@@ -1930,7 +1930,7 @@ firebase.firestore.add = (collectionPath: string, document: any): Promise<firest
 };
 
 firebase.firestore.set = (collectionPath: string, documentPath: string, document: any, options?: firestore.SetOptions): Promise<void> => {
-  return new Promise((resolve, reject) => {
+  return new Promise<void>((resolve, reject) => {
     try {
       if (typeof(FIRFirestore) === "undefined") {
         reject("Make sure 'Firebase/Firestore' is in the plugin's Podfile");
@@ -1988,7 +1988,7 @@ function fixSpecialFields(item) {
 }
 
 firebase.firestore.update = (collectionPath: string, documentPath: string, document: any): Promise<void> => {
-  return new Promise((resolve, reject) => {
+  return new Promise<void>((resolve, reject) => {
     try {
       if (typeof(FIRFirestore) === "undefined") {
         reject("Make sure 'Firebase/Firestore' is in the plugin's Podfile");
@@ -2016,7 +2016,7 @@ firebase.firestore.update = (collectionPath: string, documentPath: string, docum
 };
 
 firebase.firestore.delete = (collectionPath: string, documentPath: string): Promise<void> => {
-  return new Promise((resolve, reject) => {
+  return new Promise<void>((resolve, reject) => {
     try {
       if (typeof(FIRFirestore) === "undefined") {
         reject("Make sure 'Firebase/Firestore' is in the plugin's Podfile");

src/messaging/messaging.d.ts

@@ -30,15 +30,15 @@ export declare class IosInteractivePushSettings {
     foreground = 4,
   }
 
-  export declare interface IosInteractiveNotificationAction {
+  export interface IosInteractiveNotificationAction {
     identifier: string;
     title: string;
-    // activationMode?: string;
-    // destructive?: boolean;
-    // authenticationRequired?: boolean;
+    type: string;
+    submitLabel: string;
+    placeholder: string;
     options?: IosInteractiveNotificationActionOptions;
     behavior?: string;
-  }
+}
 
   export declare interface IosInteractiveNotificationCategory {
     identifier: string;

src/messaging/messaging.ios.ts

@@ -143,14 +143,32 @@ export function addBackgroundRemoteNotificationHandler(appDelegate) {
   };
 }
 
-export function registerForInteractivePush(model?: any) {
+export function registerForInteractivePush(model?: PushNotificationModel) {
   let nativeActions: Array<UNNotificationAction> = [];
 
-  model.iosSettings.interactiveSettings.actions.forEach(action => {
-    let nativeAction = UNNotificationAction.actionWithIdentifierTitleOptions(action.identifier, action.title, action.options | UNNotificationActionOptionNone);
+  model.iosSettings.interactiveSettings.actions.forEach(((action: IosInteractiveNotificationAction) => {
+    let notificationActionOptions: UNNotificationActionOptions = action.options ? <UNNotificationActionOptions>action.options.valueOf() : UNNotificationActionOptionNone;
+    let actionType = action.type || "button";
+    let nativeAction: UNNotificationAction;
+
+    if (actionType === "input") {
+      nativeAction = UNTextInputNotificationAction.actionWithIdentifierTitleOptionsTextInputButtonTitleTextInputPlaceholder(
+        action.identifier,
+        action.title,
+        notificationActionOptions,
+        action.submitLabel || "Submit",
+        action.placeholder);
+    } else if (actionType === "button") {
+      nativeAction = UNNotificationAction.actionWithIdentifierTitleOptions(
+        action.identifier,
+        action.title,
+        notificationActionOptions);
+    } else {
+      console.log("Unsupported action type: " + action.type);
+    }
 
     nativeActions.push(nativeAction);
-  });
+  }));
 
   let actions: NSArray<UNNotificationAction> = <NSArray<UNNotificationAction>>NSArray.arrayWithArray(<any>nativeActions);
   let nativeCategories: Array<UNNotificationCategory> = [];
@@ -273,6 +291,9 @@ export enum IosInteractiveNotificationActionOptions {
 export interface IosInteractiveNotificationAction {
   identifier: string;
   title: string;
+  type: string;
+  submitLabel: string;
+  placeholder: string;
   // activationMode?: string;
   // destructive?: boolean;
   // authenticationRequired?: boolean;
@@ -303,6 +324,11 @@ export class PushNotificationModel {
   iosSettings: IosPushSettings;
   onNotificationActionTakenCallback: Function;
 }
+export class NotificationActionResponse {
+  androidSettings: any;
+  iosSettings: IosPushSettings;
+  onNotificationActionTakenCallback: Function;
+}
 
 export function areNotificationsEnabled() {
   let app = iOSUtils.getter(UIApplication, UIApplication.sharedApplication);
@@ -345,7 +371,7 @@ function _registerForRemoteNotifications() {
       }
     });
 
-    _userNotificationCenterDelegate = UNUserNotificationCenterDelegateImpl.new().initWithCallback((unnotification, actionIdentifier?) => {
+    _userNotificationCenterDelegate = UNUserNotificationCenterDelegateImpl.new().initWithCallback((unnotification, actionIdentifier?, inputText?) => {
       // if the app is in the foreground then this method will receive the notification
       // if the app is in the background, and user has responded to interactive notification, then this method will receive the notification
       // if the app is in the background, and user views a notification, applicationDidReceiveRemoteNotificationFetchCompletionHandler will receive it
@@ -371,7 +397,7 @@ function _registerForRemoteNotifications() {
         userInfoJSON.aps = undefined;
         // TODO: THIS CODE UP IS DUPLICATE, REFACTOR!!!!
 
-        _notificationActionTakenCallback(actionIdentifier, userInfoJSON);
+        _notificationActionTakenCallback(actionIdentifier, userInfoJSON, inputText);
       }
 
       userInfoJSON.foreground = true;
@@ -500,9 +526,9 @@ class UNUserNotificationCenterDelegateImpl extends NSObject implements UNUserNot
     return <UNUserNotificationCenterDelegateImpl>super.new();
   }
 
-  private callback: (unnotification: UNNotification, actionIdentifier?: string) => void;
+  private callback: (unnotification: UNNotification, actionIdentifier?: string, inputText?: string) => void;
 
-  public initWithCallback(callback: (unnotification: UNNotification, actionIdentifier?: string) => void): UNUserNotificationCenterDelegateImpl {
+  public initWithCallback(callback: (unnotification: UNNotification, actionIdentifier?: string, inputText?: string) => void): UNUserNotificationCenterDelegateImpl {
     this.callback = callback;
     return this;
   }
@@ -524,9 +550,10 @@ class UNUserNotificationCenterDelegateImpl extends NSObject implements UNUserNot
   }
 
   public userNotificationCenterDidReceiveNotificationResponseWithCompletionHandler(center: UNUserNotificationCenter, response: UNNotificationResponse, completionHandler: () => void): void {
-    console.log(">>>>>>>>>>> Handle push");
+    console.log("Notification action response");
     console.log(response);
-    this.callback(response.notification, response.actionIdentifier);
+
+    this.callback(response.notification, response.actionIdentifier, (<UNTextInputNotificationResponse>response).userText);
     completionHandler();
   }
 }