Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Adds AuthDataResult to anonymous sign in #470

Merged
merged 4 commits into from
Nov 17, 2017
Merged

Adds AuthDataResult to anonymous sign in #470

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d55f77f
Adds AuthDataResult to anonymous sign in
protocol86 Nov 17, 2017
090ace6
Fixes typo
protocol86 Nov 17, 2017
4499207
Addresses comments
protocol86 Nov 17, 2017
5739ad1
addresses comment on PR
protocol86 Nov 17, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions Example/Auth/Sample/MainViewController.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2803,8 +2803,7 @@ - (void)signInAnonymouslyAuthDataResult {
^(FIRAuthDataResult *_Nullable authResult, NSError *_Nullable error) {
if (error) {
[self logFailure:@"sign-in anonymously failed" error:error];
}
else {
} else {
[self logSuccess:@"sign-in anonymously succeeded."];
[self log:[NSString stringWithFormat:@"User ID : %@", authResult.user.uid]];
}
Expand Down
23 changes: 9 additions & 14 deletions Firebase/Auth/Source/FIRAuth.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -686,9 +686,10 @@ - (void)signInAnonymouslyAndRetrieveDataWithCompletion:(FIRAuthDataResultCallbac
profile:nil
username:nil
isNewUser:NO];
decoratedCallback([[FIRAuthDataResult alloc] initWithUser:_currentUser
additionalUserInfo:additionalUserInfo],
nil);
FIRAuthDataResult *authDataResult =
[[FIRAuthDataResult alloc] initWithUser:_currentUser
additionalUserInfo:additionalUserInfo];
decoratedCallback(authDataResult, nil);
return;
}
[self internalSignInAnonymouslyWithCompletion:^(FIRSignUpNewUserResponse *_Nullable response,
Expand All @@ -707,9 +708,10 @@ - (void)signInAnonymouslyAndRetrieveDataWithCompletion:(FIRAuthDataResultCallbac
profile:nil
username:nil
isNewUser:YES];
decoratedCallback([[FIRAuthDataResult alloc] initWithUser:user
additionalUserInfo:additionalUserInfo],
nil);
FIRAuthDataResult *authDataResult =
[[FIRAuthDataResult alloc] initWithUser:user
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

indent 4

additionalUserInfo:additionalUserInfo];
decoratedCallback(authDataResult, nil);
}];
}];
});
Expand Down Expand Up @@ -1135,14 +1137,7 @@ - (void)internalSignInAnonymouslyWithCompletion:(FIRSignupNewUserCallback)comple
FIRSignUpNewUserRequest *request =
[[FIRSignUpNewUserRequest alloc]initWithRequestConfiguration:_requestConfiguration];
[FIRAuthBackend signUpNewUser:request
callback:^(FIRSignUpNewUserResponse *_Nullable response,
NSError *_Nullable error) {
if (error) {
completion(nil, error);
return;
}
completion(response, nil);
}];
callback:completion];
}

/** @fn possiblyPostAuthStateChangeNotification
Expand Down