Tidy and update Android dependencies

ReallySmallSoftware · ReallySmallSoftware · commit 37f0739a781e · 2018-11-01T14:28:41.000Z
diff --git a/README.md b/README.md
@@ -147,7 +147,7 @@ Not all of the above options will function on all platforms:
 - theme: a theme identifier for styling - Android only
 - logo: a logo to display - Android only
 - uiElement: a jQuery selector for web login - Web only
-- anonymous : if true log in an an anonymous user upon initialisation (default false)
+- anonymous : if true log in an anonymous user if other attempts fail (default false)
 - smartLockEnabled : enable SmartLock to store credentials - Android only (default true)
 - smartLockHints : enable SmartLock hints - Android only (default false)
 
@@ -156,7 +156,7 @@ In order for the above initialisation to work on a browser you need to include s
 
 ```
 FirebaseUIAuth.initialise({
-   "providers": ["GOOGLE", "FACEBOOK", "EMAIL"],
+   "providers": ["GOOGLE", "FACEBOOK", "EMAIL", "ANONYMOUS"],
    "tosUrl" : "http://www.myapp.co.uk/terms.html",
    "privacyPolicyUrl" : "http://www.myapp.co.uk/privacy.html",
    "theme" : "themeName",
@@ -176,6 +176,9 @@ FirebaseUIAuth.initialise({
 ```
 
 # Methods
+## signInAnonymously()
+Call this to sign in anonymously.
+
 ## signIn()
 Call this to start the sign in process based on the above configuration. This can raise the following events:
 
@@ -203,6 +206,9 @@ Sign in failed for some reason. The following is returned:
 }
 ```
 
+## signinaborted
+Sign in has been aborted by the user, by closing the sign in window.
+
 ## signOut()
 Sign the current user out of the application. This can raise the following events:
 
@@ -313,6 +319,11 @@ In order to ensure the browser implementation works, it will be necessary to con
 ```
 
 # History
+## 1.-.0
+- Major Android dependency update to 4.2.1
+- Breaking change around meaning of 'anonymous' configuration option
+- Add support for ANONYMOUS provider
+
 ## 0.0.10
 - Update JS Firebase dependencies
 
diff --git a/plugin.xml b/plugin.xml
@@ -109,7 +109,7 @@
     <preference name="ANDROID_FIREBASE_CORE_VERSION" default="16.0.4"/>
     <preference name="ANDROID_FIREBASE_AUTH_VERSION" default="16.0.4"/>
     <preference name="ANDROID_PLAY_SERVICES_AUTH_VERSION" default="16.0.1"/>
-    <preference name="ANDROID_FIREBASEUI_VERSION" default="3.3.1"/>
+    <preference name="ANDROID_FIREBASEUI_VERSION" default="4.2.1"/>
     <preference name="ANDROID_FACEBOOK_SDK_VERSION" default="4.33.0"/>
     <preference name="COLOR_PRIMARY" default="#ffffff"/>
     <preference name="COLOR_DARK_PRIMARY" default="#555555"/>
diff --git a/src/android/uk/co/reallysmall/cordova/plugin/firebase/ui/auth/FirebaseUIAuthPlugin.java b/src/android/uk/co/reallysmall/cordova/plugin/firebase/ui/auth/FirebaseUIAuthPlugin.java
@@ -6,10 +6,13 @@
 import android.util.Log;
 
 import com.firebase.ui.auth.AuthUI;
+import com.firebase.ui.auth.ErrorCodes;
+import com.firebase.ui.auth.IdpResponse;
 import com.google.android.gms.tasks.OnCompleteListener;
 import com.google.android.gms.tasks.OnFailureListener;
 import com.google.android.gms.tasks.OnSuccessListener;
 import com.google.android.gms.tasks.Task;
+import com.google.firebase.auth.AuthCredential;
 import com.google.firebase.auth.AuthResult;
 import com.google.firebase.auth.FirebaseAuth;
 import com.google.firebase.auth.FirebaseUser;
@@ -28,11 +31,11 @@
 
 import static android.app.Activity.RESULT_OK;
 
-public class FirebaseUIAuthPlugin extends CordovaPlugin implements OnCompleteListener<AuthResult>, FirebaseAuth.AuthStateListener {
+public class FirebaseUIAuthPlugin extends CordovaPlugin implements OnCompleteListener<AuthResult> {
     private static final int RC_SIGN_IN = 123;
     private final String TAG = "FirebaseUIAuthPlugin";
     List<AuthUI.IdpConfig> providers = Arrays.asList(
-            new AuthUI.IdpConfig.Builder(AuthUI.EMAIL_PROVIDER).build());
+            new AuthUI.IdpConfig.EmailBuilder().build());
     private CallbackContext callbackContext;
     private FirebaseAuth firebaseAuth;
     private JSONObject options;
@@ -51,6 +54,8 @@ public boolean execute(String action, JSONArray args, CallbackContext callbackCo
             return initialise(args, callbackContext);
         } else if ("signIn".equals(action)) {
             return signIn(callbackContext);
+        } else if ("signInAnonymously".equals(action)) {
+            return signInAnonymously(callbackContext);
         } else if ("signOut".equals(action)) {
             return signOut(callbackContext);
         } else if ("deleteUser".equals(action)) {
@@ -84,6 +89,13 @@ public void onSuccess(Void aVoid) {
         return true;
     }
 
+    private boolean signInAnonymously(CallbackContext callbackContext) {
+
+        signInAnonymous(firebaseAuth);
+
+        return true;
+    }
+
     private boolean sendEmailVerification(final CallbackContext callbackContext) {
 
         FirebaseUser user = firebaseAuth.getCurrentUser();
@@ -127,14 +139,14 @@ private boolean initialise(JSONArray args, final CallbackContext callbackContext
 
         firebaseAuth = FirebaseAuth.getInstance();
 
-        firebaseAuth.addAuthStateListener(this);
-        this.signInAnonymous(firebaseAuth);
-
         return true;
     }
 
     private void signInAnonymous(final FirebaseAuth firebaseAuth) {
-        if (firebaseAuth.getCurrentUser() == null && anonymous) {
+
+        FirebaseUser user = firebaseAuth.getCurrentUser();
+
+        if (user == null && anonymous) {
             firebaseAuth.signInAnonymously().addOnCompleteListener(new OnCompleteListener<AuthResult>() {
                 @Override
                 public void onComplete(@NonNull Task<AuthResult> task) {
@@ -167,19 +179,25 @@ private void createProviderList() throws JSONException {
                 Log.d(TAG, "createProviderList: parsing provider " + providerList.getString(i));
 
                 if ("EMAIL".equals(providerList.getString(i))) {
-                    providers.add(new AuthUI.IdpConfig.Builder(AuthUI.EMAIL_PROVIDER).build());
+                    providers.add(new AuthUI.IdpConfig.EmailBuilder().build());
                 }
                 if ("FACEBOOK".equals(providerList.getString(i))) {
-                    providers.add(new AuthUI.IdpConfig.Builder(AuthUI.FACEBOOK_PROVIDER).build());
+                    providers.add(new AuthUI.IdpConfig.FacebookBuilder().build());
                 }
                 if ("GOOGLE".equals(providerList.getString(i))) {
-                    providers.add(new AuthUI.IdpConfig.Builder(AuthUI.GOOGLE_PROVIDER).build());
+                    providers.add(new AuthUI.IdpConfig.GoogleBuilder().build());
                 }
                 if ("PHONE".equals(providerList.getString(i))) {
-                    providers.add(new AuthUI.IdpConfig.Builder(AuthUI.PHONE_VERIFICATION_PROVIDER).build());
+                    providers.add(new AuthUI.IdpConfig.PhoneBuilder().build());
                 }
                 if ("TWITTER".equals(providerList.getString(i))) {
-                    providers.add(new AuthUI.IdpConfig.Builder(AuthUI.TWITTER_PROVIDER).build());
+                    providers.add(new AuthUI.IdpConfig.TwitterBuilder().build());
+                }
+                if ("GITHUB".equals(providerList.getString(i))) {
+                    providers.add(new AuthUI.IdpConfig.GitHubBuilder().build());
+                }
+                if ("ANONYMOUS".equals(providerList.getString(i))) {
+                    providers.add(new AuthUI.IdpConfig.AnonymousBuilder().build());
                 }
             }
         }
@@ -199,8 +217,11 @@ private boolean signIn(CallbackContext callbackContext) {
         } else {
             Log.d(TAG, "signIn: sign in");
 
+            cordova.setActivityResultCallback(this);
+
             cordova.getActivity().startActivityForResult(
                     this.buildCustomInstance()
+                            .enableAnonymousUsersAutoUpgrade()
                             .setAvailableProviders(providers)
                             .build(),
                     RC_SIGN_IN);
@@ -220,7 +241,7 @@ private AuthUI.SignInIntentBuilder buildCustomInstance() {
         try {
             if (options.has("logo")) {
                 int id = getIdentifier(options.getString("logo"), "drawable");
-                instance = instance.setLogo(id);
+            //    instance = instance.setLogo(id);
             }
             if (options.has("theme")) {
                 int id = getIdentifier(options.getString("theme"), "style");
@@ -229,11 +250,15 @@ private AuthUI.SignInIntentBuilder buildCustomInstance() {
                 int id = getIdentifier("FirebaseUILogonTheme", "style");
                 instance = instance.setTheme(id);
             }
-            if (options.has("tosUrl")) {
-                instance = instance.setTosUrl(options.getString("tosUrl"));
-            }
-            if (options.has("privacyPolicyUrl")) {
-                instance = instance.setPrivacyPolicyUrl(options.getString("privacyPolicyUrl"));
+            if (options.has("tosUrl") && options.has("privacyPolicyUrl")) {
+                instance = instance.setTosAndPrivacyPolicyUrls(options.getString("tosUrl"),options.getString("privacyPolicyUrl"));
+            } else {
+                if (options.has("tosUrl")) {
+                    instance = instance.setTosUrl(options.getString("tosUrl"));
+                }
+                if (options.has("privacyPolicyUrl")) {
+                    instance = instance.setPrivacyPolicyUrl(options.getString("privacyPolicyUrl"));
+                }
             }
             if (options.has("smartLockEnabled")) {
                 smartLockEnabled = options.getBoolean("smartLockEnabled");
@@ -255,14 +280,81 @@ private int getIdentifier(String name, String type) {
                 cordova.getActivity().getApplicationContext().getPackageName());
     }
 
+    @Override
+    public void onActivityResult(int requestCode, int resultCode, Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
+
+        Log.d(TAG, "onActivityResult");
+        Log.d(TAG, "onActivityResult:requestCode:" + requestCode);
+
+        if (requestCode == RC_SIGN_IN) {
+            Log.d(TAG, "onActivityResult:resultCode:" + resultCode);
+
+            IdpResponse response = IdpResponse.fromResultIntent(data);
+
+            if (resultCode == RESULT_OK) {
+
+                FirebaseUser user = FirebaseAuth.getInstance().getCurrentUser();
+                raiseEventForUser(user);
+            } else {
+                if (response == null) {
+                    signInAnonymous(firebaseAuth);
+                    raiseEvent(callbackContext, "signinaborted", null);
+                    return;
+                }
+
+                if (response.getError().getErrorCode() == ErrorCodes.ANONYMOUS_UPGRADE_MERGE_CONFLICT) {
+                    handleAnonymousUpgradeMergeConflict(response);
+                } else {
+
+                    if (response.getError().getErrorCode() == ErrorCodes.NO_NETWORK) {
+                        raiseErrorEvent("signinfailure", response.getError().getErrorCode(), "No network so unable to sign in.");
+
+                        return;
+                    }
+
+                    Log.e(TAG, "Sign-in error: ", response.getError());
+                    raiseErrorEvent("signinfailure", response.getError().getErrorCode(), "There was a problem signing in.");
+                }
+            }
+        }
+    }
+
+    private void handleAnonymousUpgradeMergeConflict(IdpResponse response) {
+        AuthCredential nonAnonymousCredential = response.getCredentialForLinking();
+
+        FirebaseAuth.getInstance().signInWithCredential(nonAnonymousCredential)
+                .addOnSuccessListener(new OnSuccessListener<AuthResult>() {
+                    @Override
+                    public void onSuccess(AuthResult result) {
+                        FirebaseUser user = FirebaseAuth.getInstance().getCurrentUser();
+                        raiseEventForUser(user);
+                    }
+                });
+    }
+
     private boolean signOut(CallbackContext callbackContext) {
 
         Log.d(TAG, "signOut");
 
-        AuthUI.getInstance().signOut((FragmentActivity) cordova.getActivity());
-        raiseEvent(callbackContext, "signoutsuccess", null);
+        AuthUI.getInstance().signOut((FragmentActivity) cordova.getActivity()).addOnCompleteListener(new OnCompleteListener<Void>() {
+            @Override
+            public void onComplete(@NonNull Task<Void> task) {
+                if (task.isSuccessful()) {
 
-        this.signInAnonymous(firebaseAuth);
+                    Log.d(TAG, "signOut: success");
+
+                    raiseEvent(callbackContext, "signoutsuccess", null);
+                    signInAnonymous(firebaseAuth);
+                }
+            }
+        }).addOnFailureListener(new OnFailureListener() {
+            @Override
+            public void onFailure(@NonNull Exception e) {
+                Log.w(TAG, "signOut: failure", e);
+                raiseErrorEvent("signoutfailure", 1, "There was a problem signing out.");
+            }
+        });
 
         return true;
     }
@@ -365,25 +457,6 @@ private void raiseEventForUser(FirebaseUser user) {
 
     }
 
-    @Override
-    public void onActivityResult(int requestCode, int resultCode, Intent data) {
-        super.onActivityResult(requestCode, resultCode, data);
-
-        Log.d(TAG, "onActivityResult");
-        Log.d(TAG, "onActivityResult:requestCode:" + requestCode);
-
-        if (requestCode == RC_SIGN_IN) {
-            Log.d(TAG, "onActivityResult:resultCode:" + resultCode);
-
-            if (resultCode == RESULT_OK) {
-
-                FirebaseUser user = FirebaseAuth.getInstance().getCurrentUser();
-                raiseEventForUser(user);
-            }
-        }
-    }
-
-
     private void raiseEvent(CallbackContext callbackContext, String type, Object data) {
 
         Log.d(TAG, "raiseEvent: " + type);
@@ -419,22 +492,4 @@ public void onComplete(@NonNull Task<AuthResult> task) {
             raiseEvent(callbackContext, "signinfailure", data);
         }
     }
-
-    @Override
-    public void onAuthStateChanged(@NonNull FirebaseAuth firebaseAuth) {
-
-        Log.d(TAG, "onAuthStateChanged");
-
-        final FirebaseUser user = firebaseAuth.getCurrentUser();
-        if (user != null) {
-            Log.d(TAG, "onAuthStateChanged: signed in");
-
-            raiseEventForUser(user);
-
-        } else {
-            Log.d(TAG, "onAuthStateChanged: signed out");
-
-            raiseEvent(callbackContext, "signoutsuccess", null);
-        }
-    }
 }
diff --git a/src/ios/FirebaseUIAuthPlugin.m b/src/ios/FirebaseUIAuthPlugin.m
@@ -36,15 +36,15 @@ - (void)initialise:(CDVInvokedUrlCommand *)command {
             self.anonymous = true;
         }
 
-        [[FIRAuth auth] addAuthStateDidChangeListener:^(FIRAuth * _Nonnull auth, FIRUser * _Nullable user) {
-            if (user != nil) {
-                [self raiseEventForUser:user];
-            } else {
-                [self raiseEvent:@"signoutsuccess" withData:nil];
-            }
-        }];
-
-        [self signInAnonymous];
+   //     [[FIRAuth auth] addAuthStateDidChangeListener:^(FIRAuth * _Nonnull auth, FIRUser * _Nullable user) {
+    //        if (user != nil) {
+   //             [self raiseEventForUser:user];
+    //       } else {
+     //           [self raiseEvent:@"signoutsuccess" withData:nil];
+     //       }
+     //   }];
+
+      //  [self signInAnonymous];
     }
     @catch (NSException *exception) {
         NSLog(@"Initialise error %@", [exception reason]);
diff --git a/www/browser/firebaseUIAuthPlugin.js b/www/browser/firebaseUIAuthPlugin.js
@@ -36,9 +36,6 @@ var loadCSS = function(url, loaded, implementationCode, location) {
 function FirebaseUIAuth(options, resolve) {
 
   var self = this;
-  var uiConfig;
-  var uiElement;
-  var anonymous;
 
   var initialise = function() {
     if (firebase.apps.length === 0) {
@@ -50,7 +47,6 @@ function FirebaseUIAuth(options, resolve) {
     });
 
     self.anonymous = options.anonymous ? true : false;
-    self.signInAnonymously();
 
     var providers = self.buildProviders(options.providers);
     self.buildUIConfig(options, providers);
diff --git a/www/firebaseUIAuthPlugin.js b/www/firebaseUIAuthPlugin.js
@@ -24,6 +24,10 @@ function FirebaseUIAuth(options) {
     return exec(dispatchEvent, null, PLUGIN_NAME, 'signIn', []);
   };
 
+  this.signInAnonymously = function() {
+    return exec(dispatchEvent, null, PLUGIN_NAME, 'signInAnonymously', []);
+  };
+
   this.signOut = function() {
     return exec(dispatchEvent, null, PLUGIN_NAME, 'signOut', []);
   };
