fix(core): Default app has already been configured

improves getting previously initialized apps

Author: triniwiz

packages/firebase-core/index.android.ts

@@ -111,6 +111,10 @@ export class FirebaseOptions implements IFirebaseOptions {
 	}
 }
 
+let firebaseInstance: Firebase;
+let defaultApp: FirebaseApp;
+const firebaseApps = new Map<string, FirebaseApp>();
+
 export class FirebaseApp {
 	#native: com.google.firebase.FirebaseApp;
 	#options: FirebaseOptions;
@@ -142,6 +146,7 @@ export class FirebaseApp {
 
 	delete() {
 		return new Promise<void>((resolve, reject) => {
+			firebaseApps.delete(this.native.getName());
 			this.native.delete();
 			resolve();
 		});
@@ -161,9 +166,6 @@ export class FirebaseApp {
 	}
 }
 
-let firebaseInstance: Firebase;
-let defaultApp: FirebaseApp;
-
 export class Firebase {
 	constructor() {
 		if (firebaseInstance) {
@@ -175,6 +177,9 @@ export class Firebase {
 
 	app(name?: string) {
 		if (name) {
+			if (firebaseApps.has(name)) {
+				return firebaseApps.get(name);
+			}
 			return FirebaseApp.fromNative(com.google.firebase.FirebaseApp.getInstance(name));
 		}
 		if (!defaultApp) {
@@ -185,7 +190,7 @@ export class Firebase {
 
 	initializeApp(options: FirebaseOptions = null, configOrName?: FirebaseConfig | string) {
 		let nativeOptions;
-		if(options){
+		if (options) {
 			nativeOptions = new com.google.firebase.FirebaseOptions.Builder();
 		}
 		if (options?.apiKey) {
@@ -220,27 +225,34 @@ export class Firebase {
 		let app: com.google.firebase.FirebaseApp;
 		let isDefault = false;
 		if (name) {
-			if(!nativeOptions){
-				nativeOptions = new com.google.firebase.FirebaseOptions.Builder()
+			if (!nativeOptions) {
+				nativeOptions = new com.google.firebase.FirebaseOptions.Builder();
 			}
 			app = com.google.firebase.FirebaseApp.initializeApp(Utils.android.getApplicationContext(), nativeOptions.build(), name);
 		} else {
+			if (defaultApp) {
+				defaultApp;
+			}
 			isDefault = true;
-			if(nativeOptions){
+			if (nativeOptions) {
 				app = com.google.firebase.FirebaseApp.initializeApp(Utils.android.getApplicationContext(), nativeOptions.build());
-			}else {
+			} else {
 				app = com.google.firebase.FirebaseApp.initializeApp(Utils.android.getApplicationContext());
 			}
 		}
 
 		if (app && typeof configOrName === 'object' && typeof configOrName.automaticResourceManagement === 'boolean') {
 			app.setAutomaticResourceManagementEnabled(configOrName.automaticDataCollectionEnabled);
 		}
-		
+
 		const fbApp = FirebaseApp.fromNative(app);
 
-		if(isDefault){
-			defaultApp = fbApp
+		if (isDefault) {
+			defaultApp = fbApp;
+		}
+
+		if (!isDefault) {
+			firebaseApps.set(name, fbApp);
 		}
 
 		return fbApp;

packages/firebase-core/index.ios.ts

@@ -171,6 +171,10 @@ export class FirebaseOptions implements IFirebaseOptions {
 	}
 }
 
+let firebaseInstance: Firebase;
+let defaultApp: FirebaseApp;
+const firebaseApps = new Map<string, FirebaseApp>();
+
 export class FirebaseApp {
 	#native: FIRApp;
 	#options: FirebaseOptions;
@@ -205,6 +209,7 @@ export class FirebaseApp {
 		return new Promise<void>((resolve, reject) => {
 			this.native.deleteApp((done) => {
 				if (done) {
+					firebaseApps.delete(this.native.name);
 					resolve();
 				} else {
 					reject();
@@ -228,9 +233,6 @@ export class FirebaseApp {
 	}
 }
 
-let firebaseInstance: Firebase;
-let defaultApp: FirebaseApp;
-
 export class Firebase {
 	constructor() {
 		if (firebaseInstance) {
@@ -241,6 +243,9 @@ export class Firebase {
 	}
 	app(name?: string) {
 		if (name) {
+			if (firebaseApps.has(name)) {
+				return firebaseApps.get(name);
+			}
 			return FirebaseApp.fromNative(FIRApp.appNamed(name));
 		}
 		if (!defaultApp) {
@@ -256,7 +261,7 @@ export class Firebase {
 			nativeOptions = FIROptions.alloc().initWithGoogleAppIDGCMSenderID(options.googleAppId, options.gcmSenderId);
 		}
 
-		if(!nativeOptions && options){
+		if (!nativeOptions && options) {
 			nativeOptions = FIROptions.defaultOptions();
 		}
 
@@ -314,13 +319,18 @@ export class Firebase {
 			FIRApp.configureWithNameOptions(name, nativeOptions);
 			app = FIRApp.appNamed(name);
 		} else {
+			if (defaultApp) {
+				return defaultApp;
+			}
+
 			if (nativeOptions) {
 				FIRApp.configureWithOptions(nativeOptions);
 			} else {
 				FIRApp.configure();
 			}
 
 			app = FIRApp.defaultApp();
+			isDefault = true;
 		}
 
 		if (app && typeof configOrName === 'object' && typeof configOrName.automaticDataCollectionEnabled === 'boolean') {
@@ -333,6 +343,10 @@ export class Firebase {
 			defaultApp = fbApp;
 		}
 
+		if (!isDefault) {
+			firebaseApps.set(name, fbApp);
+		}
+
 		return fbApp;
 	}
 }
@@ -343,4 +357,4 @@ export function firebase() {
 	}
 	firebaseInstance = new Firebase();
 	return firebaseInstance;
-}
+}

packages/firebase-core/package.json

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