Change API interface to take in FirebaseApp instance directly to remove the need for user to provide apiKey, appName and applicationId separately

Change-Id: Id45e817e188e80a4b9e1bcf865d28dbf86fa8189

Author: Jiachen Zhao

auth/src/main/java/com/firebase/ui/auth/AuthFlowFactory.java

@@ -23,6 +23,7 @@
 import com.firebase.ui.auth.choreographer.idp.provider.GoogleProvider;
 import com.firebase.ui.auth.choreographer.idp.provider.IDPProviderParcel;
 import com.firebase.ui.auth.ui.credentials.CredentialsInitActivity;
+import com.google.firebase.FirebaseApp;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -34,21 +35,23 @@ public class AuthFlowFactory {
     /**
      * Creates the intent that starts the auth flow
      * @param context activity context
-     * @param appName the app name of the FirebaseApp that you wish to use
-     * @param apiaryKey the Firebase backend API key
-     * @param applicationId the Firebase application id
-     * @param providers the supported identity providers that you wish to enable (google, facebook, etc)
-     * @return the Intent to start the auth flow
+     * @param firebaseApp the FirebaseApp that's to used for the authentication flow
+     * @param termsOfServiceUrl the URL to the Term of Service page to be present to the user
+     * @param theme the customized theme to be applied to the authentication flow. 0 will use the default theme.
+    * @param providers the supported identity providers that you wish to enable (google, facebook, etc)
+     * @return
      */
     public static Intent createIntent(
+//            * @param providers the supported identity providers that you wish to enable (google, facebook, etc)
             @NonNull Context context,
-            @NonNull String appName,
-            @NonNull String apiaryKey,
-            @NonNull String applicationId,
+            @NonNull FirebaseApp firebaseApp,
             String termsOfServiceUrl,
             int theme,
             @Nullable List<String> providers) {
         ArrayList<IDPProviderParcel> providerParcels = new ArrayList<>();
+        String appName = firebaseApp.getName();
+        String apiaryKey = firebaseApp.getOptions().getApiKey();
+        String applicationId = firebaseApp.getOptions().getApplicationId();
         if (providers == null || providers.size() == 0) {
             return CredentialsInitActivity.createIntent(
                     context,
@@ -67,7 +70,7 @@ public static Intent createIntent(
                         context.getString(R.string.facebook_application_id)));
             } else if (provider.equalsIgnoreCase("google")) {
                 providerParcels.add(
-                        GoogleProvider.createParcel(context.getString(R.string.google_client_id)));
+                        GoogleProvider.createParcel(firebaseApp.getOptions().getApplicationId()));
             }
         }
         return CredentialsInitActivity.createIntent(

auth/src/main/java/com/firebase/ui/auth/api/FirebaseAuthWrapperFactory.java

@@ -34,30 +34,4 @@ public static FirebaseAuthWrapper getFirebaseAuthWrapper(String appName) {
     public static FirebaseAuthWrapper getFirebaseAuthWrapper(FirebaseApp firebaseApp) {
         return new FirebaseAuthWrapperImpl(FirebaseAuth.getInstance(firebaseApp));
     }
-
-    public static FirebaseAuthWrapper getFirebaseAuthWrapper(
-            Context context, String appName, JSONObject mGoogleServiceJSON) {
-        // TODO(zhaojiac): change this to use Google Services plugin instead
-        String apiaryKey =
-                mGoogleServiceJSON
-                        .optJSONArray("client")
-                        .optJSONObject(1)
-                        .optJSONArray("api_key")
-                        .optJSONObject(0)
-                        .optString("current_key");
-        String applicationId =
-                mGoogleServiceJSON
-                        .optJSONArray("client")
-                        .optJSONObject(1)
-                        .optJSONArray("oauth_client")
-                        .optJSONObject(0)
-                        .optString("client_id");
-        FirebaseOptions options
-                = new FirebaseOptions.Builder()
-                .setApiKey(apiaryKey)
-                .setApplicationId(applicationId)
-                .build();
-        FirebaseApp curApp = FirebaseApp.initializeApp(context, options, appName);
-        return new FirebaseAuthWrapperImpl(FirebaseAuth.getInstance(curApp));
-    }
 }

auth/src/main/res/values/strings.xml

@@ -62,7 +62,4 @@
     <string name="progress_dialog_signing_in">Signing in…</string>
     <string name="progress_dialog_signing_up">Signing up…</string>
     <string name="facebook_application_id">FACEBOOK-APPID</string>
-    <string name="google_client_id">GOOGLE-CLIENT-ID</string>
-
-
 </resources>