rm Nav links and use auth service view enum

Author: russellwheatley

FirebaseSwiftUI/FirebaseAuthSwiftUI/Sources/Services/AuthService.swift

@@ -25,6 +25,12 @@ public enum AuthenticationFlow {
   case signUp
 }
 
+public enum AuthView {
+  case authPicker
+  case passwordRecovery
+  case emailLink
+}
+
 public enum AuthServiceError: Error {
   case invalidEmailLink(String)
   case notConfiguredProvider(String)
@@ -77,7 +83,7 @@ public final class AuthService {
   @ObservationIgnored @AppStorage("email-link") public var emailLink: String?
   public let configuration: AuthConfiguration
   public let auth: Auth
-
+  public var authView: AuthView = .authPicker
   public let string: StringUtils
   public var currentUser: User?
   public var authenticationState: AuthenticationState = .unauthenticated

FirebaseSwiftUI/FirebaseAuthSwiftUI/Sources/Views/AuthPickerView.swift

@@ -20,6 +20,10 @@ extension AuthPickerView: View {
     VStack {
       if authService.authenticationState == .authenticated {
         SignedInView()
+      } else if authService.authView == .passwordRecovery {
+        PasswordRecoveryView()
+      } else if authService.authView == .emailLink {
+        EmailLinkView()
       } else {
         Text(authService.authenticationFlow == .login ? "Login" : "Sign up")
         VStack { Divider() }

FirebaseSwiftUI/FirebaseAuthSwiftUI/Sources/Views/EmailAuthView.swift

@@ -90,10 +90,11 @@ extension EmailAuthView: View {
       .padding(.bottom, 8)
 
       if authService.authenticationFlow == .login {
-        NavigationLink(destination: PasswordRecoveryView()
-          .environment(authService)) {
-            Text("Forgotten Password?")
-          }
+        Button(action: {
+          authService.authView = .passwordRecovery
+        }) {
+          Text("Forgotten Password?")
+        }
       }
 
       if authService.authenticationFlow == .signUp {
@@ -133,10 +134,11 @@ extension EmailAuthView: View {
       .padding([.top, .bottom], 8)
       .frame(maxWidth: .infinity)
       .buttonStyle(.borderedProminent)
-      NavigationLink(destination: EmailLinkView().environment(authService)
-        .environment(authService)) {
-          Text("Prefer Email link sign-in?")
-        }
+      Button(action: {
+        authService.authView = .passwordRecovery
+      }) {
+        Text("Prefer Email link sign-in?")
+      }
     }
   }
 }

FirebaseSwiftUI/FirebaseAuthSwiftUI/Sources/Views/EmailLinkView.swift

@@ -64,5 +64,13 @@ extension EmailLinkView: View {
         } catch {}
       }
     }
+    .navigationBarItems(leading: Button(action: {
+      authService.authView = .authPicker
+    }) {
+      Image(systemName: "chevron.left")
+        .foregroundColor(.blue)
+      Text("Back")
+        .foregroundColor(.blue)
+    })
   }
 }

FirebaseSwiftUI/FirebaseAuthSwiftUI/Sources/Views/PasswordRecoveryView.swift

@@ -57,5 +57,13 @@ extension PasswordRecoveryView: View {
     }.onOpenURL { _ in
       // move the user to email/password View
     }
+    .navigationBarItems(leading: Button(action: {
+      authService.authView = .authPicker
+    }) {
+      Image(systemName: "chevron.left")
+        .foregroundColor(.blue)
+      Text("Back")
+        .foregroundColor(.blue)
+    })
   }
 }