Commit 29140b6

committed

Merge branch 'master' of github.com:fullstackreact/react-native-firestack

* 'master' of github.com:fullstackreact/react-native-firestack: Fix donwloadUrl to use storageUrl from .plist. Use storage url from .plist file if not setStorageUrl() hasn't been called. Fixed error calling length of undefined forEach and map method on the DataSnapshot does not retain key removing trailing comma Filter out undefined filters Parity of response format between ios and android. Added authenticated flag to response from getCurrentUser

2 parents f4bcfea + e214b6d commit 29140b6Copy full SHA for 29140b6

File tree

3 files changed

+17

-12

lines changed

android/src/main/java/io/fullstack/firestack
- FirestackAuth.java
ios/Firestack
- FirestackStorage.m
lib/modules
- database.js

3 files changed

+17

-12

lines changed

`‎android/src/main/java/io/fullstack/firestack/FirestackAuth.java‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -530,7 +530,7 @@ public void onComplete(@NonNull Task<GetTokenResult> task) {`
`530`	`530`	`}`
`531`	`531`
`532`	`532`	`msgMap.putMap("user", userMap);`
`533`		`-`
	`533`	`+msgMap.putBoolean("authenticated", true);`
`534`	`534`	`callback.invoke(null, msgMap);`
`535`	`535`	`}`
`536`	`536`	`}).addOnFailureListener(new OnFailureListener() {`

`‎ios/Firestack/FirestackStorage.m‎`

Lines changed: 10 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,12 @@ - (dispatch_queue_t)methodQueue`
`25`	`25`	`path:(NSString *) path`
`26`	`26`	`callback:(RCTResponseSenderBlock) callback)`
`27`	`27`	`{`
`28`		`- FIRStorageReference *storageRef = [[FIRStorage storage] referenceForURL:storageUrl];`
	`28`	`+ FIRStorageReference *storageRef;`
	`29`	`+ if (storageUrl == nil ) {`
	`30`	`+ storageRef = [[FIRStorage storage] reference];`
	`31`	`+ } else {`
	`32`	`+ storageRef = [[FIRStorage storage] referenceForURL:storageUrl];`
	`33`	`+ }`
`29`	`34`	`FIRStorageReference *fileRef = [storageRef child:path];`
`30`	`35`	`[fileRef downloadURLWithCompletion:^(NSURL * _Nullable URL, NSError * _Nullable error) {`
`31`	`36`	`if (error != nil) {`
`@@ -52,14 +57,13 @@ - (dispatch_queue_t)methodQueue`
`52`	`57`	`metadata:(NSDictionary *)metadata`
`53`	`58`	`callback:(RCTResponseSenderBlock) callback)`
`54`	`59`	`{`
	`60`	`+ FIRStorageReference *storageRef;`
`55`	`61`	`if (urlStr == nil) {`
`56`		`- NSError *err = [[NSError alloc] init];`
`57`		`- [err setValue:@"Storage configuration error" forKey:@"name"];`
`58`		`- [err setValue:@"Call setStorageUrl() first" forKey:@"description"];`
`59`		`- return callback(@[err]);`
	`62`	`+ storageRef = [[FIRStorage storage] reference];`
	`63`	`+ } else {`
	`64`	`+ storageRef = [[FIRStorage storage] referenceForURL:urlStr];`
`60`	`65`	`}`
`61`	`66`
`62`		`- FIRStorageReference *storageRef = [[FIRStorage storage] referenceForURL:urlStr];`
`63`	`67`	`FIRStorageReference *uploadRef = [storageRef child:name];`
`64`	`68`	`FIRStorageMetadata *firmetadata = [[FIRStorageMetadata alloc] initWithDictionary:metadata];`
`65`	`69`

`‎lib/modules/database.js‎`

Lines changed: 6 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ class DataSnapshot {`
`35`	`35`
`36`	`36`	`forEach(fn) {`
`37`	`37`	`(this.childKeys \|\| [])`
`38`		`- .forEach(key => fn(this.value[key]))`
	`38`	`+ .forEach(key => fn({key: key,value: this.value[key]}))`
`39`	`39`	`}`
`40`	`40`
`41`	`41`	`map(fn) {`
`@@ -96,7 +96,7 @@ class DatabaseQuery {`
`96`	`96`	`}`
`97`	`97`
`98`	`98`	`setFilter(name, ...args) {`
`99`		`- this.filters[name] = args;`
	`99`	`+ this.filters[name] = args.filter(n=>n!=undefined);`
`100`	`100`	`return this.ref;`
`101`	`101`	`}`
`102`	`102`
`@@ -111,9 +111,10 @@ class DatabaseQuery {`
`111`	`111`	`}`
`112`	`112`	`Object.keys(this.filters)`
`113`	`113`	`.forEach(key => {`
`114`		`- const filter = this.filters[key];`
	`114`	`+ let filter = this.filters[key];`
`115`	`115`	`if (filter) {`
`116`		`- const filterArgs = ([key].concat(filter)).join(argsSeparator)`
	`116`	`+ const cleanFilters = filter.filter((f) => typeof f !== "undefined");`
	`117`	`+ const filterArgs = ([key].concat(cleanFilters)).join(argsSeparator);`
`117`	`118`	`modifiers.push(filterArgs);`
`118`	`119`	`}`
`119`	`120`	`})`
`@@ -232,7 +233,7 @@ class DatabaseRef extends ReferenceBase {`
`232`	`233`	`const path = this.dbPath();`
`233`	`234`	`return this.db.off(path, evt, origCB)`
`234`	`235`	`.then(({callback, subscriptions}) => {`
`235`		`- if (dbSubscriptions[path] && dbSubscriptions[path][evt].length > 0) {`
	`236`	`+ if (dbSubscriptions[path] && dbSubscriptions[path][evt]&&dbSubscriptions[path][evt].length > 0) {`
`236`	`237`	`return subscriptions;`
`237`	`238`	`}`
`238`	`239`

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit 29140b6

File tree

3 files changed

3 files changed

`‎android/src/main/java/io/fullstack/firestack/FirestackAuth.java‎`

`‎ios/Firestack/FirestackStorage.m‎`

`‎lib/modules/database.js‎`

0 commit comments