Updated rnpm linking with context

Author: auser

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

@@ -66,7 +66,6 @@ public void onAuthStateChanged(@NonNull FirebaseAuth firebaseAuth) {
         WritableMap msgMap = Arguments.createMap();
         msgMap.putString("eventName", "listenForAuth");
 
-        FirebaseUser user = firebaseAuth.getCurrentUser();
         if (user != null) {
             WritableMap userMap = getUserMap();
 
@@ -80,6 +79,21 @@ public void onAuthStateChanged(@NonNull FirebaseAuth firebaseAuth) {
         }
         }
       };
+
+      mAuth = FirebaseAuth.getInstance();
+      mAuth.addAuthStateListener(mAuthListener);
+    }
+
+    @ReactMethod
+    public void unlistenForAuth(final Callback callback) {
+      if (mAuthListener != null) {
+        mAuth.removeAuthStateListener(mAuthListener);
+
+        WritableMap resp = Arguments.createMap();
+        resp.putString("status", "complete");
+
+        callback.invoke(null, resp);
+      }
     }
 
     @ReactMethod
@@ -105,17 +119,17 @@ public void signInWithEmail(final String email, final String password, final Cal
         mAuth = FirebaseAuth.getInstance();
 
         mAuth.signInWithEmailAndPassword(email, password)
-                .addOnCompleteListener(new OnCompleteListener<AuthResult>() {
-                    @Override
-                    public void onComplete(@NonNull Task<AuthResult> task) {
-                        if (task.isSuccessful()) {
-                            user = task.getResult().getUser();
-                            userCallback(user, callback);
-                        } else {
-                            userErrorCallback(task, callback);
-                        }
-                    }
-                });
+          .addOnCompleteListener(new OnCompleteListener<AuthResult>() {
+              @Override
+              public void onComplete(@NonNull Task<AuthResult> task) {
+                  if (task.isSuccessful()) {
+                      user = task.getResult().getUser();
+                      userCallback(user, callback);
+                  } else {
+                      userErrorCallback(task, callback);
+                  }
+              }
+          });
     }
 
     @ReactMethod
@@ -416,6 +430,8 @@ public void userErrorCallback(Task task, final Callback onFail) {
     private WritableMap getUserMap() {
         WritableMap userMap = Arguments.createMap();
 
+        FirebaseUser user = FirebaseAuth.getInstance().getCurrentUser();
+
         userMap.putString("email", user.getEmail());
         userMap.putString("uid", user.getUid());
         userMap.putString("provider", user.getProviderId());

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

@@ -28,9 +28,9 @@ class FirestackModule extends ReactContextBaseJavaModule implements LifecycleEve
   private ReactContext mReactContext;
   private FirebaseApp app;
 
-  public FirestackModule(ReactApplicationContext reactContext) {
+  public FirestackModule(ReactApplicationContext reactContext, Context context) {
     super(reactContext);
-    this.context = reactContext;
+    this.context = context;
     mReactContext = reactContext;
 
     Log.d(TAG, "New instance");
@@ -86,7 +86,7 @@ public void configureWithOptions(ReadableMap params, @Nullable final Callback on
     try {
         Log.i(TAG, "Configuring app");
         if (app == null) {
-          app = FirebaseApp.initializeApp(mReactContext, builder.build());
+          app = FirebaseApp.initializeApp(this.context, builder.build());
         }
         Log.i(TAG, "Configured");
 

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

@@ -1,5 +1,7 @@
 package io.fullstack.firestack;
 
+import android.content.Context;
+
 import com.facebook.react.ReactPackage;
 import com.facebook.react.bridge.JavaScriptModule;
 import com.facebook.react.bridge.NativeModule;
@@ -11,6 +13,11 @@
 import java.util.List;
 
 public class FirestackPackage implements ReactPackage {
+    private Context mContext;
+
+    public FirestackPackage(Context ctx) {
+        mContext = ctx;
+    }
     /**
      * @param reactContext react application context that can be used to create modules
      * @return list of native modules to register with the newly created catalyst instance
@@ -19,7 +26,7 @@ public class FirestackPackage implements ReactPackage {
     public List<NativeModule> createNativeModules(ReactApplicationContext reactContext) {
         List<NativeModule> modules = new ArrayList<>();
 
-        modules.add(new FirestackModule(reactContext));
+        modules.add(new FirestackModule(reactContext, mContext));
         modules.add(new FirestackAuthModule(reactContext));
         modules.add(new FirestackDatabaseModule(reactContext));
         modules.add(new FirestackAnalyticsModule(reactContext));

package.json

@@ -34,7 +34,9 @@
     "ios": {
       "project": "ios/Firestack.xcodeproj"
     },
-    "android": {}
+    "android": {
+      "packageInstance": "new FirestackPackage(getApplicationContext())"
+    }
   },
   "devDependencies": {
     "babel-jest": "^14.1.0",