demo improvements

Author: stevensJourney

.gitignore

@@ -69,3 +69,6 @@ DerivedData/
 .swiftpm/configuration/registries.json
 .swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata
 .netrc
+
+
+Secrets.swift

Demo/PowerSyncExample/Navigation.swift

@@ -6,11 +6,6 @@ enum Route: Hashable {
     case signUp
 }
 
-@Observable
-class AuthModel {
-    var isAuthenticated = false
-}
-
 @Observable
 class NavigationModel {
     var path = NavigationPath()

Demo/PowerSyncExample/PowerSync/SupabaseConnector.swift

@@ -40,7 +40,10 @@ private enum PostgresFatalCodes {
 @Observable
 class SupabaseConnector: PowerSyncBackendConnector {
     let powerSyncEndpoint: String = Secrets.powerSyncEndpoint
-    let client: SupabaseClient = .init(supabaseURL: Secrets.supabaseURL, supabaseKey: Secrets.supabaseAnonKey)
+    let client: SupabaseClient = .init(
+        supabaseURL: Secrets.supabaseURL,
+        supabaseKey: Secrets.supabaseAnonKey,
+    )
     var session: Session?
     private var errorCode: String?
 
@@ -49,6 +52,7 @@ class SupabaseConnector: PowerSyncBackendConnector {
 
     override init() {
         super.init()
+        session = client.auth.currentSession
         observeAuthStateChangesTask = Task { [weak self] in
             guard let self = self else { return }
 

Demo/PowerSyncExample/RootView.swift

@@ -3,14 +3,13 @@ import SwiftUI
 
 struct RootView: View {
     @Environment(SystemManager.self) var system
-
-    @State private var authModel = AuthModel()
+    
     @State private var navigationModel = NavigationModel()
 
     var body: some View {
         NavigationStack(path: $navigationModel.path) {
             Group {
-                if authModel.isAuthenticated {
+                if system.connector.session != nil {
                     HomeScreen()
                 } else {
                     SignInScreen()
@@ -27,7 +26,6 @@ struct RootView: View {
                 }
             }
         }
-        .environment(authModel)
         .environment(navigationModel)
     }
 }

Demo/PowerSyncExample/Screens/HomeScreen.swift

@@ -4,7 +4,6 @@ import SwiftUI
 
 struct HomeScreen: View {
     @Environment(SystemManager.self) private var system
-    @Environment(AuthModel.self) private var authModel
     @Environment(NavigationModel.self) private var navigationModel
 
 
@@ -16,7 +15,6 @@ struct HomeScreen: View {
               Button("Sign out") {
                 Task { 
                     try await system.signOut()
-                    authModel.isAuthenticated = false
                     navigationModel.path = NavigationPath()
                 }
               }

Demo/PowerSyncExample/Screens/SignInScreen.swift

@@ -8,7 +8,6 @@ private enum ActionState<Success, Failure: Error> {
 
 struct SignInScreen: View {
     @Environment(SystemManager.self) private var system
-    @Environment(AuthModel.self) private var authModel
     @Environment(NavigationModel.self) private var navigationModel
 
     @State private var email = ""
@@ -66,7 +65,6 @@ struct SignInScreen: View {
             actionState = .inFlight
             try await system.connector.client.auth.signIn(email: email, password: password)
             actionState = .result(.success(()))
-            authModel.isAuthenticated = true
             navigationModel.path = NavigationPath()
         } catch {
             withAnimation {

Demo/PowerSyncExample/Screens/SignUpScreen.swift

@@ -8,7 +8,6 @@ private enum ActionState<Success, Failure: Error> {
 
 struct SignUpScreen: View {
     @Environment(SystemManager.self) private var system
-    @Environment(AuthModel.self) private var authModel
     @Environment(NavigationModel.self) private var navigationModel
 
     @State private var email = ""
@@ -66,7 +65,6 @@ struct SignUpScreen: View {
                 redirectTo: Constants.redirectToURL
             )
             actionState = .result(.success(()))
-            authModel.isAuthenticated = true
             navigationModel.path = NavigationPath()
         } catch {
             withAnimation {

Demo/PowerSyncExample/_Secrets.swift

@@ -1,10 +1,34 @@
 import Foundation
 
-// Enter your Supabase and PowerSync project details.
-enum Secrets {
-    static let powerSyncEndpoint = "https://your-id.powersync.journeyapps.com"
-    static let supabaseURL = URL(string: "https://your-id.supabase.co")!
-    static let supabaseAnonKey = "anon-key"
-    // Optional storage bucket name. Set to nil if you don't want to use storage.
-    static let supabaseStorageBucket: String? = nil
-}
+/// A protocol which specified the base structure for secrets
+protocol SecretsProvider {
+    static var powerSyncEndpoint: String { get }
+    static var supabaseURL: URL { get }
+    static var supabaseAnonKey: String { get }
+    static var supabaseStorageBucket: String? { get }
+}
+
+/// A default implementation of [SecretsProvider].
+/// This implementation ensures the app will compile even if no actual secrets are provided.
+/// Devs should specify the actual secrets in a Git ignored file.
+extension SecretsProvider {
+    static var powerSyncEndpoint: String {
+        return "TODO"
+    }
+
+    static var supabaseURL: URL {
+        return  URL(string: "TODO")!
+    }
+
+    static var supabaseAnonKey: String {
+        return "TODO"
+    }
+
+    static var supabaseStorageBucket: String? {
+        return nil
+    }
+}
+
+
+// Default conforming type
+enum Secrets: SecretsProvider {}

Demo/README.md

@@ -16,7 +16,11 @@ Follow this guide to:
 
 1. Open this directory in XCode.
 
-2. Open the “_Secrets” file and insert the credentials of your Supabase and PowerSync projects (more info can be found [here](https://docs.powersync.com/integration-guides/supabase-+-powersync#test-everything-using-our-demo-app)).
+2. Copy the `Secrets.template` file to a new Swift file and insert the credentials of your Supabase and PowerSync projects (more info can be found [here](https://docs.powersync.com/integration-guides/supabase-+-powersync#test-everything-using-our-demo-app)).
+
+```bash
+cp Secrets.template Secrets.swift
+```
 
 3. You will need to enable `CasePathMacros` for SwiftUI Navigation. You can do this in settings, or just build the app and a dialog will be shown to enable `CasePathMacros`.
 
@@ -36,7 +40,6 @@ rm -rf ~/Library/org.swift.swiftpm
 - Reset Packages: File -> Packages -> Reset Package Caches
 - Clean Build: Product -> Clean Build Folder.
 
-
 ## Run project
 
 Build the project, launch the app and sign in or register a new user.