WIP: Android module

Author: auser

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

@@ -33,6 +33,7 @@ class FirestackModule extends ReactContextBaseJavaModule {
   private static final String TAG = "FirestackModule";
   private Context context;
   private FirebaseAuth mAuth;
+  private FirebaseApp app;
   private FirebaseUser user;
   private FirebaseAuth.AuthStateListener mAuthListener;
 
@@ -49,7 +50,7 @@ public String getName() {
 
   @ReactMethod
   public void configureWithOptions(ReadableMap params, @Nullable final Callback onComplete) {
-    Log.d(TAG, "configureWithOptions");
+    Log.i(TAG, "configureWithOptions");
 
     ReactContext mCtx = getReactApplicationContext();
     FirebaseOptions.Builder builder = new FirebaseOptions.Builder();
@@ -66,35 +67,45 @@ public void configureWithOptions(ReadableMap params, @Nullable final Callback on
     }
     if (params.hasKey("gcmSenderID")) {
       final String gcmSenderID = params.getString("gcmSenderID");
-      Log.d(TAG, "Setting gcmSenderID from params" + gcmSenderID );
+      Log.d(TAG, "Setting gcmSenderID from params " + gcmSenderID );
       builder.setGcmSenderId(gcmSenderID);
     }
     if (params.hasKey("storageBucket")) {
       final String storageBucket = params.getString("storageBucket");
-      Log.d(TAG, "Setting storageBucket from params" + storageBucket);
+      Log.d(TAG, "Setting storageBucket from params " + storageBucket);
       builder.setStorageBucket(storageBucket);
     }
     if (params.hasKey("databaseURL")) {
       final String databaseURL = params.getString("databaseURL");
-      Log.d(TAG, "Setting databaseURL from params" + databaseURL);
+      Log.d(TAG, "Setting databaseURL from params " + databaseURL);
       builder.setDatabaseUrl(databaseURL);
     }
     if (params.hasKey("clientID")) {
       final String clientID = params.getString("clientID");
-      Log.d(TAG, "Setting clientID from params" + clientID);
+      Log.d(TAG, "Setting clientID from params " + clientID);
       builder.setApplicationId(clientID);
     }
 
     try {
-        Log.i(TAG, "Configuring");
-        FirebaseApp app = FirebaseApp.initializeApp(mCtx, builder.build());
+        Log.i(TAG, "Configuring app");
+        if (app == null) {
+          app = FirebaseApp.initializeApp(mCtx, builder.build());
+        }
         Log.i(TAG, "Configured");
-        onComplete.invoke(app);
+        System.out.println("Configured");
+
+        WritableMap resp = Arguments.createMap();
+        resp.putString("msg", "success");
+        onComplete.invoke(null, resp);
     }
     catch (Exception ex){
         Log.e(TAG, "ERROR configureWithOptions");
         Log.e(TAG, ex.getMessage());
-        onComplete.invoke(ex.getMessage());
+
+        WritableMap resp = Arguments.createMap();
+        resp.putString("msg", ex.getMessage());
+
+        onComplete.invoke(resp);
     }
   }
 

lib/firestack.js

@@ -58,7 +58,7 @@ export class Firestack {
       this.configured = true;
       return args;
     }).catch((err) => {
-      log.error('Native error occurred while calling configure', e);
+      log.error('Native error occurred while calling configure', err);
     })
   }
 

lib/firestackModule.js

@@ -163,11 +163,10 @@ export class FirestackModule {
     const toObject = this._toObject;
 
     return new Promise((resolve, reject) => {
-      ref.set(value, (error, snapshot) => {
+      ref.set(value, (error) => {
         this._handleUpdate(T.ACTION_SET, null, (state) => {
           if (cb) {
-    console.log('error ->', error, snapshot);
-            cb(toObject(snapshot, state));
+            cb(error, value);
           }
           return error ? reject(error) : resolve(value)
         });
@@ -212,23 +211,20 @@ export class FirestackModule {
   // hackish, for now
   get actions() {
     const T = this._types;
+
+    const wrap = (fn) => (...args) => {
+      const params = args && args.length > 0 ? args : [];
+      const promise = fn.bind(this)(...params)
+      return {type: T.ACTION_CALL, payload: promise}
+    }
+
     return [
       'listen', 'unlisten',
       'getAt', 'setAt', 'updateAt', 'removeAt'
     ].reduce((sum, name) => {
       return {
         ...sum,
-        [name]: (...args) => (dispatch, getState) => {
-          const fn = this[name].bind(this);
-          fn.apply(this, args)
-          .then((resp) => {
-            dispatch({type: T.ACTION_SUCCESS, payload: resp});
-          })
-          .catch((err) => {
-            dispatch({type: T.ACTION_FAIL, payload: err});
-          });
-          return {type: T.ACTION_CALL, payload: name}
-        }
+        [name]: wrap(this[name])
       }
     }, {})
   }

lib/promisify.js

@@ -3,7 +3,9 @@ const FirebaseHelper = NativeModules.Firestack;
 
 export const promisify = fn => (...args) => {
   return new Promise((resolve, reject) => {
-    const handler = (err, resp) => err ? reject(err) : resolve(resp);
+    const handler = (err, resp) => {
+      err ? reject(err) : resolve(resp);
+    }
     args.push(handler);
     (typeof fn === 'function' ? fn : FirebaseHelper[fn])
       .call(FirebaseHelper, ...args);