Skip to content

Commit e327ee8

Browse files
committed
Updated storageUrl to save in the JS class, not natively
1 parent 135d835 commit e327ee8

File tree

3 files changed

+7
-17
lines changed

3 files changed

+7
-17
lines changed

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

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -42,14 +42,9 @@ public String getName() {
4242
return TAG;
4343
}
4444

45-
@ReactMethod
46-
public void setStorageUrl(final String storageBucket, final Callback callback) {
47-
FirestackUtils.todoNote(TAG, "setStorageUrl", callback);
48-
}
49-
5045
// STORAGE
5146
@ReactMethod
52-
public void uploadFile(final String name, final String filepath, final ReadableMap metadata, final Callback callback) {
47+
public void uploadFile(final String urlStr, final String name, final String filepath, final ReadableMap metadata, final Callback callback) {
5348
// TODO
5449
FirestackUtils.todoNote(TAG, "uploadFile", callback);
5550
}

ios/Firestack/FirestackStorage.m

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -15,26 +15,19 @@ @implementation FirestackStorage
1515

1616
RCT_EXPORT_MODULE(FirestackStorage);
1717

18-
- (void) setStorageUrl:(NSString *)storageBucket
19-
{
20-
NSString *storageUrl = [NSString stringWithFormat:@"gs://%@", storageBucket];
21-
self._storageUrl = storageUrl;
22-
}
23-
2418
//- (NSString *) getStorageUrl
2519
//{
2620
// NSDictionary *cfg = [self getConfig];
2721
// NSString *storageUrl = [NSString stringWithFormat:@"gs://%@", [cfg valueForKey:@"storageBucket"]];
2822
// return storageUrl;
2923
//}
3024

31-
RCT_EXPORT_METHOD(uploadFile:(NSString *) name
25+
RCT_EXPORT_METHOD(uploadFile: (NSString *) urlStr
26+
name: (NSString *) name
3227
path:(NSString *)path
3328
metadata:(NSDictionary *)metadata
3429
callback:(RCTResponseSenderBlock) callback)
3530
{
36-
NSString *urlStr = self._storageUrl;
37-
3831
if (urlStr == nil) {
3932
NSError *err = [[NSError alloc] init];
4033
[err setValue:@"Storage configuration error" forKey:@"name"];

lib/modules/storage.js

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,13 @@ export class Storage extends Base {
2727
* @return {Promise}
2828
*/
2929
uploadFile(name, filepath, metadata) {
30-
return promisify('uploadFile', FirestackStorageEvt)(name, filepath, metadata);
30+
return
31+
promisify('uploadFile', FirestackStorageEvt)(this.storageUrl, name, filepath, metadata);
3132
}
3233

3334
setStorageUrl(url) {
34-
return promisify('setStorageUrl', FirestackStorage)(url);
35+
// return promisify('setStorageUrl', FirestackStorage)(url);
36+
this.storageUrl = url;
3537
}
3638

3739
get namespace() {

0 commit comments

Comments
 (0)