Stop storing Firebase database reference in iOS module

Author: chrisbianca

ios/Firestack/FirestackDatabase.h

@@ -18,7 +18,6 @@
 }
 
 @property NSMutableDictionary *dbReferences;
-@property FIRDatabase *database;
 
 @end
 

ios/Firestack/FirestackDatabase.m

@@ -368,7 +368,6 @@ - (id) init
 {
     self = [super init];
     if (self != nil) {
-        _database = [FIRDatabase database];
         _dbReferences = [[NSMutableDictionary alloc] init];
     }
     return self;
@@ -378,10 +377,7 @@ - (id) init
   callback:(RCTResponseSenderBlock) callback)
 {
 
-  BOOL isEnabled = _database.persistenceEnabled;
-  if ( isEnabled != enable) {
-      _database.persistenceEnabled = enable;
-  }
+  [FIRDatabase database].persistenceEnabled = enable;
   callback(@[[NSNull null], @{
                  @"result": @"success"
                  }]);
@@ -391,7 +387,7 @@ - (id) init
   withEnable:(BOOL) enable
   callback:(RCTResponseSenderBlock) callback)
 {
-    FIRDatabaseReference *ref = [[_database reference] child:path];
+    FIRDatabaseReference *ref = [self getPathRef:path];
     [ref keepSynced:enable];
     callback(@[[NSNull null], @{
                             @"status": @"success",
@@ -403,8 +399,7 @@ - (id) init
                   value:(NSDictionary *)value
                   callback:(RCTResponseSenderBlock) callback)
 {
-    FIRDatabaseReference *ref = [[_database reference] child:path];
-
+    FIRDatabaseReference *ref = [self getPathRef:path];
     [ref setValue:value withCompletionBlock:^(NSError * _Nullable error, FIRDatabaseReference * _Nonnull ref) {
         [self handleCallback:@"set" callback:callback databaseError:error];
     }];
@@ -414,8 +409,7 @@ - (id) init
                   value:(NSDictionary *)value
                   callback:(RCTResponseSenderBlock) callback)
 {
-    FIRDatabaseReference *ref = [[_database reference] child:path];
-
+    FIRDatabaseReference *ref = [self getPathRef:path];
     [ref updateChildValues:value withCompletionBlock:^(NSError * _Nullable error, FIRDatabaseReference * _Nonnull ref) {
         [self handleCallback:@"update" callback:callback databaseError:error];
     }];
@@ -424,7 +418,7 @@ - (id) init
 RCT_EXPORT_METHOD(remove:(NSString *) path
                   callback:(RCTResponseSenderBlock) callback)
 {
-    FIRDatabaseReference *ref = [[_database reference] child:path];
+    FIRDatabaseReference *ref = [self getPathRef:path];
     [ref removeValueWithCompletionBlock:^(NSError * _Nullable error, FIRDatabaseReference * _Nonnull ref) {
         [self handleCallback:@"remove" callback:callback databaseError:error];
     }];
@@ -434,7 +428,7 @@ - (id) init
                   props:(NSDictionary *) props
                   callback:(RCTResponseSenderBlock) callback)
 {
-    FIRDatabaseReference *ref = [[_database reference] child:path];
+    FIRDatabaseReference *ref = [self getPathRef:path];
     FIRDatabaseReference *newRef = [ref childByAutoId];
 
     NSURL *url = [NSURL URLWithString:ref.URL];
@@ -526,7 +520,7 @@ - (id) init
                   props:(NSDictionary *) props
                   callback:(RCTResponseSenderBlock) callback)
 {
-    FIRDatabaseReference *ref = [[_database reference] child:path];
+    FIRDatabaseReference *ref = [self getPathRef:path];
     [ref onDisconnectSetValue:props
           withCompletionBlock:^(NSError * _Nullable error, FIRDatabaseReference * _Nonnull ref) {
               [self handleCallback:@"onDisconnectSetObject" callback:callback databaseError:error];
@@ -537,7 +531,7 @@ - (id) init
                   val:(NSString *) val
                   callback:(RCTResponseSenderBlock) callback)
 {
-    FIRDatabaseReference *ref = [[_database reference] child:path];
+    FIRDatabaseReference *ref = [self getPathRef:path];
     [ref onDisconnectSetValue:val
           withCompletionBlock:^(NSError * _Nullable error, FIRDatabaseReference * _Nonnull ref) {
               [self handleCallback:@"onDisconnectSetString" callback:callback databaseError:error];
@@ -547,7 +541,7 @@ - (id) init
 RCT_EXPORT_METHOD(onDisconnectRemove:(NSString *) path
                   callback:(RCTResponseSenderBlock) callback)
 {
-    FIRDatabaseReference *ref = [[_database reference] child:path];
+    FIRDatabaseReference *ref = [self getPathRef:path];
     [ref onDisconnectRemoveValueWithCompletionBlock:^(NSError * _Nullable error, FIRDatabaseReference * _Nonnull ref) {
         [self handleCallback:@"onDisconnectRemove" callback:callback databaseError:error];
     }];
@@ -558,12 +552,17 @@ - (id) init
 RCT_EXPORT_METHOD(onDisconnectCancel:(NSString *) path
                   callback:(RCTResponseSenderBlock) callback)
 {
-    FIRDatabaseReference *ref = [[_database reference] child:path];
+    FIRDatabaseReference *ref = [self getPathRef:path];
     [ref cancelDisconnectOperationsWithCompletionBlock:^(NSError * _Nullable error, FIRDatabaseReference * _Nonnull ref) {
         [self handleCallback:@"onDisconnectCancel" callback:callback databaseError:error];
     }];
 }
 
+- (FIRDatabaseReference *) getPathRef:(NSString *) path
+{
+    return [[[FIRDatabase database] reference] child:path];
+}
+
 - (void) handleCallback:(NSString *) methodName
                callback:(RCTResponseSenderBlock) callback
           databaseError:(NSError *) databaseError
@@ -592,7 +591,7 @@ - (FirestackDBReference *) getDBHandle:(NSString *) path
 
     if (ref == nil) {
         ref = [[FirestackDBReference alloc] initWithPathAndModifiers:self
-                                                            database:_database
+                                                            database:[FIRDatabase database]
                                                                 path:path
                                                            modifiers:modifiers
                                                      modifiersString:modifiersString];
@@ -612,4 +611,4 @@ - (NSString *) getDBListenerKey:(NSString *) path
     return @[DATABASE_DATA_EVENT, DATABASE_ERROR_EVENT];
 }
 
-@end
+@end