Merge branch 'v3' of github.com:fullstackreact/react-native-firestack into v3

* 'v3' of github.com:fullstackreact/react-native-firestack: (30 commits)
  Fix possible NPE in iOS database module
  Create working podspec for Firestack
  Add error callback for database .on handler (matches Web spec)
  Update authentication.md
  auth().currentUser.reload() now correctly calls reloadUser - woops
  messaging.send() now only accepts an object of type RemoteMessage as defined in messaging.js - this now includes all the previously missing options such as ttl and collapse key
  added currentUser.reload() method - android only, needs ios
  Fix incorrect db path
  Add storage documentation
  misc
  Fix example provider name
  - JS: added EmailAuthProvider interface     - .credential(email, password);
  standardise auth messages to match web sdk error messages
  standardise auth messages to match web sdk error messages
  Fix issues caused by path type change.
  Fix breakage when path to declare ref.on() event handler differs from paths of snapshots returned by callback.
  Support for ref.once('child_added')
  Add timeout
  Fix error 'TypeError: Cannot read property 'snapshot' of undefined'
  Wrap update function in try block.
  ...

Author: auser

Firestack.podspec

@@ -1,61 +1,28 @@
 require 'json'
-package = JSON.parse(File.read('package.json'))
-version = package["version"]
-repo = package['repository']
-author = package['author']
 
-all_pods = [      
-  'FirebaseAnalytics', 'FirebaseAuth', 'FirebaseRemoteConfig',
-  'FirebaseDatabase', 'FirebaseStorage', 'FirebaseInstanceID',
-  'GoogleInterchangeUtilities', 'GoogleIPhoneUtilities',
-  'GoogleNetworkingUtilities', 'GoogleParsingUtilities',
-  'GoogleSymbolUtilities'
-]
+package = JSON.parse(File.read('package.json'))
 
 Pod::Spec.new do |s|
-
-  s.name         = "Firestack"
-  s.version      = version
-  s.summary      = "Firestack makes working with Firebase v3 easy"
-
-  s.description  = <<-DESC
-  Wanna integrate firebase into your app using React Native?
-                   DESC
-
-  s.homepage     = "http://fullstackreact.com"
-
-  s.license      = { :type => "MIT", :file => "LICENSE" }
-  s.author             = { "Ari Lerner" => author }
-  s.social_media_url   = 'http://twitter.com/fullstackio'
-
-  #  When using multiple platforms
-  s.ios.deployment_target = "8.0"
-  # s.osx.deployment_target = "10.7"
-  # s.watchos.deployment_target = "2.0"
-  # s.tvos.deployment_target = "9.0"
-
-  s.source = { :git => repo['url'], :tag => "v#{version}" }
-  s.public_header_files = "ios/Firestack/*.h"
-
-  s.source_files   = 'ios/Firestack/*.{h,m}'
-  s.preserve_paths = 'README.md', 'package.json', '*.js'
-
-  s.ios.frameworks = [
-    'CFNetwork', 'Security', 'SystemConfiguration'
-  ]
-  s.ios.libraries = ['icucore', 'c++', 'sqlite3', 'z']
-
-  s.xcconfig = {
-    'HEADER_SEARCH_PATHS' => [
-        "$(inherited)", 
-        "${SRCROOT}/../../React/**", 
-        "${SRCROOT}/../../node_modules/react-native/**"
-      ].join(' '),
-    'FRAMEWORK_SEARCH_PATHS' => [
-        "$(inherited)", 
-        "${PODS_ROOT}/Firebase/**",
-        "${PODS_ROOT}/FirebaseStorage/**",
-      ].join(' '),
-    'OTHER_LDFLAGS' => '$(inherited) -ObjC'
-  }
-end
+  s.name                = "Firestack"
+  s.version             = package["version"]
+  s.summary             = package["description"]
+  s.description         = <<-DESC
+                            Wanna integrate firebase into your app using React Native?
+                          DESC
+  s.homepage            = "http://fullstackreact.com"
+  s.license             = package['license']
+  s.author              = "Ari Lerner"
+  s.source              = { :git => "https://github.com/fullstackreact/react-native-firestack.git", :tag => "v#{s.version}" }
+  s.social_media_url    = 'http://twitter.com/fullstackio'
+  s.platform            = :ios, "8.0"
+  s.header_dir          = 'ios/Firestack'
+  s.preserve_paths      = 'README.md', 'package.json', '*.js'
+  s.source_files        = 'ios/Firestack/*.{h,m}'
+  s.dependency          'React'
+  s.dependency          'Firebase/Auth'
+  s.dependency          'Firebase/Core'
+  s.dependency          'Firebase/Database'
+  s.dependency          'Firebase/Messaging'
+  s.dependency          'Firebase/RemoteConfig'
+  s.dependency          'Firebase/Storage'
+end

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

@@ -25,9 +25,12 @@
 import com.google.firebase.auth.UserProfileChangeRequest;
 import com.google.firebase.auth.FacebookAuthProvider;
 import com.google.firebase.auth.FirebaseAuth;
+import com.google.firebase.auth.FirebaseAuthException;
 import com.google.firebase.auth.FirebaseUser;
 import com.google.firebase.auth.GetTokenResult;
 import com.google.firebase.auth.GoogleAuthProvider;
+import com.google.firebase.auth.EmailAuthProvider;
+
 
 import io.fullstack.firestack.Utils;
 
@@ -50,7 +53,7 @@ public FirestackAuth(ReactApplicationContext reactContext) {
     mReactContext = reactContext;
     mAuth = FirebaseAuth.getInstance();
 
-   Log.d(TAG, "New FirestackAuth instance");
+    Log.d(TAG, "New FirestackAuth instance");
   }
 
   @Override
@@ -165,6 +168,43 @@ public void signInWithProvider(final String provider, final String authToken, fi
       Utils.todoNote(TAG, "signInWithProvider", callback);
   }
 
+  @ReactMethod
+  public void linkPassword(final String email, final String password, final Callback callback) {
+    FirebaseUser user = mAuth.getCurrentUser();
+
+    if (user != null) {
+      AuthCredential credential = EmailAuthProvider.getCredential(email, password);
+      user
+          .linkWithCredential(credential)
+          .addOnCompleteListener(new OnCompleteListener<AuthResult>() {
+            @Override
+            public void onComplete(@NonNull Task<AuthResult> task) {
+              try {
+                if (task.isSuccessful()) {
+                  Log.d(TAG, "user linked with password credential");
+                  userCallback(mAuth.getCurrentUser(), callback);
+                } else {
+                  userErrorCallback(task, callback);
+                }
+              } catch (Exception ex) {
+                userExceptionCallback(ex, callback);
+              }
+            }
+          });
+    } else {
+      callbackNoUser(callback, true);
+    }
+  }
+
+  @ReactMethod
+  public void link(final String provider, final String authToken, final String authSecret, final Callback callback) {
+    if (provider.equals("password")) {
+      linkPassword(authToken, authSecret, callback);
+    } else
+      // TODO other providers
+      Utils.todoNote(TAG, "linkWithProvider", callback);
+  }
+
   @ReactMethod
   public void signInAnonymously(final Callback callback) {
     Log.d(TAG, "signInAnonymously:called:");
@@ -435,9 +475,32 @@ public void signOut(final Callback callback) {
     callback.invoke(null, resp);
   }
 
+  @ReactMethod
+  public void reloadUser(final Callback callback) {
+    FirebaseUser user = mAuth.getCurrentUser();
+
+    if (user == null) {
+      callbackNoUser(callback, false);
+    } else {
+      user.reload()
+          .addOnCompleteListener(new OnCompleteListener<Void>() {
+            @Override
+            public void onComplete(@NonNull Task<Void> task) {
+              if (task.isSuccessful()) {
+                Log.d(TAG, "user reloaded");
+                userCallback(mAuth.getCurrentUser(), callback);
+              } else {
+                userErrorCallback(task, callback);
+              }
+            }
+          });
+    }
+  }
+
   @ReactMethod
   public void getCurrentUser(final Callback callback) {
     FirebaseUser user = mAuth.getCurrentUser();
+
     if (user == null) {
       callbackNoUser(callback, false);
     } else {
@@ -513,19 +576,15 @@ public void onComplete(@NonNull Task<GetTokenResult> task) {
 
   private void userErrorCallback(Task task, final Callback onFail) {
     WritableMap error = Arguments.createMap();
-    error.putInt("errorCode", task.getException().hashCode());
-    error.putString("errorMessage", task.getException().getMessage());
-    error.putString("allErrorMessage", task.getException().toString());
-
+    error.putString("code", ((FirebaseAuthException) task.getException()).getErrorCode());
+    error.putString("message", task.getException().getMessage());
     onFail.invoke(error);
   }
 
   private void userExceptionCallback(Exception ex, final Callback onFail) {
     WritableMap error = Arguments.createMap();
-    error.putInt("errorCode", ex.hashCode());
-    error.putString("errorMessage", ex.getMessage());
-    error.putString("allErrorMessage", ex.toString());
-
+    error.putInt("code", ex.hashCode());
+    error.putString("message", ex.getMessage());
     onFail.invoke(error);
   }
 

android/src/main/java/io/fullstack/firestack/database/FirestackDatabaseReference.java

@@ -68,7 +68,7 @@ public void onChildMoved(DataSnapshot dataSnapshot, String previousChildName) {
 
         @Override
         public void onCancelled(DatabaseError error) {
-          handleDatabaseError(eventName, error);
+          handleDatabaseError(error);
         }
       };
       mQuery.addChildEventListener(mEventListener);
@@ -90,7 +90,7 @@ public void onDataChange(DataSnapshot dataSnapshot) {
 
         @Override
         public void onCancelled(DatabaseError error) {
-          handleDatabaseError("value", error);
+          handleDatabaseError(error);
         }
       };
       mQuery.addValueEventListener(mValueListener);
@@ -162,22 +162,22 @@ private void handleDatabaseEvent(final String name, final DataSnapshot dataSnaps
     WritableMap data = Utils.dataSnapshotToMap(name, mPath, mModifiersString, dataSnapshot);
     WritableMap evt = Arguments.createMap();
     evt.putString("eventName", name);
-    evt.putString("path", mPath);
-    evt.putString("modifiersString", mModifiersString);
     evt.putMap("body", data);
 
     Utils.sendEvent(mReactContext, "database_event", evt);
   }
 
-  private void handleDatabaseError(final String name, final DatabaseError error) {
+  private void handleDatabaseError(final DatabaseError error) {
     WritableMap err = Arguments.createMap();
+    err.putString("eventName", "database_error");
+    err.putString("path", mPath);
+    err.putString("modifiersString", mModifiersString);
     err.putInt("errorCode", error.getCode());
     err.putString("errorDetails", error.getDetails());
-    err.putString("description", error.getMessage());
+    err.putString("msg", error.getMessage());
 
     WritableMap evt  = Arguments.createMap();
-    evt.putString("eventName", name);
-    evt.putString("path", mPath);
+    evt.putString("eventName", "database_error");
     evt.putMap("body", err);
 
     Utils.sendEvent(mReactContext, "database_error", evt);

android/src/main/java/io/fullstack/firestack/messaging/FirestackMessaging.java

@@ -165,31 +165,42 @@ public void unsubscribeFromTopic(String topic, final Callback callback) {
     }
   }
 
+  // String senderId, String messageId, String messageType,
   @ReactMethod
-  public void send(String senderId, String messageId, String messageType, ReadableMap params, final Callback callback) {
+  public void send(ReadableMap params, final Callback callback) {
+    ReadableMap data = params.getMap("data");
     FirebaseMessaging fm = FirebaseMessaging.getInstance();
-    RemoteMessage.Builder remoteMessage = new RemoteMessage.Builder(senderId);
-    remoteMessage.setMessageId(messageId);
-    remoteMessage.setMessageType(messageType);
-    ReadableMapKeySetIterator iterator = params.keySetIterator();
+    RemoteMessage.Builder remoteMessage = new RemoteMessage.Builder(params.getString("sender"));
+
+    remoteMessage.setMessageId(params.getString("id"));
+    remoteMessage.setMessageType(params.getString("type"));
+
+    if (params.hasKey("ttl")) {
+      remoteMessage.setTtl(params.getInt("ttl"));
+    }
+
+    if (params.hasKey("collapseKey")) {
+      remoteMessage.setCollapseKey(params.getString("collapseKey"));
+    }
+
+    ReadableMapKeySetIterator iterator = data.keySetIterator();
 
     while (iterator.hasNextKey()) {
       String key = iterator.nextKey();
-      ReadableType type = params.getType(key);
+      ReadableType type = data.getType(key);
       if (type == ReadableType.String) {
-        remoteMessage.addData(key, params.getString(key));
-        Log.d(TAG, "Firebase send: " + key);
-        Log.d(TAG, "Firebase send: " + params.getString(key));
+        remoteMessage.addData(key, data.getString(key));
       }
     }
 
     try {
       fm.send(remoteMessage.build());
       WritableMap res = Arguments.createMap();
       res.putString("status", "success");
+      Log.d(TAG, "send: Message sent");
       callback.invoke(null, res);
     } catch (Exception e) {
-      Log.e(TAG, "Error sending message", e);
+      Log.e(TAG, "send: error sending message", e);
       WritableMap error = Arguments.createMap();
       error.putString("code", e.toString());
       error.putString("message", e.toString());

docs/api/authentication.md

@@ -100,7 +100,7 @@ Sign in the user with a 3rd party credential provider. `credential` requires the
 
 ```javascript
 const credential = {
-  provider: 'facebook.com', 
+  provider: 'facebook', 
   token: '12345', 
   secret: '6789', 
 };
@@ -227,7 +227,7 @@ Refreshes the current user.
 
 ```javascript
 firestack.auth().currentUser
-  .getToken()
+  .reload()
   .then((user) => {})
   .catch();
 ```

docs/api/database.md

@@ -25,6 +25,34 @@ firestack.database()
   });
 ```
 
+Test value exists at location:
+```javascript
+firestack.database()
+  .ref('posts/1234')
+  .on('value', (snapshot) => {
+    const exists = snapshot.exists();
+  });
+```
+
+Basic write with priority example:
+```javascript
+firestack.database()
+  .ref('posts/1235')
+  .setWithPriority({
+    title: 'Another Awesome Post',
+    content: 'Some awesome content',
+  }, 10);
+```
+Useful for `orderByPriority` queries.
+
+
+Transaction Support:
+```javascript
+firestack.database()
+  .ref('posts/1234/title')
+  .transaction((title) => 'My Awesome Post');
+```
+
 ## Unmounted components
 
 Listening to database updates on unmounted components will trigger a warning: