From d005ab2f966cca23e955ca79f109efbefced8772 Mon Sep 17 00:00:00 2001 From: Jan Date: Thu, 17 Nov 2016 20:05:09 +0100 Subject: [PATCH 1/2] Use storage url from .plist file if not setStorageUrl() hasn't been called. - Fix weird error that NSError is not KVC compliant when storage is not configured JS - Fixed code seems to exist on several more locations but has not been fixed, since there are no tests to ensure I don't break anything. --- ios/Firestack/FirestackStorage.m | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/ios/Firestack/FirestackStorage.m b/ios/Firestack/FirestackStorage.m index d88a19a..ff96646 100644 --- a/ios/Firestack/FirestackStorage.m +++ b/ios/Firestack/FirestackStorage.m @@ -52,14 +52,13 @@ - (dispatch_queue_t)methodQueue metadata:(NSDictionary *)metadata callback:(RCTResponseSenderBlock) callback) { + FIRStorageReference *storageRef; if (urlStr == nil) { - NSError *err = [[NSError alloc] init]; - [err setValue:@"Storage configuration error" forKey:@"name"]; - [err setValue:@"Call setStorageUrl() first" forKey:@"description"]; - return callback(@[err]); + storageRef = [[FIRStorage storage] reference]; + } else { + storageRef = [[FIRStorage storage] referenceForURL:urlStr]; } - FIRStorageReference *storageRef = [[FIRStorage storage] referenceForURL:urlStr]; FIRStorageReference *uploadRef = [storageRef child:name]; FIRStorageMetadata *firmetadata = [[FIRStorageMetadata alloc] initWithDictionary:metadata]; From dfc0bd1eb86706a421341fdf9b6a6f27e3931d97 Mon Sep 17 00:00:00 2001 From: Jan Date: Thu, 17 Nov 2016 20:51:23 +0100 Subject: [PATCH 2/2] Fix donwloadUrl to use storageUrl from .plist. - Use storageUrl from default config if not set otherwise in JS - Similar code exists on several other places that are not fixed since no tests prevent breaking stuff. --- ios/Firestack/FirestackStorage.m | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/ios/Firestack/FirestackStorage.m b/ios/Firestack/FirestackStorage.m index ff96646..b87d394 100644 --- a/ios/Firestack/FirestackStorage.m +++ b/ios/Firestack/FirestackStorage.m @@ -25,7 +25,12 @@ - (dispatch_queue_t)methodQueue path:(NSString *) path callback:(RCTResponseSenderBlock) callback) { - FIRStorageReference *storageRef = [[FIRStorage storage] referenceForURL:storageUrl]; + FIRStorageReference *storageRef; + if (storageUrl == nil ) { + storageRef = [[FIRStorage storage] reference]; + } else { + storageRef = [[FIRStorage storage] referenceForURL:storageUrl]; + } FIRStorageReference *fileRef = [storageRef child:path]; [fileRef downloadURLWithCompletion:^(NSURL * _Nullable URL, NSError * _Nullable error) { if (error != nil) {