Skip to content

Commit 773e943

Browse files
committed
Fixed setStorageUrl
1 parent cc6ff4a commit 773e943

File tree

3 files changed

+11
-10
lines changed

3 files changed

+11
-10
lines changed

ios/Firestack/FirestackDatabase.m

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -272,6 +272,7 @@ - (void) sendJSEvent:(NSString *)title
272272
}
273273
@catch (NSException *err) {
274274
NSLog(@"An error occurred in sendJSEvent: %@", [err debugDescription]);
275+
NSLog(@"Tried to send: %@ with %@", title, props);
275276
}
276277
}
277278

ios/Firestack/FirestackStorage.m

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -76,27 +76,28 @@ @implementation FirestackStorage
7676

7777
[uploadTask observeStatus:FIRStorageTaskStatusFailure handler:^(FIRStorageTaskSnapshot *snapshot) {
7878
if (snapshot.error != nil) {
79-
NSError *err = [[NSError alloc] init];
79+
NSDictionary *errProps = [[NSMutableDictionary alloc] init];
80+
8081
switch (snapshot.error.code) {
8182
case FIRStorageErrorCodeObjectNotFound:
8283
// File doesn't exist
83-
[err setValue:@"File does not exist" forKey:@"description"];
84+
[errProps setValue:@"File does not exist" forKey:@"description"];
8485
break;
8586
case FIRStorageErrorCodeUnauthorized:
8687
// User doesn't have permission to access file
87-
[err setValue:@"You do not have permissions" forKey:@"description"];
88+
[errProps setValue:@"You do not have permissions" forKey:@"description"];
8889
break;
8990
case FIRStorageErrorCodeCancelled:
9091
// User canceled the upload
91-
[err setValue:@"Upload cancelled" forKey:@"description"];
92+
[errProps setValue:@"Upload cancelled" forKey:@"description"];
9293
break;
9394
case FIRStorageErrorCodeUnknown:
9495
// Unknown error occurred, inspect the server response
95-
[err setValue:@"Unknown error" forKey:@"description"];
96+
[errProps setValue:@"Unknown error" forKey:@"description"];
9697
break;
9798
}
9899

99-
callback(@[err]);
100+
callback(@[errProps]);
100101
}}];
101102
}
102103

lib/modules/storage.js

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,14 +26,13 @@ export class Storage extends Base {
2626
* @param {object} metadata An object containing metadata
2727
* @return {Promise}
2828
*/
29-
uploadFile(name, filepath, metadata) {
30-
return
31-
promisify('uploadFile', FirestackStorageEvt)(this.storageUrl, name, filepath, metadata);
29+
uploadFile(name, filepath, metadata={}) {
30+
return promisify('uploadFile', FirestackStorage)(this.storageUrl, name, filepath, metadata)
3231
}
3332

3433
setStorageUrl(url) {
3534
// return promisify('setStorageUrl', FirestackStorage)(url);
36-
this.storageUrl = url;
35+
this.storageUrl = `gs://${url}`;
3736
}
3837

3938
get namespace() {

0 commit comments

Comments
 (0)