Start listening to auth state changes for both android and iOS on init

Author: jpaagt

firebase.android.js

@@ -82,6 +82,8 @@ firebase.getCallbackData = function(type, snapshot) {
   };
 };
 
+firebase.authStateListener = null;
+
 firebase.init = function (arg) {
   return new Promise(function (resolve, reject) {
     try {
@@ -95,6 +97,21 @@ firebase.init = function (arg) {
       // it is however still possible to pass the URL programmatically (which we'll do for now):
       // instance = fDatabase.getInstance().getReferenceFromUrl(arg.url);
 
+      // Listen to auth state changes
+      if (!firebase.authStateListener) {
+        firebase.authStateListener = new com.google.firebase.auth.FirebaseAuth.AuthStateListener({
+          onAuthStateChanged: function (fbAuth) {
+            var user = fbAuth.getCurrentUser();
+            firebase.notifyAuthStateListeners({
+              loggedIn: user !== null,
+              user: toLoginResult(user)
+            });
+          }
+        });
+        var firebaseAuth = com.google.firebase.auth.FirebaseAuth.getInstance();
+        firebaseAuth.addAuthStateListener(firebase.authStateListener);
+      }
+
       resolve(instance);
     } catch (ex) {
       console.log("Error in firebase.init: " + ex);
@@ -115,42 +132,29 @@ firebase.logout = function (arg) {
   });
 };
 
-firebase.authStateListener = null;
+function toLoginResult(user) {
+  return user && {
+      uid: user.getUid(),
+      name: user.getDisplayName(),
+      email: user.getEmail(),
+      // TODO add these properties, see https://firebase.google.com/docs/auth/android/manage-users#get_a_users_profile
+      // provider: authData.getProvider(),
+      // expiresAtUnixEpochSeconds: authData.getExpires(),
+      profileImageURL: user.getPhotoUrl()
+    };
+}
 
 firebase.login = function (arg) {
   return new Promise(function (resolve, reject) {
     try {
       var firebaseAuth = com.google.firebase.auth.FirebaseAuth.getInstance();
-
-      if (firebase.authStateListener === null) {
-        firebase.authStateListener = new com.google.firebase.auth.FirebaseAuth.AuthStateListener({
-          onAuthStateChanged: function (fbAuth) {
-            var user = fbAuth.getCurrentUser();
-            firebase.notifyAuthStateListeners({
-              loggedIn: user !== null,
-              user: user
-            });
-          }
-        });
-        firebaseAuth.addAuthStateListener(firebase.authStateListener);
-      }
-
       var onCompleteListener = new com.google.android.gms.tasks.OnCompleteListener({
         onComplete: function (task) {
           if (!task.isSuccessful()) {
             reject("Logging in the user failed");            
           } else {
             var user = task.getResult().getUser();
-            resolve({
-              uid: user.getUid(),
-              name: user.getDisplayName(),
-              email: user.getEmail(),
-              // TODO add these properties, see https://firebase.google.com/docs/auth/android/manage-users#get_a_users_profile
-              // provider: authData.getProvider(),
-              // expiresAtUnixEpochSeconds: authData.getExpires(),
-              profileImageURL: user.getPhotoUrl(),
-              //token: user.getToken() // can be used to auth with a backend server
-            });
+            resolve(toLoginResult(user));
           }
         }
       });

firebase.ios.js

@@ -52,6 +52,8 @@ firebase.getCallbackData = function(type, snapshot) {
   };
 };
 
+firebase.authStateListener = null;
+
 firebase.init = function (arg) {
   return new Promise(function (resolve, reject) {
     try {
@@ -65,6 +67,17 @@ firebase.init = function (arg) {
 
       instance = FIRDatabase.database().reference();
 
+      // Listen to auth state changes
+      if (!firebase.authStateListener) {
+        firebase.authStateListener = function(auth, user) {
+          firebase.notifyAuthStateListeners({
+              loggedIn: user !== null,
+              user: toLoginResult(user)
+            });
+        };
+        FIRAuth.auth().addAuthStateDidChangeListener(firebase.authStateListener);
+      }
+
       resolve(instance);
     } catch (ex) {
       console.log("Error in firebase.init: " + ex);
@@ -85,6 +98,16 @@ firebase.logout = function (arg) {
   });
 };
 
+function toLoginResult(user) {
+  return user && {
+      uid: user.uid,
+      provider: user.providerID,
+      profileImageURL: user.photoURL,
+      email: user.email,
+      name: user.displayName
+    };
+}
+
 firebase.login = function (arg) {
   return new Promise(function (resolve, reject) {
     try {
@@ -96,15 +119,7 @@ firebase.login = function (arg) {
           console.log(JSON.stringify(user));
           console.log(firebase.toJsObject(user));
 
-          resolve({
-            uid: user.uid,
-            provider: user.providerID,
-            profileImageURL: user.photoURL,
-            email: user.email,
-            name: user.displayName,
-            // expiresAtUnixEpochSeconds: user.expires,
-            //token: user.token
-          });
+          resolve(toLoginResult(user));
 
           firebase.notifyAuthStateListeners({
             loggedIn: true,