Split GitHub provider out into its own module

app/build.gradle.kts

@@ -32,6 +32,7 @@ dependencies {
     implementation(Config.Libs.Support.multidex)
 
     implementation(project(":auth"))
+    implementation(project(":auth-github"))
     implementation(project(":firestore"))
     implementation(project(":database"))
     implementation(project(":storage"))

auth-github/build.gradle.kts

@@ -0,0 +1,9 @@
+dependencies {
+    compileOnly(project(":auth"))
+
+    implementation(Config.Libs.Support.appCompat)
+    implementation(Config.Libs.Support.customTabs)
+
+    implementation(Config.Libs.Misc.retrofit)
+    implementation(Config.Libs.Misc.retrofitGson)
+}

auth-github/src/main/AndroidManifest.xml

@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    package="com.firebase.ui.auth.github">
+
+    <application>
+
+        <activity
+            android:name=".GitHubLoginActivity"
+            android:label=""
+            android:configChanges="keyboard|keyboardHidden|screenLayout|screenSize|orientation"
+            android:launchMode="singleTop"
+            android:theme="@style/FirebaseUI.Transparent">
+
+            <intent-filter
+                android:autoVerify="true"
+                tools:ignore="UnusedAttribute">
+                <action android:name="android.intent.action.VIEW" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+
+                <data
+                    android:host="@string/firebase_web_host"
+                    android:path="/__/auth/handler"
+                    android:scheme="https"
+                    tools:ignore="AppLinksAutoVerifyWarning" />
+            </intent-filter>
+
+        </activity>
+
+    </application>
+
+</manifest>

auth/src/main/java/com/firebase/ui/auth/ui/provider/GitHubLoginActivity.java → auth-github/src/main/java/com/firebase/ui/auth/github/GitHubLoginActivity.java

@@ -1,4 +1,4 @@
-package com.firebase.ui.auth.ui.provider;
+package com.firebase.ui.auth.github;
 
 import android.annotation.SuppressLint;
 import android.content.Context;
@@ -10,8 +10,6 @@
 import android.support.customtabs.CustomTabsIntent;
 import android.support.v4.content.ContextCompat;
 
-import com.firebase.ui.auth.R;
-import com.firebase.ui.auth.data.remote.GitHubSignInHandler;
 import com.firebase.ui.auth.ui.HelperActivityBase;
 import com.firebase.ui.auth.util.ExtraConstants;
 

auth/src/main/java/com/firebase/ui/auth/data/remote/GitHubSignInHandler.java → auth-github/src/main/java/com/firebase/ui/auth/github/GitHubSignInHandler.java

@@ -1,4 +1,4 @@
-package com.firebase.ui.auth.data.remote;
+package com.firebase.ui.auth.github;
 
 import android.app.Application;
 import android.content.Intent;
@@ -12,14 +12,12 @@
 import com.firebase.ui.auth.ErrorCodes;
 import com.firebase.ui.auth.FirebaseUiException;
 import com.firebase.ui.auth.IdpResponse;
-import com.firebase.ui.auth.R;
-import com.firebase.ui.auth.data.model.GitHubProfile;
-import com.firebase.ui.auth.data.model.GitHubTokenResponse;
 import com.firebase.ui.auth.data.model.Resource;
 import com.firebase.ui.auth.data.model.User;
 import com.firebase.ui.auth.data.model.UserCancellationException;
+import com.firebase.ui.auth.github.model.GitHubProfile;
+import com.firebase.ui.auth.github.model.GitHubTokenResponse;
 import com.firebase.ui.auth.ui.HelperActivityBase;
-import com.firebase.ui.auth.ui.provider.GitHubLoginActivity;
 import com.firebase.ui.auth.util.ExtraConstants;
 import com.firebase.ui.auth.viewmodel.ProviderSignInBase;
 import com.firebase.ui.auth.viewmodel.RequestCodes;

auth/src/main/java/com/firebase/ui/auth/data/model/GitHubProfile.java → auth-github/src/main/java/com/firebase/ui/auth/github/model/GitHubProfile.java

@@ -1,4 +1,4 @@
-package com.firebase.ui.auth.data.model;
+package com.firebase.ui.auth.github.model;
 
 import android.net.Uri;
 import android.support.annotation.NonNull;

auth/src/main/java/com/firebase/ui/auth/data/model/GitHubTokenResponse.java → auth-github/src/main/java/com/firebase/ui/auth/github/model/GitHubTokenResponse.java

@@ -1,4 +1,4 @@
-package com.firebase.ui.auth.data.model;
+package com.firebase.ui.auth.github.model;
 
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;

auth-github/src/main/res/values/ids.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Expect auth resources -->
+<resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="ResourceName">
+    <item name="colorPrimary" type="color" />
+    <item name="FirebaseUI.Transparent" type="style" />
+
+    <item name="firebase_web_host" type="string" />
+    <item name="github_client_id" type="string" />
+    <item name="github_client_secret" type="string" />
+</resources>

auth/auth-proguard.pro

@@ -1,4 +1,4 @@
-# Twitter and Facebook are optional
+# 3P providers are optional
 -dontwarn com.facebook.**
 -dontwarn com.twitter.**
 # Keep the class names used to check for availablility

auth/build.gradle.kts

@@ -1,4 +1,3 @@
-
 import com.android.build.gradle.internal.dsl.TestOptions
 
 android {
@@ -34,14 +33,8 @@ dependencies {
     api(Config.Libs.PlayServices.auth)
 
     compileOnly(Config.Libs.Provider.facebook)
-    // Needed to override Facebook
-    implementation(Config.Libs.Support.cardView)
-    implementation(Config.Libs.Support.customTabs)
     compileOnly(Config.Libs.Provider.twitter) { isTransitive = true }
 
-    implementation(Config.Libs.Misc.retrofit)
-    implementation(Config.Libs.Misc.retrofitGson)
-
     testImplementation(Config.Libs.Test.junit)
     testImplementation(Config.Libs.Test.truth)
     testImplementation(Config.Libs.Test.mockito)

auth/src/main/AndroidManifest.xml

@@ -35,30 +35,6 @@
             android:exported="false"
             android:theme="@style/FirebaseUI.Transparent" />
 
-        <activity
-            android:name=".ui.provider.GitHubLoginActivity"
-            android:label=""
-            android:configChanges="keyboard|keyboardHidden|screenLayout|screenSize|orientation"
-            android:launchMode="singleTop"
-            android:theme="@style/FirebaseUI.Transparent">
-
-            <intent-filter
-                android:autoVerify="true"
-                tools:ignore="UnusedAttribute">
-                <action android:name="android.intent.action.VIEW" />
-
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.BROWSABLE" />
-
-                <data
-                    android:host="@string/firebase_web_host"
-                    android:path="/__/auth/handler"
-                    android:scheme="https"
-                    tools:ignore="AppLinksAutoVerifyWarning" />
-            </intent-filter>
-
-        </activity>
-
         <activity
             android:name=".ui.email.RecoverPasswordActivity"
             android:label="@string/fui_title_recover_password_activity"

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

@@ -978,6 +978,12 @@ public static final class GitHubBuilder extends Builder {
             public GitHubBuilder() {
                 //noinspection deprecation taking a hit for the backcompat team
                 super(GithubAuthProvider.PROVIDER_ID);
+                if (!ProviderAvailability.IS_GITHUB_AVAILABLE) {
+                    throw new RuntimeException(
+                            "GitHub provider cannot be configured " +
+                                    "without dependency. Did you forget to add " +
+                                    "'com.firebaseui:firebase-ui-auth-github:VERSION' dependency?");
+                }
                 Preconditions.checkConfigured(getApplicationContext(),
                         "GitHub provider unconfigured. Make sure to add your client id and secret." +
                                 " See the docs for more info:" +

auth/src/main/java/com/firebase/ui/auth/data/remote/GitHubSignInHandlerBridge.java

@@ -0,0 +1,26 @@
+package com.firebase.ui.auth.data.remote;
+
+import android.support.annotation.RestrictTo;
+
+import com.firebase.ui.auth.AuthUI;
+import com.firebase.ui.auth.viewmodel.ProviderSignInBase;
+
+@RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
+public final class GitHubSignInHandlerBridge {
+    public static final Class<ProviderSignInBase<AuthUI.IdpConfig>> HANDLER_CLASS;
+
+    static {
+        try {
+            //noinspection unchecked
+            HANDLER_CLASS = (Class<ProviderSignInBase<AuthUI.IdpConfig>>)
+                    Class.forName("com.firebase.ui.auth.github.GitHubSignInHandler");
+        } catch (ClassNotFoundException e) {
+            throw new IllegalStateException(
+                    "Check for availability with ProviderAvailability first.", e);
+        }
+    }
+
+    private GitHubSignInHandlerBridge() {
+        throw new AssertionError("No instance for you!");
+    }
+}

auth/src/main/java/com/firebase/ui/auth/ui/idp/AuthMethodPickerActivity.java

@@ -44,7 +44,7 @@
 import com.firebase.ui.auth.data.remote.AnonymousSignInHandler;
 import com.firebase.ui.auth.data.remote.EmailSignInHandler;
 import com.firebase.ui.auth.data.remote.FacebookSignInHandler;
-import com.firebase.ui.auth.data.remote.GitHubSignInHandler;
+import com.firebase.ui.auth.data.remote.GitHubSignInHandlerBridge;
 import com.firebase.ui.auth.data.remote.GoogleSignInHandler;
 import com.firebase.ui.auth.data.remote.PhoneSignInHandler;
 import com.firebase.ui.auth.data.remote.TwitterSignInHandler;
@@ -167,7 +167,8 @@ private void populateIdpList(List<IdpConfig> providerConfigs,
                     buttonLayout = R.layout.fui_idp_button_twitter;
                     break;
                 case GithubAuthProvider.PROVIDER_ID:
-                    GitHubSignInHandler github = supplier.get(GitHubSignInHandler.class);
+                    ProviderSignInBase<IdpConfig> github =
+                            supplier.get(GitHubSignInHandlerBridge.HANDLER_CLASS);
                     github.init(idpConfig);
                     provider = github;
 

auth/src/main/java/com/firebase/ui/auth/ui/idp/SingleSignInActivity.java

@@ -16,7 +16,7 @@
 import com.firebase.ui.auth.data.model.FlowParameters;
 import com.firebase.ui.auth.data.model.User;
 import com.firebase.ui.auth.data.remote.FacebookSignInHandler;
-import com.firebase.ui.auth.data.remote.GitHubSignInHandler;
+import com.firebase.ui.auth.data.remote.GitHubSignInHandlerBridge;
 import com.firebase.ui.auth.data.remote.GoogleSignInHandler;
 import com.firebase.ui.auth.data.remote.TwitterSignInHandler;
 import com.firebase.ui.auth.ui.InvisibleActivityBase;
@@ -77,7 +77,8 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
                 mProvider = twitter;
                 break;
             case GithubAuthProvider.PROVIDER_ID:
-                GitHubSignInHandler github = supplier.get(GitHubSignInHandler.class);
+                ProviderSignInBase<AuthUI.IdpConfig> github =
+                        supplier.get(GitHubSignInHandlerBridge.HANDLER_CLASS);
                 github.init(providerConfig);
                 mProvider = github;
                 break;

auth/src/main/java/com/firebase/ui/auth/ui/idp/WelcomeBackIdpPrompt.java

@@ -38,7 +38,7 @@
 import com.firebase.ui.auth.data.model.FlowParameters;
 import com.firebase.ui.auth.data.model.User;
 import com.firebase.ui.auth.data.remote.FacebookSignInHandler;
-import com.firebase.ui.auth.data.remote.GitHubSignInHandler;
+import com.firebase.ui.auth.data.remote.GitHubSignInHandlerBridge;
 import com.firebase.ui.auth.data.remote.GoogleSignInHandler;
 import com.firebase.ui.auth.data.remote.TwitterSignInHandler;
 import com.firebase.ui.auth.ui.AppCompatBase;
@@ -132,7 +132,8 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
                 providerName = R.string.fui_idp_name_twitter;
                 break;
             case GithubAuthProvider.PROVIDER_ID:
-                GitHubSignInHandler github = supplier.get(GitHubSignInHandler.class);
+                ProviderSignInBase<AuthUI.IdpConfig> github =
+                        supplier.get(GitHubSignInHandlerBridge.HANDLER_CLASS);
                 github.init(config);
                 mProvider = github;
 

auth/src/main/java/com/firebase/ui/auth/util/data/ProviderAvailability.java

@@ -4,6 +4,8 @@
 
 @RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
 public final class ProviderAvailability {
+    public static final boolean IS_GITHUB_AVAILABLE =
+            exists("com.firebase.ui.auth.github.GitHubSignInHandler");
     public static final boolean IS_FACEBOOK_AVAILABLE =
             exists("com.facebook.login.LoginManager");
     public static final boolean IS_TWITTER_AVAILABLE =

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

@@ -1,44 +1,13 @@
 <resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="ResourceName">
-    <!-- Example: project-id.firebaseapp.com. Used for OAuth redirects -->
+    <string name="default_web_client_id" translatable="false">CHANGE-ME</string>
     <string name="firebase_web_host" translatable="false">CHANGE-ME</string>
 
-    <!--
-    The Facebook Application ID associated with this Android application. This
-    must be overridden by users of FirebaseUI auth in order to support Facebook
-    accounts in the authentication flow.
-
-    See:
-    https://developers.facebook.com/docs/facebook-login/android
-    -->
     <string name="facebook_application_id" translatable="false">CHANGE-ME</string>
-
-    <!--
-     To enable Chrome Custom Tabs for Facebook Login on devices without the Facebook app
-     installed, change this value to your Facebook App ID prefixed with 'fb'. This should be
-     'fb' + the value of the facebook_application_id string above
-
-     See:
-     https://developers.facebook.com/docs/facebook-login/android#chrome_custom_tabs
-    -->
     <string name="facebook_login_protocol_scheme" translatable="false">fbYOUR_APP_ID</string>
 
-    <!--
-    The Google web client ID associated with this Android application. The
-    google-services gradle plugin will automatically provide this value.
-
-    See:
-    https://developers.google.com/identity/sign-in/web/devconsole-project
-    https://developers.google.com/android/guides/google-services-plugin
-    -->
-    <string name="default_web_client_id" translatable="false">CHANGE-ME</string>
-
-    <!-- Your Twitter Consumer Key. -->
     <string name="twitter_consumer_key" translatable="false">CHANGE-ME</string>
-    <!-- Your Twitter Consumer Secret. -->
     <string name="twitter_consumer_secret" translatable="false">CHANGE-ME</string>
 
-    <!-- Your GitHub Client ID. -->
     <string name="github_client_id" translatable="false">CHANGE-ME</string>
-    <!-- Your GitHub Client Secret. -->
     <string name="github_client_secret" translatable="false">CHANGE-ME</string>
 </resources>

buildSrc/src/main/kotlin/Config.kt

@@ -1,6 +1,6 @@
 object Config {
     const val version = "4.2.0-SNAPSHOT"
-    val submodules = listOf("auth", "common", "firestore", "database", "storage")
+    val submodules = listOf("auth", "auth-github", "common", "firestore", "database", "storage")
 
     private const val kotlinVersion = "1.2.61"
 
@@ -30,6 +30,7 @@ object Config {
             const val multidex = "com.android.support:multidex:1.0.3"
             const val annotations = "com.android.support:support-annotations:$version"
             const val v4 = "com.android.support:support-v4:$version"
+            const val appCompat = "com.android.support:appcompat-v7:$version"
             const val design = "com.android.support:design:$version"
             const val recyclerView = "com.android.support:recyclerview-v7:$version"
             const val cardView = "com.android.support:cardview-v7:$version"

settings.gradle.kts

@@ -1,7 +1,7 @@
 include(
         ":app", ":library",
 
-        ":auth",
+        ":auth", ":auth-github",
         ":common", ":firestore", ":database",
         ":storage",