improve phone auth flow

Author: russellwheatley

FirebaseSwiftUI/FirebasePhoneAuthSwiftUI/Sources/Services/PhoneAuthProviderSwift.swift

@@ -18,4 +18,4 @@ public class PhoneAuthProviderSwift: @preconcurrency PhoneAuthProviderProtocol {
         }
     }
   }
-}
+}

FirebaseSwiftUI/FirebasePhoneAuthSwiftUI/Sources/Views/PhoneAuthButtonView.swift

@@ -17,13 +17,16 @@ extension PhoneAuthButtonView: View {
   public var body: some View {
     if authService.authenticationState != .authenticating {
       VStack {
-        TextField("Enter phone number", text: $phoneNumber)
-          .keyboardType(.phonePad)
-          .padding()
-          .background(Color(.systemGray6))
-          .cornerRadius(8)
-          .padding(.horizontal)
-
+        LabeledContent {
+          TextField("Enter phone number", text: $phoneNumber)
+            .textInputAutocapitalization(.never)
+            .disableAutocorrection(true)
+            .submitLabel(.next)
+        } label: {
+          Image(systemName: "at")
+        }.padding(.vertical, 6)
+          .background(Divider(), alignment: .bottom)
+          .padding(.bottom, 4)
         Button(action: {
           Task {
             do {
@@ -37,46 +40,46 @@ extension PhoneAuthButtonView: View {
             }
           }
         }) {
-          Text("Send Verification Code")
+          Text("Send SMS code")
+            .padding(.vertical, 8)
+            .frame(maxWidth: .infinity)
+        }
+        .disabled(!PhoneUtils.isValidPhoneNumber(phoneNumber))
+        .padding([.top, .bottom], 8)
+        .frame(maxWidth: .infinity)
+        .buttonStyle(.borderedProminent)
+        Text(errorMessage).foregroundColor(.red)
+      }.sheet(isPresented: $showVerificationCodeInput) {
+        TextField("Enter verification code", text: $verificationCode)
+          .keyboardType(.numberPad)
+          .padding()
+          .background(Color(.systemGray6))
+          .cornerRadius(8)
+          .padding(.horizontal)
+
+        Button(action: {
+          Task {
+            do {
+              try await authService.signInWithPhoneNumber(
+                verificationID: verificationID,
+                verificationCode: verificationCode
+              )
+            } catch {
+              errorMessage = authService.string.localizedErrorMessage(for: error)
+            }
+            showVerificationCodeInput = false
+          }
+        }) {
+          Text("Verify phone number and sign-in")
             .foregroundColor(.white)
             .padding()
             .frame(maxWidth: .infinity)
-            .background(Color.blue)
+            .background(Color.green)
             .cornerRadius(8)
             .padding(.horizontal)
-        }.disabled(!PhoneUtils.isValidPhoneNumber(phoneNumber))
-      }
-      .sheet(isPresented: $showVerificationCodeInput) {
-        VStack {
-          TextField("Enter verification code", text: $verificationCode)
-            .keyboardType(.numberPad)
-            .padding()
-            .background(Color(.systemGray6))
-            .cornerRadius(8)
-            .padding(.horizontal)
-
-          Button(action: {
-            Task {
-              do {
-                try await authService.signInWithPhoneNumber(
-                  verificationID: verificationID,
-                  verificationCode: verificationCode
-                )
-              } catch {
-                errorMessage = authService.string.localizedErrorMessage(for: error)
-              }
-              showVerificationCodeInput = false
-            }
-          }) {
-            Text("Verify and Sign In")
-              .foregroundColor(.white)
-              .padding()
-              .frame(maxWidth: .infinity)
-              .background(Color.green)
-              .cornerRadius(8)
-              .padding(.horizontal)
-          }
         }
+      }.onOpenURL { url in
+        authService.auth.canHandle(url)
       }
     } else {
       ProgressView()

samples/swiftui/FirebaseSwiftUIExample/FirebaseSwiftUIExample/FirebaseSwiftUIExampleApp.swift

@@ -22,13 +22,28 @@ class AppDelegate: NSObject, UIApplicationDelegate {
                    didFinishLaunchingWithOptions launchOptions: [
                      UIApplication.LaunchOptionsKey: Any
                    ]?) -> Bool {
+    FirebaseApp.configure()
     ApplicationDelegate.shared.application(
       application,
       didFinishLaunchingWithOptions: launchOptions
     )
     return true
   }
 
+  func application(_: UIApplication,
+                   didRegisterForRemoteNotificationsWithDeviceToken deviceToken: Data) {
+    Auth.auth().setAPNSToken(deviceToken, type: .prod)
+  }
+
+  func application(_: UIApplication, didReceiveRemoteNotification notification: [AnyHashable: Any],
+                   fetchCompletionHandler completionHandler: @escaping (UIBackgroundFetchResult)
+                     -> Void) {
+    if Auth.auth().canHandleNotification(notification) {
+      completionHandler(.noData)
+      return
+    }
+  }
+
   func application(_ app: UIApplication,
                    open url: URL,
                    options: [UIApplication.OpenURLOptionsKey: Any] = [:]) -> Bool {
@@ -39,6 +54,7 @@ class AppDelegate: NSObject, UIApplicationDelegate {
         .sourceApplication] as? String,
       annotation: options[UIApplication.OpenURLOptionsKey.annotation]
     )
+
     return googleProvider.handleUrl(url)
   }
 }
@@ -47,9 +63,7 @@ class AppDelegate: NSObject, UIApplicationDelegate {
 struct FirebaseSwiftUIExampleApp: App {
   @UIApplicationDelegateAdaptor(AppDelegate.self) var appDelegate
 
-  init() {
-    FirebaseApp.configure()
-  }
+  init() {}
 
   var body: some Scene {
     WindowGroup {