Add a step to include authentication libraries (default 'true') #904

Author: EddyVerbruggen

demo/package.json

@@ -9,7 +9,7 @@
     }
   },
   "dependencies": {
-    "nativescript-plugin-firebase": "file:../publish/package/nativescript-plugin-firebase-6.8.0.tgz",
+    "nativescript-plugin-firebase": "file:../publish/package/nativescript-plugin-firebase-6.8.1.tgz",
     "nativescript-theme-core": "^1.0.4",
     "nativescript-unit-test-runner": "^0.3.4",
     "tns-core-modules": "~4.2.0"

src/firebase.android.ts

@@ -35,6 +35,7 @@ let fbCallbackManager = null;
 const GOOGLE_SIGNIN_INTENT_ID = 123;
 const REQUEST_INVITE_INTENT_ID = 48;
 
+const authEnabled = lazy(() => typeof(com.google.firebase.auth) !== "undefined");
 const messagingEnabled = lazy(() => typeof(com.google.firebase.messaging) !== "undefined");
 const dynamicLinksEnabled = lazy(() => typeof(com.google.firebase.dynamiclinks) !== "undefined");
 
@@ -298,33 +299,35 @@ firebase.init = arg => {
         }
       }
 
-      const firebaseAuth = com.google.firebase.auth.FirebaseAuth.getInstance();
+      if (authEnabled()) {
+        const firebaseAuth = com.google.firebase.auth.FirebaseAuth.getInstance();
 
-      if (arg.onAuthStateChanged) {
-        firebase.authStateListener = new com.google.firebase.auth.FirebaseAuth.AuthStateListener({
-          onAuthStateChanged: fbAuth => {
-            const user = fbAuth.getCurrentUser();
-            arg.onAuthStateChanged({
-              loggedIn: user !== null,
-              user: toLoginResult(user)
-            });
-          }
-        });
-        firebaseAuth.addAuthStateListener(firebase.authStateListener);
-      }
+        if (arg.onAuthStateChanged) {
+          firebase.authStateListener = new com.google.firebase.auth.FirebaseAuth.AuthStateListener({
+            onAuthStateChanged: fbAuth => {
+              const user = fbAuth.getCurrentUser();
+              arg.onAuthStateChanged({
+                loggedIn: user !== null,
+                user: toLoginResult(user)
+              });
+            }
+          });
+          firebaseAuth.addAuthStateListener(firebase.authStateListener);
+        }
 
-      // Listen to auth state changes
-      if (!firebase.authStateListener) {
-        firebase.authStateListener = new com.google.firebase.auth.FirebaseAuth.AuthStateListener({
-          onAuthStateChanged: fbAuth => {
-            const user = fbAuth.getCurrentUser();
-            firebase.notifyAuthStateListeners({
-              loggedIn: user !== null,
-              user: toLoginResult(user)
-            });
-          }
-        });
-        firebaseAuth.addAuthStateListener(firebase.authStateListener);
+        // Listen to auth state changes
+        if (!firebase.authStateListener) {
+          firebase.authStateListener = new com.google.firebase.auth.FirebaseAuth.AuthStateListener({
+            onAuthStateChanged: fbAuth => {
+              const user = fbAuth.getCurrentUser();
+              firebase.notifyAuthStateListeners({
+                loggedIn: user !== null,
+                user: toLoginResult(user)
+              });
+            }
+          });
+          firebaseAuth.addAuthStateListener(firebase.authStateListener);
+        }
       }
 
       // Firebase notifications (FCM)

src/firebase.ios.ts

@@ -371,36 +371,38 @@ firebase.init = arg => {
         }
       }
 
-      if (arg.iOSEmulatorFlush) {
-        try {
-          // Attempt to sign out before initializing, useful in case previous
-          // project token is cached which leads to following type of error:
-          // "[FirebaseDatabase] Authentication failed: invalid_token ..."
-          FIRAuth.auth().signOut();
-        } catch (signOutErr) {
-          console.log('Sign out of Firebase error: ' + signOutErr);
+      if (typeof (FIRAuth) !== "undefined") {
+        if (arg.iOSEmulatorFlush) {
+          try {
+            // Attempt to sign out before initializing, useful in case previous
+            // project token is cached which leads to following type of error:
+            // "[FirebaseDatabase] Authentication failed: invalid_token ..."
+            FIRAuth.auth().signOut();
+          } catch (signOutErr) {
+            console.log('Sign out of Firebase error: ' + signOutErr);
+          }
         }
-      }
 
-      if (arg.onAuthStateChanged) {
-        firebase.authStateListener = (auth, user) => {
-          arg.onAuthStateChanged({
-            loggedIn: user !== null,
-            user: toLoginResult(user)
-          });
-        };
-        FIRAuth.auth().addAuthStateDidChangeListener(firebase.authStateListener);
-      }
+        if (arg.onAuthStateChanged) {
+          firebase.authStateListener = (auth, user) => {
+            arg.onAuthStateChanged({
+              loggedIn: user !== null,
+              user: toLoginResult(user)
+            });
+          };
+          FIRAuth.auth().addAuthStateDidChangeListener(firebase.authStateListener);
+        }
 
-      // Listen to auth state changes
-      if (!firebase.authStateListener) {
-        firebase.authStateListener = (auth, user) => {
-          firebase.notifyAuthStateListeners({
-            loggedIn: user !== null,
-            user: toLoginResult(user)
-          });
-        };
-        FIRAuth.auth().addAuthStateDidChangeListener(firebase.authStateListener);
+        // Listen to auth state changes
+        if (!firebase.authStateListener) {
+          firebase.authStateListener = (auth, user) => {
+            firebase.notifyAuthStateListeners({
+              loggedIn: user !== null,
+              user: toLoginResult(user)
+            });
+          };
+          FIRAuth.auth().addAuthStateDidChangeListener(firebase.authStateListener);
+        }
       }
 
       // Firebase DynamicLink