Update FirebaseUI with FirebaseAuth 4.2.0 changes

Author: yramanchuk

FirebasePhoneAuthUI/FUIPhoneEntryViewController.m

@@ -16,8 +16,9 @@
 
 #import "FUIPhoneEntryViewController.h"
 
-#import <FirebaseAuth/FIRPhoneAuthProvider.h>
 #import <FirebaseAuth/FirebaseAuth.h>
+#import <FirebaseAuth/FIRAuthUIDelegate.h>
+#import <FirebaseAuth/FIRPhoneAuthProvider.h>
 #import "FUIAuthTableViewCell.h"
 #import "FUIAuthUtils.h"
 #import "FUIAuth_Internal.h"
@@ -50,8 +51,11 @@
  */
 static NSString *const kNextButtonAccessibilityID = @"NextButtonAccessibilityID";
 
-@interface FUIPhoneEntryViewController ()
-    <UITextFieldDelegate, UITabBarDelegate, UITableViewDataSource, FUICountryTableViewDelegate>
+@interface FUIPhoneEntryViewController () <UITextFieldDelegate,
+                                           UITabBarDelegate,
+                                           UITableViewDataSource,
+                                           FUICountryTableViewDelegate,
+                                           FIRAuthUIDelegate>
 @end
 
 @implementation FUIPhoneEntryViewController  {
@@ -162,6 +166,7 @@ - (void)onNext:(NSString *)phoneNumber {
   NSString *phoneNumberWithCountryCode =
       [NSString stringWithFormat:@"+%@%@", _selectedCountryCode.dialCode, phoneNumber];
   [provider verifyPhoneNumber:phoneNumberWithCountryCode
+                   UIDelegate:self
                    completion:^(NSString *_Nullable verificationID, NSError *_Nullable error) {
 
     [self decrementActivity];

FirebasePhoneAuthUI/FUIPhoneVerificationViewController.m

@@ -16,6 +16,7 @@
 
 #import "FUIPhoneVerificationViewController.h"
 
+#import <FirebaseAuth/FIRAuthUIDelegate.h>
 #import <FirebaseAuth/FIRPhoneAuthProvider.h>
 #import "FirebaseAuth/FIRPhoneAuthCredential.h"
 #import "FUIAuth_Internal.h"
@@ -35,7 +36,7 @@
 /** Regex pattern that matches for a TOS style link. For example: [Terms]. */
 static NSString *const kLinkPlaceholderPattern = @"\\[([^\\]]+)\\]";
 
-@interface FUIPhoneVerificationViewController () <FUICodeFieldDelegate>
+@interface FUIPhoneVerificationViewController () <FUICodeFieldDelegate, FIRAuthUIDelegate>
 @end
 
 @implementation FUIPhoneVerificationViewController {
@@ -135,6 +136,7 @@ - (IBAction)onResendCode:(id)sender {
   [_codeField resignFirstResponder];
   FIRPhoneAuthProvider *provider = [FIRPhoneAuthProvider providerWithAuth:self.auth];
   [provider verifyPhoneNumber:_phoneNumber
+                   UIDelegate:self
                    completion:^(NSString *_Nullable verificationID, NSError *_Nullable error) {
 
     [self decrementActivity];

samples/swift/FirebaseUI-demo-swift/Samples/Auth/FUIAuthViewController.swift

@@ -143,7 +143,7 @@ class FUIAuthViewController: UITableViewController {
         (self.authUI?.isSignInWithEmailHidden)!;
       if (shouldSkipPhoneAuthPicker) {
         let provider = self.authUI?.providers.first as! FUIPhoneAuth;
-        provider.signIn(withPresenting: self);
+        provider.signIn(withPresenting: self, phoneNumber: nil);
       } else {
         let controller = self.authUI!.authViewController()
         controller.navigationBar.isHidden = self.customAuthorizationSwitch.isOn