Skip to content

Add nil check for completion handlers #568

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

Merged
merged 3 commits into from
Dec 15, 2017
Merged

Add nil check for completion handlers #568

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e412303
Add nullability check for completion handler
protocol86 Dec 14, 2017
479c935
Addresses comments
protocol86 Dec 14, 2017
de12d0f
added line break
protocol86 Dec 14, 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
44 changes: 31 additions & 13 deletions Example/Auth/Sample/MainViewController.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,12 +38,18 @@
#import "UserInfoViewController.h"
#import "UserTableViewCell.h"

NS_ASSUME_NONNULL_BEGIN

/*! @typedef textInputCompletionBlock
/** @typedef textInputCompletionBlock
@brief The type of callback used to report text input prompt results.
*/
typedef void (^textInputCompletionBlock)(NSString *_Nullable userInput);

/** @typedef testAutomationCallback
@brief The type of callback used when automatically testing an API.
*/
typedef void (^testAutomationCallback)(NSError *_Nullable error);

/** @var kTokenGetButtonText
@brief The text of the "Get Token" button.
*/
Expand Down Expand Up @@ -2187,18 +2193,20 @@ - (void)showEmailPasswordDialogWithCompletion:(ShowEmailPasswordDialogCompletion
@completion A completion block to be executed after the provider is unlinked.
*/
- (void)unlinkFromProvider:(NSString *)provider
completion:(void(^)(NSError *_Nullable))completion {
completion:(nullable testAutomationCallback)completion {
[[self user] unlinkFromProvider:provider
completion:^(FIRUser *_Nullable user,
NSError *_Nullable error) {
if (error) {
[self logFailure:@"unlink auth provider failed" error:error];
completion(error);
} else {
[self logSuccess:@"unlink auth provider succeeded."];
if (completion) {
completion(nil);
completion(error);
}
return;
}
[self logSuccess:@"unlink auth provider succeeded."];
if (completion) {
completion(nil);
}
[self showTypicalUIForUserUpdateResultsWithTitle:kUnlinkTitle error:error];
}];
Expand Down Expand Up @@ -2642,7 +2650,7 @@ - (void)signInWithPhoneNumber {
@completion A completion block to be executed after successful phone number sign in.
*/
- (void)signInWithPhoneNumber:(NSString *_Nullable)phoneNumber
completion:(void(^)(NSError *_Nullable))completion {
completion:(nullable testAutomationCallback)completion {
[self showSpinner:^{
[[AppManager phoneAuthProvider] verifyPhoneNumber:phoneNumber
UIDelegate:nil
Expand Down Expand Up @@ -2727,7 +2735,7 @@ - (void)commontPhoneVerificationWithVerificationID:(NSString *)verificationID
@completion A completion block to be executed after phone number is updated.
*/
- (void)updatePhoneNumber:(NSString *_Nullable)phoneNumber
completion:(void(^)(NSError *_Nullable))completion{
completion:(nullable testAutomationCallback)completion {
[self showSpinner:^{
[[AppManager phoneAuthProvider] verifyPhoneNumber:phoneNumber
UIDelegate:nil
Expand All @@ -2736,7 +2744,9 @@ - (void)updatePhoneNumber:(NSString *_Nullable)phoneNumber
if (error) {
[self logFailure:@"failed to send verification code" error:error];
[self showMessagePrompt:error.localizedDescription];
completion(error);
if (completion) {
completion(error);
}
return;
}
[self logSuccess:@"Code sent"];
Expand All @@ -2757,7 +2767,9 @@ - (void)updatePhoneNumber:(NSString *_Nullable)phoneNumber
if (error) {
[self logFailure:@"update phone number failed" error:error];
[self showMessagePrompt:error.localizedDescription];
completion(error);
if (completion) {
completion(error);
}
} else {
[self logSuccess:@"update phone number succeeded."];
if (completion) {
Expand Down Expand Up @@ -2794,7 +2806,7 @@ - (void)updatePhoneNumberWithPrompt {
@completion A completion block to be executed after linking phone number.
*/
- (void)linkPhoneNumber:(NSString *_Nullable)phoneNumber
completion:(void(^)(NSError *_Nullable))completion{
completion:(nullable testAutomationCallback)completion {
[self showSpinner:^{
[[AppManager phoneAuthProvider] verifyPhoneNumber:phoneNumber
UIDelegate:nil
Expand All @@ -2804,7 +2816,9 @@ - (void)linkPhoneNumber:(NSString *_Nullable)phoneNumber
if (error) {
[self logFailure:@"failed to send verification code" error:error];
[self showMessagePrompt:error.localizedDescription];
completion(error);
if (completion) {
completion(error);
}
return;
}
[self logSuccess:@"Code sent"];
Expand Down Expand Up @@ -2845,7 +2859,9 @@ - (void)linkPhoneNumber:(NSString *_Nullable)phoneNumber
if (error) {
[self logFailure:@"failed to verify phone number" error:error];
[self showMessagePrompt:error.localizedDescription];
completion(error);
if (completion) {
completion(error);
}
return;
}
}];
Expand Down Expand Up @@ -3147,3 +3163,5 @@ - (IBAction)copyConsole:(id)sender {
}

@end

NS_ASSUME_NONNULL_END