🔀 Me rge branch 'peterfriese/samples/movietracker-new-ui/auth' into peterfriese/samples/movietracker-new-ui/main

Signed-off-by: Peter Friese <[email protected]>

Author: peterfriese

.gitignore

@@ -108,3 +108,4 @@ scripts
 xcodebuild.log
 
 Package.resolved
+GoogleService-Info.plist

Examples/FriendlyFlix/app/FriendlyFlix/FriendlyFlix.xcodeproj/project.pbxproj

@@ -6,6 +6,10 @@
 	objectVersion = 77;
 	objects = {
 
+/* Begin PBXBuildFile section */
+		8854EC512CC6AC2700A09F27 /* FirebaseAuth in Frameworks */ = {isa = PBXBuildFile; productRef = 8854EC502CC6AC2700A09F27 /* FirebaseAuth */; };
+/* End PBXBuildFile section */
+
 /* Begin PBXFileReference section */
 		88A9E6342CA834C600B3C4EF /* FriendlyFlix.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = FriendlyFlix.app; sourceTree = BUILT_PRODUCTS_DIR; };
 /* End PBXFileReference section */
@@ -23,6 +27,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				8854EC512CC6AC2700A09F27 /* FirebaseAuth in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -65,6 +70,7 @@
 			);
 			name = FriendlyFlix;
 			packageProductDependencies = (
+				8854EC502CC6AC2700A09F27 /* FirebaseAuth */,
 			);
 			productName = FriendlyFlix;
 			productReference = 88A9E6342CA834C600B3C4EF /* FriendlyFlix.app */;
@@ -94,6 +100,9 @@
 			);
 			mainGroup = 88A9E62B2CA834C600B3C4EF;
 			minimizedProjectReferenceProxies = 1;
+			packageReferences = (
+				8854EC4F2CC6AC2700A09F27 /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */,
+			);
 			preferredProjectObjectVersion = 77;
 			productRefGroup = 88A9E6352CA834C600B3C4EF /* Products */;
 			projectDirPath = "";
@@ -324,6 +333,25 @@
 			defaultConfigurationName = Release;
 		};
 /* End XCConfigurationList section */
+
+/* Begin XCRemoteSwiftPackageReference section */
+		8854EC4F2CC6AC2700A09F27 /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */ = {
+			isa = XCRemoteSwiftPackageReference;
+			repositoryURL = "https://github.com/firebase/firebase-ios-sdk.git";
+			requirement = {
+				kind = upToNextMajorVersion;
+				minimumVersion = 11.0.0;
+			};
+		};
+/* End XCRemoteSwiftPackageReference section */
+
+/* Begin XCSwiftPackageProductDependency section */
+		8854EC502CC6AC2700A09F27 /* FirebaseAuth */ = {
+			isa = XCSwiftPackageProductDependency;
+			package = 8854EC4F2CC6AC2700A09F27 /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */;
+			productName = FirebaseAuth;
+		};
+/* End XCSwiftPackageProductDependency section */
 	};
 	rootObject = 88A9E62C2CA834C600B3C4EF /* Project object */;
 }

Examples/FriendlyFlix/app/FriendlyFlix/FriendlyFlix/App/FriendlyFlixApp.swift

@@ -17,6 +17,7 @@
 // limitations under the License.
 
 import SwiftUI
+import Firebase
 
 @main
 struct FriendlyFlixApp: App {
@@ -32,12 +33,13 @@ struct FriendlyFlixApp: App {
 
   init () {
     loadRocketSimConnect()
+    FirebaseApp.configure()
   }
 
   var body: some Scene {
     WindowGroup {
       RootView()
-        .environment(AuthenticationViewModel())
+        .environment(AuthenticationService())
     }
   }
 }

Examples/FriendlyFlix/app/FriendlyFlix/FriendlyFlix/App/RootView.swift

@@ -19,7 +19,7 @@
 import SwiftUI
 
 struct RootView: View {
-  @Environment(AuthenticationViewModel.self) private var authenticationViewModel
+  @Environment(AuthenticationService.self) private var authenticationViewModel
 
   var body: some View {
     @Bindable var authenticationViewModel = authenticationViewModel
@@ -48,5 +48,5 @@ struct RootView: View {
 
 #Preview {
   RootView()
-    .environment(AuthenticationViewModel())
+    .environment(AuthenticationService())
 }

Examples/FriendlyFlix/app/FriendlyFlix/FriendlyFlix/Features/Authentication/AccountScreen.swift

@@ -20,8 +20,27 @@ import SwiftUI
 
 struct AccountScreen: View {
   @Environment(\.dismiss) var dismiss
-  @Environment(AuthenticationViewModel.self) var authenticationViewModel
+  @Environment(AuthenticationService.self) var authenticationService
 
+  private var displayName: String {
+    authenticationService.user?.displayName ?? "(not set)"
+  }
+
+  private var email: String {
+    authenticationService.user?.email ?? ""
+  }
+
+  private func signOut() {
+    do {
+      try authenticationService.signOut()
+      dismiss()
+    }
+    catch {
+    }
+  }
+}
+
+extension AccountScreen {
   var body: some View {
     NavigationStack {
       List {
@@ -32,8 +51,8 @@ struct AccountScreen: View {
               .scaledToFit()
               .frame(height: 48)
             VStack(alignment: .leading) {
-              Text("Peter Friese")
-              Text("[email protected]")
+              Text(displayName)
+              Text(email)
             }
           }
         }
@@ -45,10 +64,7 @@ struct AccountScreen: View {
         }
 
         Section {
-          Button(action: {
-            authenticationViewModel.signOut()
-            dismiss()
-          }) {
+          Button(action: signOut) {
             Text("Sign out")
           }
         }

Examples/FriendlyFlix/app/FriendlyFlix/FriendlyFlix/Features/Authentication/AuthenticationScreen.swift

@@ -19,33 +19,32 @@
 import SwiftUI
 import AuthenticationServices
 
-enum AuthenticationState {
-  case unauthenticated
-  case authenticating
-  case authenticated
+private enum FocusableField: Hashable {
+  case email
+  case password
+  case confirmPassword
 }
 
-enum AuthenticationFlow {
+private enum AuthenticationFlow {
   case login
   case signUp
 }
 
-@Observable
-class AuthenticationViewModel {
-  var presentingAuthenticationDialog = false
-  var presentingAccountDialog = false
+struct AuthenticationScreen: View {
+  @Environment(AuthenticationService.self) var authenticationService
+  @Environment(\.colorScheme) private var colorScheme
+  @Environment(\.dismiss) private var dismiss
 
-  var email = ""
-  var password = ""
-  var confirmPassword = ""
+  @State private var email = ""
+  @State private var password = ""
+  @State private var confirmPassword = ""
 
-  var flow: AuthenticationFlow = .login
+  @State private var flow: AuthenticationFlow = .login
 
-  var authenticationState: AuthenticationState = .unauthenticated
-  var errorMessage = ""
-  var displayName = ""
+  @State private var errorMessage = ""
+  @State private var displayName = ""
 
-  var isValid: Bool {
+  private  var isValid: Bool {
     return if flow == .login {
       !email.isEmpty && !password.isEmpty
     }
@@ -54,53 +53,42 @@ class AuthenticationViewModel {
     }
   }
 
-  func switchFlow() {
+  private func switchFlow() {
     flow = flow == .login ? .signUp : .login
     errorMessage = ""
   }
 
-  func signOut() {
-    authenticationState = .unauthenticated
-  }
-}
-
-private enum FocusableField: Hashable {
-  case email
-  case password
-  case confirmPassword
-}
-
-struct AuthenticationScreen: View {
-  @Environment(AuthenticationViewModel.self) var viewModel
-  @Environment(\.colorScheme) private var colorScheme
-  @Environment(\.dismiss) private var dismiss
-
   @FocusState private var focus: FocusableField?
 
   private func signInWithEmailPassword() {
-    if viewModel.authenticationState == .authenticated {
-      viewModel.authenticationState = .unauthenticated
-      dismiss()
-    }
-    else {
-      viewModel.authenticationState = .authenticated
-      dismiss()
+    Task {
+      do {
+        try await authenticationService.signInWithEmailPassword(email: email, password: password)
+        dismiss()
+      } catch {
+        print(error.localizedDescription)
+        errorMessage = error.localizedDescription
+      }
     }
   }
 
   private func signUpWithEmailPassword() {
-    if viewModel.authenticationState == .authenticated {
-      viewModel.authenticationState = .unauthenticated
-      dismiss()
-    }
-    else {
-      viewModel.authenticationState = .authenticated
-      dismiss()
+    Task {
+      do {
+        try await authenticationService.signUpWithEmailPassword(email: email, password: password)
+        errorMessage = ""
+        dismiss()
+      }
+      catch {
+        print(error.localizedDescription)
+        errorMessage = error.localizedDescription
+      }
     }
   }
+}
 
+extension AuthenticationScreen {
   var body: some View {
-    @Bindable var viewModel = viewModel
     VStack {
 //      Image("login")
 //        .resizable()
@@ -114,7 +102,7 @@ struct AuthenticationScreen: View {
 
       HStack {
         Image(systemName: "at")
-        TextField("Email", text: $viewModel.email)
+        TextField("Email", text: $email)
           .textInputAutocapitalization(.never)
           .disableAutocorrection(true)
           .focused($focus, equals: .email)
@@ -129,7 +117,7 @@ struct AuthenticationScreen: View {
 
       HStack {
         Image(systemName: "lock")
-        SecureField("Password", text: $viewModel.password)
+        SecureField("Password", text: $password)
           .focused($focus, equals: .password)
           .submitLabel(.go)
           .onSubmit {
@@ -140,10 +128,10 @@ struct AuthenticationScreen: View {
       .background(Divider(), alignment: .bottom)
       .padding(.bottom, 8)
 
-      if viewModel.flow == .signUp {
+      if flow == .signUp {
         HStack {
           Image(systemName: "lock")
-          SecureField("Confirm password", text: $viewModel.confirmPassword)
+          SecureField("Confirm password", text: $confirmPassword)
             .focused($focus, equals: .confirmPassword)
             .submitLabel(.go)
             .onSubmit {
@@ -155,16 +143,19 @@ struct AuthenticationScreen: View {
         .padding(.bottom, 8)
       }
 
-      if !viewModel.errorMessage.isEmpty {
+      if !errorMessage.isEmpty {
         VStack {
-          Text(viewModel.errorMessage)
+          Text(errorMessage)
             .foregroundColor(Color(UIColor.systemRed))
         }
       }
 
-      Button(action: signInWithEmailPassword) {
-        if viewModel.authenticationState != .authenticating {
-          Text(viewModel.flow == .login ? "Log in with password" : "Sign up")
+      Button(action: {
+        if flow == .login { signInWithEmailPassword() }
+        else { signUpWithEmailPassword()}
+      } ) {
+        if authenticationService.authenticationState != .authenticating {
+          Text(flow == .login ? "Log in with password" : "Sign up")
             .padding(.vertical, 8)
             .frame(maxWidth: .infinity)
         }
@@ -175,7 +166,7 @@ struct AuthenticationScreen: View {
             .frame(maxWidth: .infinity)
         }
       }
-      .disabled(!viewModel.isValid)
+      .disabled(!isValid)
       .frame(maxWidth: .infinity)
       .buttonStyle(.borderedProminent)
 
@@ -185,7 +176,7 @@ struct AuthenticationScreen: View {
         VStack { Divider() }
       }
 
-      if viewModel.flow == .login {
+      if flow == .login {
         SignInWithAppleButton(.signIn) { request in
         } onCompletion: { result in
         }
@@ -203,13 +194,13 @@ struct AuthenticationScreen: View {
       }
 
       HStack {
-        Text(viewModel.flow == .login ? "Don't have an account yet?" : "Already have an account?")
+        Text(flow == .login ? "Don't have an account yet?" : "Already have an account?")
         Button(action: {
           withAnimation {
-            viewModel.switchFlow()
+            switchFlow()
           }
         }) {
-          Text(viewModel.flow == .signUp ? "Log in" : "Sign up")
+          Text(flow == .signUp ? "Log in" : "Sign up")
             .fontWeight(.semibold)
             .foregroundColor(.blue)
         }
@@ -223,5 +214,5 @@ struct AuthenticationScreen: View {
 
 #Preview {
   AuthenticationScreen()
-    .environment(AuthenticationViewModel())
+    .environment(AuthenticationService())
 }