chore: update email auth logic

Author: russellwheatley

FirebaseSwiftUI/FirebaseAuthSwiftUI/Sources/FirebaseAuthSwiftUI/Services/AuthEnvironment.swift

@@ -83,7 +83,13 @@ public final class AuthEnvironment {
   }
 
   func signIn(with credentials: AuthCredential) async throws {
-    try await auth.signIn(with: credentials)
-    updateAuthenticationState()
+    authenticationState = .authenticating
+    do {
+      try await auth.signIn(with: credentials)
+      updateAuthenticationState()
+    } catch {
+      authenticationState = .unauthenticated
+      throw error
+    }
   }
 }

FirebaseSwiftUI/FirebaseAuthSwiftUI/Sources/FirebaseAuthSwiftUI/Services/EmailProvider.swift

@@ -12,17 +12,19 @@ public class EmailAuthProvider {
   func signIn(withEmail email: String, password: String) async throws {
     authEnvironment.authenticationState = .authenticating
     do {
-      try await authEnvironment.auth.createUser(withEmail: email, password: password)
+      try await authEnvironment.auth.signIn(withEmail: email, password: password)
+      authEnvironment.updateAuthenticationState()
     } catch {
       authEnvironment.authenticationState = .unauthenticated
       throw error
     }
   }
 
-  func signUp(withEmail email: String, password: String) async throws {
+  func createUser(withEmail email: String, password: String) async throws {
     authEnvironment.authenticationState = .authenticating
     do {
       try await authEnvironment.auth.createUser(withEmail: email, password: password)
+      authEnvironment.updateAuthenticationState()
     } catch {
       authEnvironment.authenticationState = .unauthenticated
       throw error

FirebaseSwiftUI/FirebaseAuthSwiftUI/Sources/FirebaseAuthSwiftUI/Views/AuthenticationScreen.swift

@@ -4,35 +4,41 @@ import SwiftUI
 @MainActor
 public struct AuthenticationScreen {
   @Environment(AuthEnvironment.self) private var authEnvironment
-  @State private var errorMessage = ""
 
   public init() {}
 
   private func switchFlow() {
     authEnvironment.authenticationFlow = authEnvironment
       .authenticationFlow == .login ? .signUp : .login
-    errorMessage = ""
+    authEnvironment.errorMessage = ""
   }
 }
 
 extension AuthenticationScreen: View {
   public var body: some View {
     VStack {
-      Text(authEnvironment.authenticationFlow == .login ? "Login" : "Sign up")
-      EmailPasswordView(provider: EmailAuthProvider(authEnvironment: authEnvironment))
-      HStack {
-        Text(authEnvironment
-          .authenticationFlow == .login ? "Don't have an account yet?" : "Already have an account?")
-        Button(action: {
-          withAnimation {
-            switchFlow()
+      if authEnvironment.authenticationState == .authenticated {
+        SignedInView()
+      } else {
+        Text(authEnvironment.authenticationFlow == .login ? "Login" : "Sign up")
+        EmailPasswordView(provider: EmailAuthProvider(authEnvironment: authEnvironment))
+        HStack {
+          Text(authEnvironment
+            .authenticationFlow == .login ? "Don't have an account yet?" :
+            "Already have an account?")
+          Button(action: {
+            withAnimation {
+              switchFlow()
+            }
+          }) {
+            Text(authEnvironment.authenticationFlow == .signUp ? "Log in" : "Sign up")
+              .fontWeight(.semibold)
+              .foregroundColor(.blue)
           }
-        }) {
-          Text(authEnvironment.authenticationFlow == .signUp ? "Log in" : "Sign up")
-            .fontWeight(.semibold)
-            .foregroundColor(.blue)
         }
       }
+      Text(authEnvironment.errorMessage)
+        .foregroundColor(.red)
     }
   }
 }

FirebaseSwiftUI/FirebaseAuthSwiftUI/Sources/FirebaseAuthSwiftUI/Views/EmailPasswordView.swift

@@ -46,9 +46,9 @@ public struct EmailPasswordView {
     }
   }
 
-  private func signUpWithEmailPassword() async {
+  private func createUserWithEmailPassword() async {
     do {
-      try await provider.signUp(withEmail: email, password: password)
+      try await provider.createUser(withEmail: email, password: password)
       dismiss()
     } catch {
       authEnvironment.errorMessage = error.localizedDescription
@@ -90,8 +90,10 @@ extension EmailPasswordView: View {
       .padding(.bottom, 8)
 
       if authEnvironment.authenticationFlow == .login {
-        Button("Forgot password?") {}
-          .frame(maxWidth: .infinity, alignment: .trailing)
+        Button("Forgot password?") {
+          // TODO: - does this update to a new screen or update in-situ???
+        }
+        .frame(maxWidth: .infinity, alignment: .trailing)
       }
 
       if authEnvironment.authenticationFlow == .signUp {
@@ -100,7 +102,7 @@ extension EmailPasswordView: View {
             .focused($focus, equals: .confirmPassword)
             .submitLabel(.go)
             .onSubmit {
-              Task { await signUpWithEmailPassword() }
+              Task { await createUserWithEmailPassword() }
             }
         } label: {
           Image(systemName: "lock")
@@ -113,7 +115,7 @@ extension EmailPasswordView: View {
       Button(action: {
         Task {
           if authEnvironment.authenticationFlow == .login { await signInWithEmailPassword() }
-          else { await signUpWithEmailPassword() }
+          else { await createUserWithEmailPassword() }
         }
       }) {
         if authEnvironment.authenticationState != .authenticating {

FirebaseSwiftUI/FirebaseAuthSwiftUI/Sources/FirebaseAuthSwiftUI/Views/SignedInView.swift

@@ -0,0 +1,20 @@
+import SwiftUI
+
+@MainActor
+public struct SignedInView {
+  @Environment(AuthEnvironment.self) private var authEnvironment
+}
+
+extension SignedInView: View {
+  public var body: some View {
+    VStack {
+      Text("Signed in")
+      Text("User: \(authEnvironment.currentUser?.email ?? "Unknown")")
+      Button("Sign out") {
+        Task {
+          try? await authEnvironment.signOut()
+        }
+      }
+    }
+  }
+}