Implemented hacky Google sign-in

abeisgoat · abeisgoat · commit 3f12e19a2e25 · 2015-11-13T18:32:06.000-08:00
diff --git a/app/build.gradle b/app/build.gradle
@@ -7,7 +7,7 @@ android {
 
     defaultConfig {
         applicationId "com.firebase.uidemo"
-        minSdkVersion 15
+        minSdkVersion 16
         targetSdkVersion 22
         versionCode 1
         versionName "1.0"
@@ -29,8 +29,7 @@ android {
 dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
     compile 'com.android.support:appcompat-v7:22.2.0'
-    compile 'com.google.android.gms:play-services-identity:8.1.0'
-    compile 'com.google.android.gms:play-services-plus:8.1.0'
+    compile 'com.google.android.gms:play-services-auth:8.3.0'
     compile 'com.firebase:firebase-client-android:2.3.1'
     compile 'com.android.support:recyclerview-v7:22.2.1'
     compile 'com.facebook.android:facebook-android-sdk:4.6.0'
diff --git a/app/google-services.json b/app/google-services.json
@@ -0,0 +1 @@
+{"project_info":{"project_id":"firebaseui","project_number":"945226082630","name":"FirebaseUI"},"client":[{"client_info":{"mobilesdk_app_id":"1:945226082630:android:91eecf4730fc920b","client_id":"android:com.firebase.uidemo","client_type":1,"android_client_info":{"package_name":"com.firebase.uidemo"}},"oauth_client":[{"client_id":"945226082630-89h2p3g5jr54gq1kccr15ig5qj9l1i0c.apps.googleusercontent.com","client_type":1,"android_info":{"package_name":"com.firebase.uidemo","certificate_hash":"29E1FFD35E7D0EDD6F4FD574CE1516B1051B6472"}}],"api_key":[{"current_key":"AIzaSyAx2pLbFgIcFNQOvYRkUv83rv-nKX-76vc"}],"services":{"analytics_service":{"status":1},"cloud_messaging_service":{"status":2,"apns_config":[]},"appinvite_service":{"status":1,"other_platform_oauth_client":[]},"google_signin_service":{"status":2},"ads_service":{"status":1}}}],"client_info":[],"ARTIFACT_VERSION":"1"}
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -40,6 +40,8 @@
             android:name="com.facebook.sdk.ApplicationId"
             android:value="@string/facebook_app_id" />
 
+        <activity android:name="com.firebase.ui.auth.google.GoogleSignInActivity" />
+
 
     </application>
 
diff --git a/app/src/main/java/com/firebase/uidemo/RecyclerViewDemoActivity.java b/app/src/main/java/com/firebase/uidemo/RecyclerViewDemoActivity.java
@@ -68,7 +68,7 @@ public void onComplete(FirebaseError firebaseError, Firebase firebase) {
         mMessages = (RecyclerView) findViewById(R.id.messagesList);
 
         LinearLayoutManager manager = new LinearLayoutManager(this);
-        manager.setStackFromEnd(true);
+        manager.setReverseLayout(false);
 
         mMessages.setHasFixedSize(false);
         mMessages.setLayoutManager(manager);
diff --git a/build.gradle b/build.gradle
@@ -6,7 +6,7 @@ buildscript {
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:1.2.3'
-        classpath 'com.google.gms:google-services:1.4.0-beta3'
+        classpath 'com.google.gms:google-services:1.5.0-beta2'
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
     }
@@ -16,6 +16,5 @@ allprojects {
     repositories {
         jcenter()
         mavenCentral()
-        maven { url 'https://maven.fabric.io/public' }
     }
 }
diff --git a/library/build.gradle b/library/build.gradle
@@ -6,7 +6,7 @@ android {
     buildToolsVersion "22.0.1"
 
     defaultConfig {
-        minSdkVersion 15
+        minSdkVersion 16
         targetSdkVersion 22
         versionCode 1
         versionName "0.2.0"
@@ -45,12 +45,8 @@ dependencies {
     compile 'com.android.support:appcompat-v7:22.2.0'
     compile 'com.firebase:firebase-client-android:2.3.1'
     compile 'com.android.support:recyclerview-v7:22.2.0'
-    compile 'com.google.android.gms:play-services-identity:8.1.0'
-    compile 'com.google.android.gms:play-services-plus:8.1.0'
+    compile 'com.google.android.gms:play-services-auth:8.3.0'
     compile 'com.facebook.android:facebook-android-sdk:4.6.0'
     compile 'org.twitter4j:twitter4j-core:4.0.2'
-    compile('com.twitter.sdk.android:twitter:1.9.1@aar') {
-        transitive = true;
-    }
     androidTestCompile 'junit:junit:4.12'
 }
diff --git a/library/google-services.json b/library/google-services.json
@@ -0,0 +1 @@
+{"project_info":{"project_id":"firebaseui","project_number":"945226082630","name":"FirebaseUI"},"client":[{"client_info":{"mobilesdk_app_id":"1:945226082630:android:91eecf4730fc920b","client_id":"android:com.firebase.uidemo","client_type":1,"android_client_info":{"package_name":"com.firebase.uidemo"}},"oauth_client":[{"client_id":"945226082630-89h2p3g5jr54gq1kccr15ig5qj9l1i0c.apps.googleusercontent.com","client_type":1,"android_info":{"package_name":"com.firebase.uidemo","certificate_hash":"29E1FFD35E7D0EDD6F4FD574CE1516B1051B6472"}}],"api_key":[{"current_key":"AIzaSyAx2pLbFgIcFNQOvYRkUv83rv-nKX-76vc"}],"services":{"analytics_service":{"status":1},"cloud_messaging_service":{"status":2,"apns_config":[]},"appinvite_service":{"status":1,"other_platform_oauth_client":[]},"google_signin_service":{"status":2},"ads_service":{"status":1}}}],"client_info":[],"ARTIFACT_VERSION":"1"}
diff --git a/library/src/main/java/com/firebase/ui/auth/core/FirebaseActions.java b/library/src/main/java/com/firebase/ui/auth/core/FirebaseActions.java
@@ -0,0 +1,12 @@
+package com.firebase.ui.auth.core;
+
+/**
+ * Created by abehaskins on 11/9/15.
+ */
+public class FirebaseActions {
+    public static final int LOGIN = 0;
+    public static final int USER_ERROR = 1;
+    public static final int PROVIDER_ERROR = 2;
+    public static final int SUCCESS = 3;
+}
+
diff --git a/library/src/main/java/com/firebase/ui/auth/core/FirebaseErrors.java b/library/src/main/java/com/firebase/ui/auth/core/FirebaseErrors.java
@@ -0,0 +1,12 @@
+package com.firebase.ui.auth.core;
+
+public class FirebaseErrors {
+    public static int WRONG_CREDENTIALS = 0;
+    public static int PROVIDER_NOT_ENABLED = 1;
+    public static int LOGIN_CANCELLED = 2;
+    public static int MISC_PROVIDER_ERROR = 3;
+    public static int INVALID_PROVIDER_APP_ID = 4;
+    public static int INVALID_PROVIDER_APP_KEY = 5;
+    public static int MISSING_PROVIDER_APP_ID = 6;
+    public static int MISSING_PROVIDER_APP_KEY = 7;
+}
diff --git a/library/src/main/java/com/firebase/ui/auth/core/FirebaseLoginBaseActivity.java b/library/src/main/java/com/firebase/ui/auth/core/FirebaseLoginBaseActivity.java
@@ -86,6 +86,7 @@ public void onActivityResult(int requestCode, int resultCode, Intent data) {
         } else {
             mFacebookAuthHelper.mCallbackManager.onActivityResult(requestCode, resultCode, data);
             mTwitterAuthHelper.onActivityResult(requestCode, resultCode, data);
+            mGoogleAuthHelper.onActivityResult(requestCode, resultCode, data);
         }
     }
 
diff --git a/library/src/main/java/com/firebase/ui/auth/core/FirebaseLoginDialog.java b/library/src/main/java/com/firebase/ui/auth/core/FirebaseLoginDialog.java
@@ -49,6 +49,10 @@ public void onActivityResult(int requestCode, int resultCode, Intent data) {
         if (mTwitterAuthHelper != null) {
             mTwitterAuthHelper.onActivityResult(requestCode, resultCode, data);
         }
+
+        if (mGoogleAuthHelper != null) {
+            mGoogleAuthHelper.onActivityResult(requestCode, resultCode, data);
+        }
     }
 
     View mView;
diff --git a/library/src/main/java/com/firebase/ui/auth/core/FirebaseLoginError.java b/library/src/main/java/com/firebase/ui/auth/core/FirebaseLoginError.java
@@ -0,0 +1,12 @@
+package com.firebase.ui.auth.core;
+
+public class FirebaseLoginError {
+    public String message;
+    public int error;
+
+    public FirebaseLoginError(int error, String message) {
+        this.message = message;
+        this.error = error;
+    }
+
+}
diff --git a/library/src/main/java/com/firebase/ui/auth/google/GoogleAuthHelper.java b/library/src/main/java/com/firebase/ui/auth/google/GoogleAuthHelper.java
@@ -2,163 +2,57 @@
 
 import android.app.Activity;
 import android.content.Context;
-import android.content.IntentSender;
+import android.content.Intent;
 import android.os.Bundle;
-import android.util.Log;
 
+import com.firebase.client.AuthData;
 import com.firebase.client.Firebase;
+import com.firebase.client.FirebaseError;
+import com.firebase.ui.auth.core.FirebaseActions;
 import com.firebase.ui.auth.core.FirebaseAuthHelper;
+import com.firebase.ui.auth.core.FirebaseErrors;
+import com.firebase.ui.auth.core.FirebaseLoginError;
 import com.firebase.ui.auth.core.FirebaseOAuthToken;
 import com.firebase.ui.auth.core.TokenAuthHandler;
-import com.google.android.gms.auth.GoogleAuthException;
-import com.google.android.gms.auth.UserRecoverableAuthException;
-import com.google.android.gms.common.ConnectionResult;
-import com.google.android.gms.common.Scopes;
+import com.firebase.ui.auth.twitter.TwitterPromptActivity;
+import com.google.android.gms.auth.api.Auth;
+import com.google.android.gms.auth.api.signin.GoogleSignInOptions;
 import com.google.android.gms.common.api.GoogleApiClient;
-import com.google.android.gms.common.api.Scope;
-import com.google.android.gms.plus.Plus;
 
-import java.io.IOException;
-
-public class GoogleAuthHelper extends FirebaseAuthHelper implements
-        GoogleApiClient.ConnectionCallbacks,
-        GoogleApiClient.OnConnectionFailedListener{
+public class GoogleAuthHelper extends FirebaseAuthHelper {
 
     private final String LOG_TAG = "GoogleAuthHelper";
 
-    public static final String PROVIDER_NAME = "google";
+    public final static String PROVIDER_NAME = "google";
 
-    /* User provided callback class */
     private TokenAuthHandler mHandler;
+    private Activity mActivity;
     private Firebase mRef;
-
-    /* Request code used to invoke sign in user interactions. */
-    private static final int RC_GOOGLE_SIGN_IN = 0;
-
-    /* Client used to interact with Google APIs. */
     private GoogleApiClient mGoogleApiClient;
 
-    /* Is there a ConnectionResult resolution in progress? */
-    private boolean mIsResolving = false;
-
-    /* Should we automatically resolve ConnectionResults when possible? */
-    private boolean mShouldResolve = false;
-
-    /* A flag indicating that a PendingIntent is in progress and prevents us from starting further intents. */
-    private boolean mGoogleIntentInProgress;
-
-    /* Store the connection result from onConnectionFailed callbacks so that we can resolve them when the user clicks
-     * sign-in. */
-    private ConnectionResult mGoogleConnectionResult;
-
-    private Context mContext;
-
-    private GoogleTokenTask mGoogleTokenTask;
-
     public GoogleAuthHelper(Context context, Firebase ref, TokenAuthHandler handler) {
-        // Builder API
-        mGoogleApiClient = new GoogleApiClient.Builder(context)
-                .addConnectionCallbacks(this)
-                .addOnConnectionFailedListener(this)
-                .addApi(Plus.API)
-                .addScope(new Scope(Scopes.PROFILE))
-                .build();
-
-        // Activity Context
-        mContext = context;
-
+        mActivity = (Activity) context;
         mRef = ref;
-
-        // User defined callbacks
         mHandler = handler;
-
-
-        // Create a new GoogleAuthTokenTask
-        mGoogleTokenTask = new GoogleTokenTask(mContext, mGoogleApiClient, new GoogleTokenHandler() {
-            @Override
-            public void onTokenReceived(String token) {
-                FirebaseOAuthToken foToken = new FirebaseOAuthToken(
-                        PROVIDER_NAME,
-                        token);
-                onFirebaseTokenReceived(foToken, mHandler);
-            }
-
-            @Override
-            public void onUserRecoverableAuthException(UserRecoverableAuthException ex) {
-                //mHandler.onError(ex);
-            }
-
-            @Override
-            public void onGoogleAuthException(GoogleAuthException ex) {
-                //mHandler.onError(ex);
-            }
-
-            @Override
-            public void onIOException(IOException ex) {
-                //mHandler.onError(ex);
-            }
-        });
     }
 
-    public void login() {
-        if (!mGoogleApiClient.isConnecting()) {
-            if (mGoogleConnectionResult != null) {
-                resolveSignInError();
-            } else if (mGoogleApiClient.isConnected()) {
-                mGoogleTokenTask.execute();
-            } else {
-                // connect API now
-                Log.d(LOG_TAG, "Trying to connect to Google API");
-                mGoogleApiClient.connect();
-            }
-        }
-    }
-
-    public void logout() {
-        mGoogleApiClient.disconnect();
-    }
     public String getProviderName() { return PROVIDER_NAME; }
     public Firebase getFirebaseRef() { return mRef; }
-
-    @Override
-    public void onConnected(Bundle bundle) {
-        // onConnected indicates that an account was selected on the device, that the selected
-        // account has granted any requested permissions to our app and that we were able to
-        // establish a service connection to Google Play services.
-        mGoogleTokenTask.execute();
-    }
-
-    @Override
-    public void onConnectionSuspended(int i) {
-        Log.e("", Integer.valueOf(i).toString());
-    }
-
-    @Override
-    public void onConnectionFailed(ConnectionResult result) {
-        if (!mGoogleIntentInProgress) {
-            /* Store the ConnectionResult so that we can use it later when the user logs in */
-            mGoogleConnectionResult = result;
-            Log.e(LOG_TAG, result.toString());
-            resolveSignInError();
-        }
+    public void logout() {}
+    public void login() {
+        mActivity.startActivityForResult(new Intent(mActivity, GoogleSignInActivity.class), FirebaseActions.LOGIN);
     }
 
-    /* A helper method to resolve the current ConnectionResult error. */
-    private void resolveSignInError() {
-        Log.v(LOG_TAG, Boolean.valueOf(mGoogleConnectionResult.hasResolution()).toString());
-        if (mGoogleConnectionResult.hasResolution()) {
-            try {
-                mGoogleIntentInProgress = true;
-                mGoogleConnectionResult.startResolutionForResult((Activity) mContext, RC_GOOGLE_SIGN_IN);
-            } catch (IntentSender.SendIntentException e) {
-                // The intent was canceled before it was sent.  Return to the default
-                // state and attempt to connect to get an updated ConnectionResult.
-                mGoogleIntentInProgress = false;
-                mGoogleApiClient.connect();
-            }
-        } else {
-            // Create error code?
-            Log.e(LOG_TAG, mGoogleConnectionResult.toString());
+    public void onActivityResult(int requestCode, int resultCode, Intent data) {
+        if (resultCode == 120321) {
+            FirebaseOAuthToken token = new FirebaseOAuthToken(
+                    PROVIDER_NAME,
+                    data.getStringExtra("oauth_token"));
+            onFirebaseTokenReceived(token, mHandler);
+        } else if (resultCode == FirebaseActions.USER_ERROR) {
+            mHandler.onUserError(new FirebaseLoginError(data.getIntExtra("code", 0), data.getStringExtra("error")));
+        } else if (resultCode == FirebaseActions.PROVIDER_ERROR) {
+            mHandler.onProviderError(new FirebaseLoginError(data.getIntExtra("code", 0), data.getStringExtra("error")));
         }
     }
 }
diff --git a/library/src/main/java/com/firebase/ui/auth/google/GoogleSignInActivity.java b/library/src/main/java/com/firebase/ui/auth/google/GoogleSignInActivity.java
diff --git a/library/src/main/java/com/firebase/ui/auth/google/GoogleTokenHandler.java b/library/src/main/java/com/firebase/ui/auth/google/GoogleTokenHandler.java
diff --git a/library/src/main/java/com/firebase/ui/auth/google/GoogleTokenTask.java b/library/src/main/java/com/firebase/ui/auth/google/GoogleTokenTask.java

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	+{"project_info":{"project_id":"firebaseui","project_number":"945226082630","name":"FirebaseUI"},"client":[{"client_info":{"mobilesdk_app_id":"1:945226082630:android:91eecf4730fc920b","client_id":"android:com.firebase.uidemo","client_type":1,"android_client_info":{"package_name":"com.firebase.uidemo"}},"oauth_client":[{"client_id":"945226082630-89h2p3g5jr54gq1kccr15ig5qj9l1i0c.apps.googleusercontent.com","client_type":1,"android_info":{"package_name":"com.firebase.uidemo","certificate_hash":"29E1FFD35E7D0EDD6F4FD574CE1516B1051B6472"}}],"api_key":[{"current_key":"AIzaSyAx2pLbFgIcFNQOvYRkUv83rv-nKX-76vc"}],"services":{"analytics_service":{"status":1},"cloud_messaging_service":{"status":2,"apns_config":[]},"appinvite_service":{"status":1,"other_platform_oauth_client":[]},"google_signin_service":{"status":2},"ads_service":{"status":1}}}],"client_info":[],"ARTIFACT_VERSION":"1"}
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ buildscript {`
`6`	`6`	`}`
`7`	`7`	`dependencies {`
`8`	`8`	`classpath 'com.android.tools.build:gradle:1.2.3'`
`9`		`- classpath 'com.google.gms:google-services:1.4.0-beta3'`
	`9`	`+ classpath 'com.google.gms:google-services:1.5.0-beta2'`
`10`	`10`	`// NOTE: Do not place your application dependencies here; they belong`
`11`	`11`	`// in the individual module build.gradle files`
`12`	`12`	`}`
`@@ -16,6 +16,5 @@ allprojects {`
`16`	`16`	`repositories {`
`17`	`17`	`jcenter()`
`18`	`18`	`mavenCentral()`
`19`		`- maven { url 'https://maven.fabric.io/public' }`
`20`	`19`	`}`
`21`	`20`	`}`
Original file line number	Diff line number	Diff line change
`@@ -86,6 +86,7 @@ public void onActivityResult(int requestCode, int resultCode, Intent data) {`
`86`	`86`	`} else {`
`87`	`87`	`mFacebookAuthHelper.mCallbackManager.onActivityResult(requestCode, resultCode, data);`
`88`	`88`	`mTwitterAuthHelper.onActivityResult(requestCode, resultCode, data);`
	`89`	`+ mGoogleAuthHelper.onActivityResult(requestCode, resultCode, data);`
`89`	`90`	`}`
`90`	`91`	`}`
`91`	`92`