Merge pull request #23 from saleeh93/master

Facebook login fix android

Author: auser

android/src/main/java/io/fullstack/firestack/FirestackAuth.java

@@ -136,6 +136,9 @@ public void onComplete(@NonNull Task<AuthResult> task) {
 
     @ReactMethod
     public void signInWithProvider(final String provider, final String authToken, final String authSecret, final Callback callback) {
+      if (provider.equals("facebook")) {
+           this.facebookLogin(authToken,callback);
+      } else
       // TODO
       FirestackUtils.todoNote(TAG, "signInWithProvider", callback);
     }
@@ -403,17 +406,23 @@ public void userCallback(FirebaseUser passedUser, final Callback onComplete) {
             @Override
             public void onComplete(@NonNull Task<GetTokenResult> task) {
                 WritableMap userMap = Arguments.createMap();
-
+                final String name = user.getDisplayName();
                 final String token = task.getResult().getToken();
                 final String email = user.getEmail();
                 final String uid   = user.getUid();
                 final String provider = user.getProviderId();
+                final Uri photoUrl = user.getPhotoUrl();
 
+                userMap.putString("name", name);
                 userMap.putString("token", token);
                 userMap.putString("email", email);
                 userMap.putString("uid", uid);
                 userMap.putString("provider", provider);
 
+                if (photoUrl!=null) {
+                  userMap.putString("photoUrl",photoUrl.toString());
+                }
+
                 onComplete.invoke(null, userMap);
             }
         });
@@ -451,4 +460,4 @@ private WritableMap getUserMap() {
     }
 
 
-}
+}

android/src/main/java/io/fullstack/firestack/FirestackDatabase.java

@@ -391,7 +391,7 @@ public void on(final String path,
   @ReactMethod
   public void onOnce(final String path,
                      final ReadableArray modifiers,
-                     final String name, 
+                     final String name,
                      final Callback callback) {
     Log.d(TAG, "Setting one-time listener on event: " + name + " for path " + path);
     FirestackDBReference ref = this.getDBHandle(path);
@@ -518,7 +518,7 @@ private FirestackDBReference getDBHandle(final String path) {
     return mDBListeners.get(path);
   }
 
-  private void saveDBHandle(final String path, 
+  private void saveDBHandle(final String path,
                             final FirestackDBReference dbRef) {
     this.removeDBHandle(path);
     mDBListeners.put(path, dbRef);

android/src/main/java/io/fullstack/firestack/FirestackStorage.java

@@ -79,7 +79,7 @@ public void onSuccess(Uri uri) {
         }
       }).addOnFailureListener(new OnFailureListener() {
         @Override
-        public void onFailure(@NonNull Exception ex) {
+        public void onFailure(@NonNull Exception exception) {
           Log.e(TAG, "Failed to download file " + exception.getMessage());
 
           WritableMap err = Arguments.createMap();
@@ -88,7 +88,7 @@ public void onFailure(@NonNull Exception ex) {
 
           callback.invoke(err);
         }
-      })
+      });
   }
 
   // STORAGE
@@ -157,7 +157,7 @@ public void onSuccess(UploadTask.TaskSnapshot taskSnapshot) {
         public void onProgress(UploadTask.TaskSnapshot taskSnapshot) {
           double progress = (100.0 * taskSnapshot.getBytesTransferred()) / taskSnapshot.getTotalByteCount();
           System.out.println("Upload is " + progress + "% done");
-          
+
           WritableMap data = Arguments.createMap();
           data.putString("eventName", "upload_progress");
           data.putDouble("progress", progress);
@@ -184,4 +184,4 @@ public void onPaused(UploadTask.TaskSnapshot taskSnapshot) {
       callback.invoke(err);
     }
   }
-}
+}