Commit 5b7de35

committed

Maintain similar response format for getCurrentUser and signInWith*

1 parent 266f9c3 commit 5b7de35Copy full SHA for 5b7de35

File tree

1 file changed

+25

-12

lines changed

ios/Firestack
- FirestackAuth.m

1 file changed

+25

-12

lines changed

`‎ios/Firestack/FirestackAuth.m‎`

Lines changed: 25 additions & 12 deletions

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ @implementation FirestackAuth`
`17`	`17`	`RCT_EXPORT_MODULE(FirestackAuth);`
`18`	`18`
`19`	`19`	`RCT_EXPORT_METHOD(signInAnonymously:`
`20`		`- (RCTResponseSenderBlock) callBack)`
	`20`	`+ (RCTResponseSenderBlock) callback)`
`21`	`21`	`{`
`22`	`22`	`@try {`
`23`	`23`	`[[FIRAuth auth] signInAnonymouslyWithCompletion`
`@@ -32,10 +32,14 @@ @implementation FirestackAuth`
`32`	`32`	`[self sendJSEvent:AUTH_CHANGED_EVENT`
`33`	`33`	`props: evt];`
`34`	`34`
`35`		`- callBack(@[evt]);`
	`35`	`+ callback(@[evt]);`
`36`	`36`	`} else {`
`37`		`- NSDictionary *userProps = [self userPropsFromFIRUser:user];`
`38`		`- callBack(@[[NSNull null], userProps]);`
	`37`	`+ NSDictionary *userProps = [self userPropsFromFIRUser:user];`
	`38`	`+ NSDictionary *responseProps = @{`
	`39`	`+ @"authenticated": @((BOOL) true),`
	`40`	`+ @"user": userProps`
	`41`	`+ };`
	`42`	`+ callback(@[[NSNull null], responseProps]);`
`39`	`43`	`}`
`40`	`44`	`}];`
`41`	`45`	`} @catch(NSException *ex) {`
`@@ -47,7 +51,7 @@ @implementation FirestackAuth`
`47`	`51`	`[self sendJSEvent:AUTH_ERROR_EVENT`
`48`	`52`	`props:eventError];`
`49`	`53`	`NSLog(@"An exception occurred: %@", ex);`
`50`		`- callBack(@[eventError]);`
	`54`	`+ callback(@[eventError]);`
`51`	`55`	`}`
`52`	`56`	`}`
`53`	`57`
`@@ -61,7 +65,11 @@ @implementation FirestackAuth`
`61`	`65`
`62`	`66`	`if (user != nil) {`
`63`	`67`	`NSDictionary *userProps = [self userPropsFromFIRUser:user];`
`64`		`- callback(@[[NSNull null], userProps]);`
	`68`	`+ NSDictionary *responseProps = @{`
	`69`	`+ @"authenticated": @((BOOL) true),`
	`70`	`+ @"user": userProps`
	`71`	`+ };`
	`72`	`+ callback(@[[NSNull null], responseProps]);`
`65`	`73`	`} else {`
`66`	`74`	`NSDictionary *err =`
`67`	`75`	`[FirestackErrors handleFirebaseError:AUTH_ERROR_EVENT`
`@@ -94,7 +102,11 @@ @implementation FirestackAuth`
`94`	`102`	`if (user != nil) {`
`95`	`103`	`// User is signed in.`
`96`	`104`	`NSDictionary *userProps = [self userPropsFromFIRUser:user];`
`97`		`- callback(@[[NSNull null], userProps]);`
	`105`	`+ NSDictionary *responseProps = @{`
	`106`	`+ @"authenticated": @((BOOL) true),`
	`107`	`+ @"user": userProps`
	`108`	`+ };`
	`109`	`+ callback(@[[NSNull null], responseProps]);`
`98`	`110`	`} else {`
`99`	`111`	`NSLog(@"An error occurred: %@", [error localizedDescription]);`
`100`	`112`	`NSLog(@"[Error signInWithProvider]: %@", [error userInfo]);`
`@@ -146,7 +158,7 @@ @implementation FirestackAuth`
`146`	`158`	`sendJSEvent:AUTH_CHANGED_EVENT`
`147`	`159`	`props: @{`
`148`	`160`	`@"eventName": @"userTokenError",`
`149`		`- @"authenticated": @((BOOL)true),`
	`161`	`+ @"authenticated": @((BOOL)false),`
`150`	`162`	`@"errorMessage": [error localizedFailureReason]`
`151`	`163`	`}];`
`152`	`164`	`} else {`
`@@ -236,10 +248,11 @@ @implementation FirestackAuth`
`236`	`248`	`completion:^(FIRUser user, NSError error) {`
`237`	`249`	`if (user != nil) {`
`238`	`250`	`NSDictionary *userProps = [self userPropsFromFIRUser:user];`
`239`		`-`
`240`		`- callback(@[[NSNull null], @{`
`241`		`- @"user": userProps`
`242`		`- }]);`
	`251`	`+ NSDictionary *responseProps = @{`
	`252`	`+ @"authenticated": @((BOOL) true),`
	`253`	`+ @"user": userProps`
	`254`	`+ };`
	`255`	`+ callback(@[[NSNull null], responseProps]);`
`243`	`256`	`} else {`
`244`	`257`	`NSDictionary *err =`
`245`	`258`	`[FirestackErrors handleFirebaseError:@"signinError"`

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 5b7de35

File tree

1 file changed

1 file changed

`‎ios/Firestack/FirestackAuth.m‎`

0 commit comments