Merge pull request #303 from RaphaelJenni/master

On login failed, show google account modal again

Author: EddyVerbruggen

firebase.android.js

@@ -800,6 +800,10 @@ firebase.login = function (arg) {
           }
           if (!task.isSuccessful()) {
             console.log("Logging in the user failed. " + (task.getException() && task.getException().getReason ? task.getException().getReason() : task.getException()));
+            // also disconnect from Google otherwise ppl can't connect with a different account
+            if (firebase._mGoogleApiClient) {
+                com.google.android.gms.auth.api.Auth.GoogleSignInApi.revokeAccess(firebase._mGoogleApiClient);
+            }
             reject("Logging in the user failed. " + (task.getException() && task.getException().getReason ? task.getException().getReason() : task.getException()));
           } else {
             var user = task.getResult().getUser();

firebase.ios.js

@@ -901,6 +901,10 @@ firebase.login = function (arg) {
     try {
       var onCompletion = function(user, error) {
         if (error) {
+          // also disconnect from Google otherwise ppl can't connect with a different account
+          if (typeof(GIDSignIn) !== "undefined") {
+              GIDSignIn.sharedInstance().disconnect();
+          }
           reject(error.localizedDescription);
         } else {
           resolve(toLoginResult(user));