Skip to content
This repository was archived by the owner on Apr 4, 2023. It is now read-only.

Commit 549eac0

Browse files
Don't require the 'storageBucket' param for Firebase Storage #842
1 parent 1e1094b commit 549eac0

4 files changed

Lines changed: 18 additions & 8 deletions

File tree

demo/app/main-view-model.ts

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -58,9 +58,7 @@ export class HelloWorldModel extends Observable {
5858
}
5959

6060
public doWebInit(): void {
61-
firebaseWebApi.initializeApp({
62-
storageBucket: 'gs://n-plugin-test.appspot.com',
63-
});
61+
firebaseWebApi.initializeApp();
6462
}
6563

6664
public doWebLoginAnonymously(): void {
@@ -390,7 +388,7 @@ export class HelloWorldModel extends Observable {
390388

391389
public doInit(): void {
392390
firebase.init({
393-
storageBucket: 'gs://n-plugin-test.appspot.com',
391+
// storageBucket: 'gs://n-plugin-test.appspot.com',
394392
persist: true, // optional, default false
395393
onAuthStateChanged: data => { // optional
396394
console.log((data.loggedIn ? "Logged in to firebase" : "Logged out from firebase") + " (init's onAuthStateChanged callback)");

demo/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
}
1010
},
1111
"dependencies": {
12-
"nativescript-plugin-firebase": "file:../publish/package/nativescript-plugin-firebase-6.4.1.tgz",
12+
"nativescript-plugin-firebase": "file:../publish/package/nativescript-plugin-firebase-6.5.0.tgz",
1313
"nativescript-theme-core": "^1.0.4",
1414
"nativescript-unit-test-runner": "^0.3.4",
1515
"tns-core-modules": "~4.0.0"
@@ -48,4 +48,4 @@
4848
"build.plugin": "cd ../src && npm run build",
4949
"ci.tslint": "npm i && tslint --config '../tslint.json' 'app/**/*.ts' --exclude '**/node_modules/**' --exclude '**/typings/**'"
5050
}
51-
}
51+
}

src/storage/storage.android.ts

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,13 @@ function getStorageRef(reject, arg) {
2121
return;
2222
}
2323

24-
return arg.bucket ? com.google.firebase.storage.FirebaseStorage.getInstance().getReferenceFromUrl(arg.bucket) : firebase.storageBucket;
24+
if (arg.bucket) {
25+
return com.google.firebase.storage.FirebaseStorage.getInstance().getReferenceFromUrl(arg.bucket);
26+
} else if (firebase.storageBucket) {
27+
return firebase.storageBucket;
28+
} else {
29+
return com.google.firebase.storage.FirebaseStorage.getInstance().getReference();
30+
}
2531
}
2632

2733
export function uploadFile(arg: UploadFileOptions): Promise<UploadFileResult> {

src/storage/storage.ios.ts

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,13 @@ function getStorageRef(reject, arg): FIRStorageReference {
1818
return undefined;
1919
}
2020

21-
return arg.bucket ? FIRStorage.storage().referenceForURL(arg.bucket) : firebase.storageBucket;
21+
if (arg.bucket) {
22+
return FIRStorage.storage().referenceForURL(arg.bucket);
23+
} else if (firebase.storageBucket) {
24+
return firebase.storageBucket;
25+
} else {
26+
return FIRStorage.storage().reference();
27+
}
2228
}
2329

2430
export function uploadFile(arg: UploadFileOptions): Promise<UploadFileResult> {

0 commit comments

Comments
 (0)