fix(messaging): ios onNotificationTap

fixes: #42

Author: triniwiz

apps/demo-angular/nativescript.config.ts

@@ -1,7 +1,8 @@
 import { NativeScriptConfig } from '@nativescript/core';
 
 export default {
-	id: 'org.nativescript.plugindemoangular',
+	// id: 'org.nativescript.plugindemoangular',
+	id: 'io.github.triniwiz.nativescript.firebasedemo',
 	appResourcesPath: '../../tools/assets/App_Resources',
 	android: {
 		v8Flags: '--expose_gc',

apps/demo-angular/src/app.component.ts

@@ -1,9 +1,11 @@
 import { Component } from '@angular/core';
-
+import { AppService } from './app.service';
 @Component({
 	selector: 'demo-app',
 	template: `<GridLayout>
 		<page-router-outlet></page-router-outlet>
 	</GridLayout>`,
 })
-export class AppComponent {}
+export class AppComponent {
+	constructor(appService: AppService){}
+}

apps/demo-angular/src/app.module.ts

@@ -4,11 +4,13 @@ import { NativeScriptModule } from '@nativescript/angular';
 import { AppComponent } from './app.component';
 import { AppRoutingModule } from './app-routing.module';
 import { HomeComponent } from './home.component';
+import { AppService } from './app.service';
 
 @NgModule({
 	schemas: [NO_ERRORS_SCHEMA],
 	declarations: [AppComponent, HomeComponent],
 	bootstrap: [AppComponent],
 	imports: [NativeScriptModule, AppRoutingModule],
+	providers: [AppService]
 })
 export class AppModule {}

apps/demo-angular/src/app.service.ts

@@ -0,0 +1,21 @@
+import { Injectable } from '@angular/core';
+import { firebase } from '@nativescript/firebase-core';
+import '@nativescript/firebase-messaging';
+
+@Injectable()
+export class AppService {
+	constructor() {
+		const messaging = firebase().messaging();
+		messaging.onToken((token) => {
+			console.log('Firebase onToken', token);
+		});
+		messaging.onMessage((message) => {
+			console.log('Firebase onMessage', message);
+		});
+
+		messaging.onNotificationTap((message) => {
+			console.log('Firebase onNotificationTap', message);
+		});
+
+	}
+}

apps/demo-angular/src/main.ts

@@ -1,6 +1,32 @@
 import { runNativeScriptAngularApp, platformNativeScript } from '@nativescript/angular';
 import { AppModule } from './app.module';
+import { firebase } from '@nativescript/firebase-core';
+import { Application } from '@nativescript/core';
+
+Application.on('launch', (args) => {
+	console.log('launch');
+});
+
+firebase()
+	.initializeApp()
+	.then((done) => {
+		console.log('initializeApp');
+	});
+
+const messaging = firebase().messaging();
+
+messaging
+	.requestPermission()
+	.then(() => {
+		console.log('requestPermission', 'done');
+		messaging.registerDeviceForRemoteMessages().catch((e) => {
+			console.error('registerDeviceForRemoteMessages', e);
+		});
+	})
+	.catch((e) => {
+		console.error('requestPermission', e);
+	});
 
 runNativeScriptAngularApp({
-  appModuleBootstrap: () => platformNativeScript().bootstrapModule(AppModule),
-});
+	appModuleBootstrap: () => platformNativeScript().bootstrapModule(AppModule),
+});

packages/firebase-admob/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nativescript/firebase-admob",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "description": "NativeScript Firebase - Admob",
   "main": "index",
   "typings": "index.d.ts",

packages/firebase-analytics/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nativescript/firebase-analytics",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "description": "NativeScript Firebase - Analytics",
   "main": "index",
   "typings": "index.d.ts",

packages/firebase-app-check/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nativescript/firebase-app-check",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "description": "NativeScript Firebase - App Check",
   "main": "index",
   "typings": "index.d.ts",

packages/firebase-auth/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nativescript/firebase-auth",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "description": "NativeScript Firebase - Auth",
   "main": "index",
   "typings": "index.d.ts",

packages/firebase-core/index.ios.ts

@@ -234,6 +234,17 @@ export class FirebaseApp {
 	}
 }
 
+const launchQueue = [];
+
+declare const TNSFirebaseCore;
+
+const launchCallback = () => {
+	launchQueue.forEach((item) => item());
+	launchQueue.splice(0);
+};
+
+TNSFirebaseCore.setOnAppFinishLaunchingCallback(launchCallback);
+
 export class Firebase {
 	constructor() {
 		if (firebaseInstance) {
@@ -352,36 +363,32 @@ export class Firebase {
 					}
 					resolve(fbApp);
 				} catch (e) {
-					reject(new FirebaseError(e.message))
+					reject(new FirebaseError(e.message));
 				}
-			}
+			};
 
 			if (!UIApplication.sharedApplication) {
-				Application.ios.addNotificationObserver(
-					UIApplicationDidFinishLaunchingNotification,
-					(notification) => {
-						initApp();
-					}
-				)
+				launchQueue.push(() => {
+					initApp();
+				});
 			} else {
 				initApp();
 			}
-		})
+		});
 	}
 
 	initializeAppWithPath(path: string, options: FirebaseOptions = null, config?: FirebaseConfig) {
 		return new Promise((resolve, reject) => {
 			const initApp = () => {
 				try {
 					if (path.startsWith('res://')) {
-						path = NSBundle.mainBundle.pathForResourceOfType(path.replace('res://', '').replace('.plist', ''), 'plist')
+						path = NSBundle.mainBundle.pathForResourceOfType(path.replace('res://', '').replace('.plist', ''), 'plist');
 					} else if (path.startsWith('~/')) {
 						path = knownFolders.currentApp().path + '/' + path.replace('~/', '');
 					}
 
 					const nativeOptions = FIROptions.alloc().initWithContentsOfFile(path);
 
-
 					if (options?.apiKey) {
 						nativeOptions.APIKey = options.apiKey;
 					}
@@ -430,7 +437,6 @@ export class Firebase {
 						nativeOptions.trackingID = options.trackingId;
 					}
 
-
 					FIRApp.configureWithOptions(nativeOptions);
 
 					const app = FIRApp.defaultApp();
@@ -445,20 +451,17 @@ export class Firebase {
 					}
 					resolve(fbApp);
 				} catch (e) {
-					reject(new FirebaseError(e.message))
+					reject(new FirebaseError(e.message));
 				}
-			}
+			};
 			if (!UIApplication.sharedApplication) {
-				Application.ios.addNotificationObserver(
-					UIApplicationDidFinishLaunchingNotification,
-					(notification) => {
-						initApp();
-					}
-				)
+				launchQueue.push(() => {
+					initApp();
+				});
 			} else {
 				initApp();
 			}
-		})
+		});
 	}
 }
 

packages/firebase-core/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nativescript/firebase-core",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "description": "NativeScript Firebase - Core",
   "main": "index",
   "typings": "index.d.ts",

packages/firebase-core/platforms/ios/src/TNSFirebaseCore.h

@@ -0,0 +1,7 @@
+#import <Foundation/Foundation.h>
+#import "UIApplicationDelegate+LaunchExtension.h"
+typedef void(^LaunchCallback)();
+@interface TNSFirebaseCore: NSObject
++(LaunchCallback) onAppFinishLaunchingCallback;
++(void) setOnAppFinishLaunchingCallback:(LaunchCallback)callback;
+@end

packages/firebase-core/platforms/ios/src/TNSFirebaseCore.m

@@ -0,0 +1,12 @@
+#import "TNSFirebaseCore.h"
+
+@implementation TNSFirebaseCore
+static LaunchCallback _Nullable _onAppFinishLaunchingCallback;
++ (LaunchCallback)onAppFinishLaunchingCallback {
+    return _onAppFinishLaunchingCallback;
+}
+
++ (void)setOnAppFinishLaunchingCallback:(nullable LaunchCallback)callback {
+    _onAppFinishLaunchingCallback = callback;
+}
+@end

packages/firebase-core/platforms/ios/src/TNSFirebaseCoreUmbrella.h

@@ -0,0 +1,2 @@
+#import "TNSFirebaseCore.h"
+#import "UIApplicationDelegate+LaunchExtension.h"

packages/firebase-core/platforms/ios/src/UIApplicationDelegate+LaunchExtension.h

@@ -0,0 +1,5 @@
+#import <UIKit/UIKit.h>
+
+@interface NSObject (TNSUIAppDelegateExt) <UIApplicationDelegate>
+- (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(nullable NSDictionary<UIApplicationLaunchOptionsKey, id> *)launchOptions;
+@end

packages/firebase-core/platforms/ios/src/UIApplicationDelegate+LaunchExtension.m

@@ -0,0 +1,13 @@
+#import "UIApplicationDelegate+LaunchExtension.h"
+#import "TNSFirebaseCore.h"
+#import <objc/runtime.h>
+
+@implementation NSObject (TNSUIAppDelegateExt)
+- (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(nullable NSDictionary<UIApplicationLaunchOptionsKey, id> *)launchOptions {
+    LaunchCallback callback = [TNSFirebaseCore onAppFinishLaunchingCallback];
+    if(callback != nil){
+        callback();
+    }
+    return YES;
+}
+@end

packages/firebase-core/platforms/ios/src/module.modulemap

@@ -0,0 +1,5 @@
+ module TNSFirebaseCore {
+  umbrella header "TNSFirebaseCoreUmbrella.h"
+  export *
+  module * { export * }
+}

packages/firebase-crashlytics/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nativescript/firebase-crashlytics",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "description": "NativeScript Firebase - Crashlytics",
   "main": "index",
   "typings": "index.d.ts",

packages/firebase-dynamic-links/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nativescript/firebase-dynamic-links",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "description": "NativeScript Firebase - Dynamic Links",
   "main": "index",
   "typings": "index.d.ts",

packages/firebase-firestore/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nativescript/firebase-firestore",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "description": "NativeScript Firebase - Firestore",
   "main": "index",
   "typings": "index.d.ts",

packages/firebase-functions/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nativescript/firebase-functions",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "description": "NativeScript Firebase - Functions",
   "main": "index",
   "typings": "index.d.ts",

packages/firebase-in-app-messaging/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nativescript/firebase-in-app-messaging",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "description": "NativeScript Firebase - In App Messaging",
   "main": "index",
   "typings": "index.d.ts",

packages/firebase-installations/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nativescript/firebase-installations",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "description": "NativeScript Firebase - Installations",
   "main": "index",
   "typings": "index.d.ts",

packages/firebase-messaging/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nativescript/firebase-messaging",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "description": "NativeScript Firebase - Messaging",
   "main": "index",
   "typings": "index.d.ts",

packages/firebase-messaging/platforms/ios/src/TNSFirebaseMessaging.swift

@@ -13,8 +13,7 @@ public class TNSFirebaseMessaging: NSObject {
 
     @objc public static var onMessageCallback: ((NSDictionary) -> Void)? = nil
 
-    public static var onTokenCallback: ((String) -> Void)? = nil
-    
+    @objc public static var onTokenCallback: ((String) -> Void)? = nil
 
     @objc public static func APNSTokenToString(_ tokenData: NSData)-> String {
         var token = ""

packages/firebase-messaging/platforms/ios/src/TNSFirebaseMessagingLoader.h

@@ -1,5 +1,5 @@
 #import <Foundation/Foundation.h>
 #import <UIKit/UIKit.h>
 
-@interface TNSFirebaseMessagingLoader: NSObject
+@interface TNSFirebaseCoreLoader: NSObject
 @end

packages/firebase-performance/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nativescript/firebase-performance",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "description": "NativeScript Firebase - Performancee",
   "main": "index",
   "typings": "index.d.ts",

packages/firebase-remote-config/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nativescript/firebase-remote-config",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "description": "NativeScript Firebase - Remote Config",
   "main": "index",
   "typings": "index.d.ts",

packages/firebase-storage/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nativescript/firebase-storage",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "description": "NativeScript Firebase - Storage",
   "main": "index",
   "typings": "index.d.ts",