Rollback Examples

Author: grdsdev

Examples/Examples/AddTodoListView.swift

@@ -13,7 +13,7 @@ struct AddTodoListView: View {
 
   var body: some View {
     Section {
-      TextField("Task", text: $request.task)
+      TextField("Description", text: $request.description)
       Button("Save") {
         Task { await saveButtonTapped() }
       }
@@ -39,9 +39,9 @@ struct AddTodoListView_Previews: PreviewProvider {
     AddTodoListView(
       request: .constant(
         .init(
-          task: "",
+          description: "",
           isComplete: false,
-          userId: UUID()
+          ownerID: UUID()
         ))
     ) { _ in
     }

Examples/Examples/AuthView.swift

@@ -9,81 +9,95 @@ import GoTrue
 import SwiftUI
 
 @MainActor
-final class AuthViewModel: ObservableObject {
-  enum Mode {
-    case signIn, signUp
-  }
+final class AuthController: ObservableObject {
+  @Published var session: Session?
 
-  @Published var email = ""
-  @Published var password = ""
-  @Published var mode: Mode = .signIn
-  @Published var authError: Error?
-
-  func signInButtonTapped() async {
-    do {
-      authError = nil
-      try await supabase.auth.signIn(email: email, password: password)
-    } catch {
-      logger.error("signIn: \(error.localizedDescription)")
-      self.authError = error
+  var currentUserID: UUID {
+    guard let id = session?.user.id else {
+      preconditionFailure("Required session.")
     }
+
+    return id
   }
 
-  func signUpButtonTapped() async {
-    do {
-      authError = nil
-      try await supabase.auth.signUp(
-        email: email, password: password, redirectTo: URL(string: "com.supabase.Examples://")!)
-    } catch {
-      logger.error("signUp: \(error.localizedDescription)")
-      self.authError = error
+  func observeAuth() async {
+    for await event in await supabase.auth.onAuthStateChange() {
+      guard event == .signedIn || event == .signedOut else {
+        return
+      }
+
+      session = try? await supabase.auth.session
     }
   }
 }
 
 struct AuthView: View {
-  @ObservedObject var model: AuthViewModel
+  enum Mode {
+    case signIn, signUp
+  }
+
+  @EnvironmentObject var auth: AuthController
+
+  @State var email = ""
+  @State var password = ""
+  @State var mode: Mode = .signIn
+  @State var error: Error?
 
   var body: some View {
     Form {
       Section {
-        TextField("Email", text: $model.email)
+        TextField("Email", text: $email)
           .keyboardType(.emailAddress)
           .textContentType(.emailAddress)
           .autocorrectionDisabled()
           .textInputAutocapitalization(.never)
-        SecureField("Password", text: $model.password)
+        SecureField("Password", text: $password)
           .textContentType(.password)
           .autocorrectionDisabled()
           .textInputAutocapitalization(.never)
-        AsyncButton(model.mode == .signIn ? "Sign in" : "Sign up") {
-          await primaryActionButtonTapped()
+        Button(mode == .signIn ? "Sign in" : "Sign up") {
+          Task {
+            await primaryActionButtonTapped()
+          }
         }
 
-        if let error = model.authError {
+        if let error {
           ErrorText(error)
         }
       }
 
       Section {
         Button(
-          model.mode == .signIn
-            ? "Don't have an account? Sign up." : "Already have an account? Sign in."
+          mode == .signIn ? "Don't have an account? Sign up." : "Already have an account? Sign in."
         ) {
           withAnimation {
-            model.mode = model.mode == .signIn ? .signUp : .signIn
+            mode = mode == .signIn ? .signUp : .signIn
           }
         }
       }
     }
   }
 
   func primaryActionButtonTapped() async {
-    switch model.mode {
-    case .signIn:
-      await model.signInButtonTapped()
-    case .signUp:
-      await model.signUpButtonTapped()
+    do {
+      error = nil
+      switch mode {
+      case .signIn:
+        try await supabase.auth.signIn(email: email, password: password)
+      case .signUp:
+        try await supabase.auth.signUp(
+          email: email, password: password, redirectTo: URL(string: "com.supabase.Examples://")!)
+      }
+    } catch {
+      withAnimation {
+        self.error = error
+      }
     }
   }
 }
+
+struct AuthView_Previews: PreviewProvider {
+  static var previews: some View {
+    AuthView()
+  }
+}

Examples/Examples/ExamplesApp.swift

@@ -10,9 +10,12 @@ import SwiftUI
 
 @main
 struct ExamplesApp: App {
+  @StateObject var auth = AuthController()
+
   var body: some Scene {
     WindowGroup {
-      RootView(model: RootViewModel())
+      RootView()
+        .environmentObject(auth)
     }
   }
 }

Examples/Examples/HomeView.swift

@@ -8,6 +8,8 @@
 import SwiftUI
 
 struct HomeView: View {
+  @EnvironmentObject var auth: AuthController
+
   @State private var mfaStatus: MFAStatus?
 
   var body: some View {

Examples/Examples/MFAFlow.swift

@@ -167,8 +167,10 @@ struct MFAVerifyView: View {
 }
 
 struct MFAVerifiedView: View {
+  @EnvironmentObject var auth: AuthController
+
   var factors: [Factor] {
-    []
+    auth.session?.user.factors ?? []
   }
 
   var body: some View {

Examples/Examples/Models.swift

@@ -1,20 +1,39 @@
 import Foundation
 
 struct Todo: Identifiable, Hashable, Decodable {
-  let id: Int
-  let task: String
+  let id: UUID
+  var description: String
   var isComplete: Bool
-  let insertedAt: Date
+  let createdAt: Date
+
+  enum CodingKeys: String, CodingKey {
+    case id
+    case description
+    case isComplete = "is_complete"
+    case createdAt = "created_at"
+  }
 }
 
 struct CreateTodoRequest: Encodable {
-  var task: String
+  var description: String
   var isComplete: Bool
-  var userId: UUID
+  var ownerID: UUID
+
+  enum CodingKeys: String, CodingKey {
+    case description
+    case isComplete = "is_complete"
+    case ownerID = "owner_id"
+  }
 }
 
 struct UpdateTodoRequest: Encodable {
-  var task: String?
+  var description: String?
   var isComplete: Bool?
-  var userId: UUID
+  var ownerID: UUID
+
+  enum CodingKeys: String, CodingKey {
+    case description
+    case isComplete = "is_complete"
+    case ownerID = "owner_id"
+  }
 }

Examples/Examples/RootView.swift

@@ -8,48 +8,30 @@
 import GoTrue
 import SwiftUI
 
-extension Session {
-  static var current: Session?
-}
-
-@MainActor
-final class RootViewModel: ObservableObject {
-  let authViewModel = AuthViewModel()
-
-  @Published private(set) var session: Session?
-
-  init() {
-    Task {
-      for await event in await supabase.auth.onAuthStateChange() {
-        logger.info("event changed: \(event.rawValue)")
-
-        guard event == .signedIn || event == .signedOut else {
-          return
-        }
-
-        let session = try? await supabase.auth.session
-        self.session = session
-        Session.current = session
-      }
-    }
-  }
-}
-
 struct RootView: View {
-  @ObservedObject var model: RootViewModel
+  @EnvironmentObject var auth: AuthController
 
   var body: some View {
     Group {
-      if model.session == nil {
-        AuthView(model: model.authViewModel)
+      if auth.session == nil {
+        AuthView()
       } else {
         HomeView()
       }
     }
+    .task {
+      await auth.observeAuth()
+    }
     .onOpenURL { url in
       Task {
         try? await supabase.auth.session(from: url)
       }
     }
   }
 }
+
+struct ContentView_Previews: PreviewProvider {
+  static var previews: some View {
+    RootView()
+  }
+}

Examples/Examples/TodoListRow.swift

@@ -13,7 +13,7 @@ struct TodoListRow: View {
 
   var body: some View {
     HStack {
-      Text(todo.task)
+      Text(todo.description)
       Spacer()
       Button {
         completeTapped()
@@ -29,10 +29,10 @@ struct TodoListRow_Previews: PreviewProvider {
   static var previews: some View {
     TodoListRow(
       todo: .init(
-        id: 1,
-        task: "",
+        id: UUID(),
+        description: "",
         isComplete: false,
-        insertedAt: .now
+        createdAt: .now
       )
     ) {}
   }

Examples/Examples/TodoListView.swift

@@ -6,11 +6,12 @@
 //
 
 import IdentifiedCollections
-import Supabase
 import SwiftUI
 import SwiftUINavigation
 
 struct TodoListView: View {
+  @EnvironmentObject var auth: AuthController
+
   @State var todos: IdentifiedArrayOf<Todo> = []
   @State var error: Error?
 
@@ -59,9 +60,9 @@ struct TodoListView: View {
           Button {
             withAnimation {
               createTodoRequest = .init(
-                task: "",
+                description: "",
                 isComplete: false,
-                userId: UUID()
+                ownerID: auth.currentUserID
               )
             }
           } label: {
@@ -89,14 +90,6 @@ struct TodoListView: View {
         self.error = error
       }
     }
-    .task {
-      supabase.realtime.connect()
-
-      supabase.realtime.channel("realtime:public")
-        .on("INSERT") { message in dump(["INSERT", message]) }
-        .on("UPDATE") { message in dump(["UPDATE", message]) }
-        .on("DELETE") { message in dump(["DELETE", message]) }
-    }
   }
 
   func toggleCompletion(of todo: Todo) async {
@@ -109,7 +102,7 @@ struct TodoListView: View {
 
       let updateRequest = UpdateTodoRequest(
         isComplete: updatedTodo.isComplete,
-        userId: Session.current!.user.id
+        ownerID: auth.currentUserID
       )
       updatedTodo = try await supabase.database.from("todos")
         .update(values: updateRequest, returning: .representation)