WIP

Author: auser

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

@@ -1,10 +1,8 @@
 package io.fullstack.firestack;
 
 import android.content.Context;
-
-import android.content.Context;
+import android.util.Log;
 import android.support.annotation.NonNull;
-import android.widget.Toast;
 
 import com.facebook.react.bridge.Arguments;
 import com.facebook.react.bridge.ReactApplicationContext;
@@ -31,6 +29,7 @@
 import com.google.firebase.auth.GoogleAuthProvider;
 
 class FirestackModule extends ReactContextBaseJavaModule {
+  private static final String TAG = "FirestackModule";
   private Context context;
   private FirebaseAuth mAuth;
   private FirebaseUser user;
@@ -47,7 +46,9 @@ public String getName() {
   }
 
   @ReactMethod
-  public void configureWithOptions(ReadableMap params, final Callback onSuccess) {
+  public void configureWithOptions(ReadableMap params, final Callback onComplete) {
+    System.out.println("Calling configureWithOptions");
+    Log.i(TAG, "configureWithOptions");
     ReactContext mCtx = getReactApplicationContext();
     FirebaseOptions.Builder builder = new FirebaseOptions.Builder();
 
@@ -68,13 +69,16 @@ public void configureWithOptions(ReadableMap params, final Callback onSuccess) {
     }
 
     try {
+        Log.i(TAG, "Configuring");
         FirebaseApp app = FirebaseApp.initializeApp(mCtx, builder.build());
+        Log.i(TAG, "Configured");
+        onComplete.invoke();
     }
-    catch (Exception e){
-
+    catch (Exception ex){
+        Log.e(TAG, "ERROR configureWithOptions");
+        Log.e(TAG, ex.getMessage());
+        onComplete.invoke();
     }
-
-    onSuccess.invoke();
   }
 
   @ReactMethod

lib/firestack.js

@@ -38,13 +38,18 @@ export class Firestack {
     const firestackOptions = Object.assign({}, this.options, opts);
     try {
       this.appInstance = app.initializeApp(firestackOptions);
-    } catch (e) {}
+    } catch (e) {
+      console.log('Error occurred while calling configure', e);
+    }
 
     return promisify('configureWithOptions')(firestackOptions)
     .then((...args) => {
+      console.log('Native configureWithOptions success', args);
       this.configured = true;
       return args;
-    }).catch((err) => {})
+    }).catch((err) => {
+      console.log('Native error occurred while calling configure', e);
+    })
   }
 
   // Auth

lib/firestackModule.js

@@ -32,7 +32,6 @@ export class FirestackModule {
 
     this._refName = refName;
     this._makeRef = opts.makeRef || identity;
-    let firestack = this._firestack = opts.firestack;
 
     const initialState = Object.assign({}, opts.initialState || defaultInitialState, {
       listening: false,
@@ -46,12 +45,23 @@ export class FirestackModule {
     this._sortFn = opts.sortFn || defaultSortFn
     this._onChange = opts.onChange || identity;
 
-    this.setStore(opts.store);
+    if (opts.firestack) {
+      this.setFirestack(opts.firestack);
+    } else if (opts.store) {
+      this.setStore(opts.store);
+    }
   }
 
   makeRef(path) {
-    const refName = [this._refName, path].join('/');
-    return this._makeRef(this._firestack.database.ref(refName));
+    const refName = '/' + [this._refName, path].join('/');
+    const ref = this._firestack.database.ref(refName);
+    return this._makeRef(ref);
+  }
+
+  setFirestack(firestack) {
+    if (firestack) {
+      this._firestack = firestack;
+    }
   }
 
   setStore(store) {
@@ -156,7 +166,7 @@ export class FirestackModule {
           }
           return error ? reject(error) : resolve(value)
         });
-      });
+      })
     });
   }
 
@@ -198,7 +208,7 @@ export class FirestackModule {
   get actions() {
     return [
       'listen', 'unlisten',
-      'get', 'set', 'update', 'remove'
+      'getAt', 'setAt', 'updateAt', 'removeAt'
     ].reduce((sum, name) => {
       return {
         ...sum,