fix: app delegate handling

Author: triniwiz

apps/demo/src/app.ts

@@ -51,4 +51,6 @@ messaging
 	.catch((e) => {
 		console.error('requestPermission', e);
 	});
+
+
 Application.run({ moduleName: 'app-root' });

apps/demo/src/plugin-demos/firebase-auth.ts

@@ -16,7 +16,7 @@ export class DemoModel extends DemoSharedFirebaseAuth {
 	email: string;
 	password: string;
 	user: User;
-	phoneNumber: string;
+	phoneNumber: string = '18683545179';
 	code: string;
 	verificationId: string;
 	constructor() {

packages/firebase-admob/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nativescript/firebase-admob",
-  "version": "1.0.0-alpha.38",
+  "version": "1.0.0-alpha.39",
   "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-alpha.38",
+  "version": "1.0.0-alpha.39",
   "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-alpha.38",
+  "version": "1.0.0-alpha.39",
   "description": "NativeScript Firebase - App Check",
   "main": "index",
   "typings": "index.d.ts",

packages/firebase-auth/index.android.ts

@@ -611,16 +611,24 @@ function toActionCodeOperation(operation: com.google.firebase.auth.ActionCodeRes
 function toUserCredential(authData: com.google.firebase.auth.AuthResult): UserCredential {
   const additionalUserInfo = authData.getAdditionalUserInfo();
   const credential = authData.getCredential();
-  return {
-    additionalUserInfo: {
-      newUser: additionalUserInfo.isNewUser(),
-      providerId: additionalUserInfo.getProviderId(),
-      username: additionalUserInfo.getUsername(),
-      profile: deserialize(additionalUserInfo.getProfile()),
-    },
+
+  const result = {
+    additionalUserInfo: null,
     user: User.fromNative(authData.getUser()),
     credential: credential instanceof com.google.firebase.auth.OAuthCredential ? OAuthCredential.fromNative(credential) : AuthCredential.fromNative(credential),
   };
+
+  if (additionalUserInfo) {
+    result.additionalUserInfo = {
+      newUser: additionalUserInfo?.isNewUser?.(),
+      providerId: additionalUserInfo?.getProviderId?.(),
+      username: additionalUserInfo?.getUsername?.(),
+      profile: deserialize(additionalUserInfo?.getProfile?.()),
+    }
+  };
+
+
+  return result;
 }
 
 export class ActionCodeSettings implements IActionCodeSettings {

packages/firebase-auth/index.ios.ts

@@ -1,3 +1,4 @@
+import { Application } from '@nativescript/core';
 import { FirebaseApp, firebase, deserialize, FirebaseError } from '@nativescript/firebase-core';
 import { IAuthSettings, IAuth, IUser, IUserInfo, IUserMetadata, ActionCodeInfo, ActionCodeInfoOperation, UserCredential, AdditionalUserInfo, IAuthCredential, IActionCodeSettings, OAuthCredentialOptions, IOAuthCredential, IAuthTokenResult, IPhoneAuthCredential, UserProfileChangeRequest, IOAuthProvider } from './common';
 
@@ -526,16 +527,22 @@ function toActionCodeOperation(operation: FIRActionCodeOperation) {
 }
 
 function toUserCredential(authData: FIRAuthDataResult): UserCredential {
-	return {
-		additionalUserInfo: {
-			newUser: authData.additionalUserInfo.newUser,
-			providerId: authData.additionalUserInfo.providerID,
-			username: authData.additionalUserInfo.username,
-			profile: deserialize(authData.additionalUserInfo.profile),
-		},
+	const result = {
+		additionalUserInfo: null,
 		user: User.fromNative(authData.user),
-		credential: authData.credential instanceof FIROAuthCredential ? OAuthCredential.fromNative(authData.credential) : AuthCredential.fromNative(authData.credential),
+		credential: authData.credential instanceof FIROAuthCredential ? OAuthCredential.fromNative(authData.credential) : AuthCredential.fromNative(authData.credential)
 	};
+
+	if (authData?.additionalUserInfo) {
+		result.additionalUserInfo = {
+			newUser: authData?.additionalUserInfo?.newUser,
+			providerId: authData?.additionalUserInfo?.providerID,
+			username: authData?.additionalUserInfo?.username,
+			profile: deserialize(authData?.additionalUserInfo?.profile),
+		};
+	}
+
+	return result;
 }
 
 export class ActionCodeSettings implements IActionCodeSettings {
@@ -690,6 +697,8 @@ export class PhoneAuthProvider {
 				reject();
 			} else {
 				this.native.verifyPhoneNumberUIDelegateCompletion(phoneNumber, null, (verificationId, error) => {
+					console.log('verifyPhoneNumberUIDelegateCompletion', verificationId, error);
+					console.log(UIApplication.sharedApplication.delegate.respondsToSelector('application:didReceiveRemoteNotification:fetchCompletionHandler'));
 					if (error) {
 						reject(FirebaseError.fromNative(error));
 					} else {

packages/firebase-auth/package.json

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