38
38
#import " UserInfoViewController.h"
39
39
#import " UserTableViewCell.h"
40
40
41
+ NS_ASSUME_NONNULL_BEGIN
41
42
42
- /* ! @typedef textInputCompletionBlock
43
+ /* * @typedef textInputCompletionBlock
43
44
@brief The type of callback used to report text input prompt results.
44
45
*/
45
46
typedef void (^textInputCompletionBlock)(NSString *_Nullable userInput);
46
47
48
+ /* * @typedef testAutomationCallback
49
+ @brief The type of callback used when automatically testing an API.
50
+ */
51
+ typedef void (^testAutomationCallback)(NSError *_Nullable error);
52
+
47
53
/* * @var kTokenGetButtonText
48
54
@brief The text of the "Get Token" button.
49
55
*/
@@ -2187,18 +2193,20 @@ - (void)showEmailPasswordDialogWithCompletion:(ShowEmailPasswordDialogCompletion
2187
2193
@completion A completion block to be executed after the provider is unlinked.
2188
2194
*/
2189
2195
- (void )unlinkFromProvider : (NSString *)provider
2190
- completion : (void (^)( NSError *_Nullable) )completion {
2196
+ completion : (nullable testAutomationCallback )completion {
2191
2197
[[self user ] unlinkFromProvider: provider
2192
2198
completion: ^(FIRUser *_Nullable user,
2193
2199
NSError *_Nullable error) {
2194
2200
if (error) {
2195
2201
[self logFailure: @" unlink auth provider failed" error: error];
2196
- completion (error);
2197
- } else {
2198
- [self logSuccess: @" unlink auth provider succeeded." ];
2199
2202
if (completion) {
2200
- completion (nil );
2203
+ completion (error );
2201
2204
}
2205
+ return ;
2206
+ }
2207
+ [self logSuccess: @" unlink auth provider succeeded." ];
2208
+ if (completion) {
2209
+ completion (nil );
2202
2210
}
2203
2211
[self showTypicalUIForUserUpdateResultsWithTitle: kUnlinkTitle error: error];
2204
2212
}];
@@ -2642,7 +2650,7 @@ - (void)signInWithPhoneNumber {
2642
2650
@completion A completion block to be executed after successful phone number sign in.
2643
2651
*/
2644
2652
- (void )signInWithPhoneNumber : (NSString *_Nullable)phoneNumber
2645
- completion : (void (^)( NSError *_Nullable) )completion {
2653
+ completion : (nullable testAutomationCallback )completion {
2646
2654
[self showSpinner: ^{
2647
2655
[[AppManager phoneAuthProvider ] verifyPhoneNumber: phoneNumber
2648
2656
UIDelegate: nil
@@ -2727,7 +2735,7 @@ - (void)commontPhoneVerificationWithVerificationID:(NSString *)verificationID
2727
2735
@completion A completion block to be executed after phone number is updated.
2728
2736
*/
2729
2737
- (void )updatePhoneNumber : (NSString *_Nullable)phoneNumber
2730
- completion : (void (^)( NSError *_Nullable)) completion {
2738
+ completion : (nullable testAutomationCallback) completion {
2731
2739
[self showSpinner: ^{
2732
2740
[[AppManager phoneAuthProvider ] verifyPhoneNumber: phoneNumber
2733
2741
UIDelegate: nil
@@ -2736,7 +2744,9 @@ - (void)updatePhoneNumber:(NSString *_Nullable)phoneNumber
2736
2744
if (error) {
2737
2745
[self logFailure: @" failed to send verification code" error: error];
2738
2746
[self showMessagePrompt: error.localizedDescription];
2739
- completion (error);
2747
+ if (completion) {
2748
+ completion (error);
2749
+ }
2740
2750
return ;
2741
2751
}
2742
2752
[self logSuccess: @" Code sent" ];
@@ -2757,7 +2767,9 @@ - (void)updatePhoneNumber:(NSString *_Nullable)phoneNumber
2757
2767
if (error) {
2758
2768
[self logFailure: @" update phone number failed" error: error];
2759
2769
[self showMessagePrompt: error.localizedDescription];
2760
- completion (error);
2770
+ if (completion) {
2771
+ completion (error);
2772
+ }
2761
2773
} else {
2762
2774
[self logSuccess: @" update phone number succeeded." ];
2763
2775
if (completion) {
@@ -2794,7 +2806,7 @@ - (void)updatePhoneNumberWithPrompt {
2794
2806
@completion A completion block to be executed after linking phone number.
2795
2807
*/
2796
2808
- (void )linkPhoneNumber : (NSString *_Nullable)phoneNumber
2797
- completion : (void (^)( NSError *_Nullable)) completion {
2809
+ completion : (nullable testAutomationCallback) completion {
2798
2810
[self showSpinner: ^{
2799
2811
[[AppManager phoneAuthProvider ] verifyPhoneNumber: phoneNumber
2800
2812
UIDelegate: nil
@@ -2804,7 +2816,9 @@ - (void)linkPhoneNumber:(NSString *_Nullable)phoneNumber
2804
2816
if (error) {
2805
2817
[self logFailure: @" failed to send verification code" error: error];
2806
2818
[self showMessagePrompt: error.localizedDescription];
2807
- completion (error);
2819
+ if (completion) {
2820
+ completion (error);
2821
+ }
2808
2822
return ;
2809
2823
}
2810
2824
[self logSuccess: @" Code sent" ];
@@ -2845,7 +2859,9 @@ - (void)linkPhoneNumber:(NSString *_Nullable)phoneNumber
2845
2859
if (error) {
2846
2860
[self logFailure: @" failed to verify phone number" error: error];
2847
2861
[self showMessagePrompt: error.localizedDescription];
2848
- completion (error);
2862
+ if (completion) {
2863
+ completion (error);
2864
+ }
2849
2865
return ;
2850
2866
}
2851
2867
}];
@@ -3147,3 +3163,5 @@ - (IBAction)copyConsole:(id)sender {
3147
3163
}
3148
3164
3149
3165
@end
3166
+
3167
+ NS_ASSUME_NONNULL_END
0 commit comments