Cleans up use of FirebaseOAuthToken and fixes Facebook login

Author: abeisgoat

library/src/main/java/com/firebase/ui/FirebaseLoginBaseActivity.java

@@ -5,8 +5,6 @@
 import android.support.v7.app.AppCompatActivity;
 import android.util.Log;
 
-import com.facebook.FacebookSdk;
-import com.facebook.appevents.AppEventsLogger;
 import com.firebase.client.AuthData;
 import com.firebase.client.Firebase;
 import com.firebase.client.FirebaseError;
@@ -25,8 +23,6 @@
 import java.util.HashMap;
 import java.util.Map;
 
-import twitter4j.Twitter;
-
 public abstract class FirebaseLoginBaseActivity extends AppCompatActivity {
 
     private final String LOG_TAG = "FirebaseLoginBaseAct";
@@ -96,7 +92,7 @@ protected void onCreate(Bundle savedInstanceState) {
         mFacebookAuthHelper = new FacebookAuthHelper(this, new TokenAuthHandler() {
             @Override
             public void onTokenReceived(FirebaseOAuthToken token) {
-                authenticateRefWithProvider(token.provider, token.token);
+                authenticateRefWithFirebaseOAuthToken(token);
             }
 
             @Override
@@ -113,7 +109,7 @@ public void onError(Exception ex) {
         mGoogleAuthHelper = new GoogleAuthHelper(this, new TokenAuthHandler() {
             @Override
             public void onTokenReceived(FirebaseOAuthToken token) {
-                authenticateRefWithProvider(token.provider, token.token);
+                authenticateRefWithFirebaseOAuthToken(token);
             }
 
             @Override
@@ -130,7 +126,7 @@ public void onError(Exception ex) {
         mTwitterAuthHelper = new TwitterAuthHelper(this, new TokenAuthHandler() {
             @Override
             public void onTokenReceived(FirebaseOAuthToken token) {
-                authenticateRefWithProvider(token.provider, token);
+                authenticateRefWithFirebaseOAuthToken(token);
             }
 
             @Override
@@ -146,7 +142,8 @@ public void onError(Exception ex) {
     }
 
     public void onActivityResult(int requestCode, int resultCode, Intent data) {
-        Log.d("BASE", "ACTIVITY");
+        Log.d("BASE", "ACTIVITY" + data.toString());
+        mFacebookAuthHelper.mCallbackManager.onActivityResult(requestCode, resultCode, data);
         mTwitterAuthHelper.onActivityResult(requestCode, resultCode, data);
     }
 
@@ -168,57 +165,53 @@ public void onAuthStateChanged(AuthData authData) {
         });
     }
 
-    private void authenticateRefWithProvider(String provider, String token) {
-        getFirebaseRef().authWithOAuthToken(provider, token, new Firebase.AuthResultHandler() {
-            @Override
-            public void onAuthenticated(AuthData authData) {
-                // Do nothing. Auth updates are handled in the AuthStateListener
-            }
-
-            @Override
-            public void onAuthenticationError(FirebaseError firebaseError) {
-                onFirebaseLoginError(firebaseError);
-            }
-        });
-    }
-
-    private void authenticateRefWithProvider(String provider, FirebaseOAuthToken token) {
-        Map<String, String> options = new HashMap<>();
-        options.put("oauth_token", token.token);
-        options.put("oauth_token_secret", token.secret);
-        options.put("user_id", token.uid);
+    private void authenticateRefWithFirebaseOAuthToken(FirebaseOAuthToken token) {
+        if (token.mode == FirebaseOAuthToken.SIMPLE) {
+            // Simple mode is used for Facebook and Google auth
+            getFirebaseRef().authWithOAuthToken(token.provider, token.token, new Firebase.AuthResultHandler() {
+                @Override
+                public void onAuthenticated(AuthData authData) {
+                    // Do nothing. Auth updates are handled in the AuthStateListener
+                }
 
-        getFirebaseRef().authWithOAuthToken(provider, options, new Firebase.AuthResultHandler() {
-            @Override
-            public void onAuthenticated(AuthData authData) {
-                // Do nothing. Auth updates are handled in the AuthStateListener
-            }
+                @Override
+                public void onAuthenticationError(FirebaseError firebaseError) {
+                    onFirebaseLoginError(firebaseError);
+                }
+            });
+        } else if (token.mode == FirebaseOAuthToken.COMPLEX) {
+            // Complex mode is used for Twitter auth
+            Map<String, String> options = new HashMap<>();
+            options.put("oauth_token", token.token);
+            options.put("oauth_token_secret", token.secret);
+            options.put("user_id", token.uid);
+
+            getFirebaseRef().authWithOAuthToken(token.provider, options, new Firebase.AuthResultHandler() {
+                @Override
+                public void onAuthenticated(AuthData authData) {
+                    // Do nothing. Auth updates are handled in the AuthStateListener
+                }
 
-            @Override
-            public void onAuthenticationError(FirebaseError firebaseError) {
-                onFirebaseLoginError(firebaseError);
-            }
-        });
+                @Override
+                public void onAuthenticationError(FirebaseError firebaseError) {
+                    onFirebaseLoginError(firebaseError);
+                }
+            });
+        }
     }
 
     private String getFirebaseUrlFromConfig() {
         String firebaseUrl;
         try {
-
             InputStream inputStream = getAssets().open("firebase-config.json");
-
             int size  = inputStream.available();
-
             byte[] buffer = new byte[size];
 
             inputStream.read(buffer);
-
             inputStream.close();
 
             String json = new String(buffer, "UTF-8");
-
             JSONObject obj = new JSONObject(json);
-
             firebaseUrl = obj.getString("firebaseUrl");
 
         } catch (IOException ex) {

library/src/main/java/com/firebase/ui/com/firebasei/ui/authimpl/FacebookAuthHelper.java

@@ -35,13 +35,12 @@ public class FacebookAuthHelper {
     public final String PROVIDER_NAME = "facebook";
 
     private LoginManager mLoginManager;
-    private CallbackManager mCallbackManager;
+    public CallbackManager mCallbackManager;
     private Context mContext;
     private TokenAuthHandler mHandler;
     private Activity mActivity;
 
     public FacebookAuthHelper(Context context, TokenAuthHandler handler) {
-        Log.d(LOG_TAG, "SETTING UP");
         mActivity = (Activity) context;
         FacebookSdk.sdkInitialize(context.getApplicationContext());
 
@@ -54,7 +53,6 @@ public FacebookAuthHelper(Context context, TokenAuthHandler handler) {
                 new FacebookCallback<LoginResult>() {
                     @Override
                     public void onSuccess(LoginResult loginResult) {
-                        Log.d(LOG_TAG, "LOGGED IN");
                         AccessToken token = loginResult.getAccessToken();
 
                         FirebaseOAuthToken foToken = new FirebaseOAuthToken(
@@ -65,26 +63,15 @@ public void onSuccess(LoginResult loginResult) {
 
                     @Override
                     public void onCancel() {
-                        Log.d(LOG_TAG, "CANCEL");
                         mHandler.onCancelled();
                     }
 
                     @Override
                     public void onError(FacebookException ex) {
-                        Log.d(LOG_TAG, "ERROR");
                         mHandler.onError(ex);
                     }
                 }
         );
-
-        AccessTokenTracker mFacebookAccessTokenTracker = new AccessTokenTracker() {
-            @Override
-            protected void onCurrentAccessTokenChanged(AccessToken oldAccessToken, AccessToken currentAccessToken) {
-                Log.d(LOG_TAG, "Facebook.AccessTokenTracker.OnCurrentAccessTokenChanged");
-            }
-        };
-        mFacebookAccessTokenTracker.startTracking();
-        Log.d(LOG_TAG, "SETUP DONE");
     }
 
     public void login() {

library/src/main/java/com/firebase/ui/com/firebasei/ui/authimpl/FirebaseOAuthToken.java

@@ -8,16 +8,22 @@ public class FirebaseOAuthToken {
     public String secret;
     public String uid;
     public String provider;
+    public int mode;
+
+    public static final int SIMPLE = 1;
+    public static final int COMPLEX = 2;
 
     public FirebaseOAuthToken(String provider, String token) {
         this.provider = provider;
         this.token = token;
+        this.mode = SIMPLE;
     }
 
     public FirebaseOAuthToken(String provider, String token, String secret, String uid) {
         this.provider = provider;
         this.token = token;
         this.secret = secret;
         this.uid = uid;
+        this.mode = COMPLEX;
     }
 }