Merge pull request #4 from rivenshell/development

v0.3 update

Author: rivenshell

outvoice.xcodeproj/project.pbxproj

@@ -7,11 +7,7 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
-		BE3E1CD92D92D747004BB4C6 /* Auth in Frameworks */ = {isa = PBXBuildFile; productRef = BE3E1CD82D92D747004BB4C6 /* Auth */; };
-		BE3E1CDB2D92D747004BB4C6 /* PostgREST in Frameworks */ = {isa = PBXBuildFile; productRef = BE3E1CDA2D92D747004BB4C6 /* PostgREST */; };
-		BE3E1CDD2D92D747004BB4C6 /* Realtime in Frameworks */ = {isa = PBXBuildFile; productRef = BE3E1CDC2D92D747004BB4C6 /* Realtime */; };
-		BE3E1CDF2D92D747004BB4C6 /* Storage in Frameworks */ = {isa = PBXBuildFile; productRef = BE3E1CDE2D92D747004BB4C6 /* Storage */; };
-		BE3E1CE12D92D747004BB4C6 /* Supabase in Frameworks */ = {isa = PBXBuildFile; productRef = BE3E1CE02D92D747004BB4C6 /* Supabase */; };
+		BE6A04DF2DB128AA0054C6F9 /* Supabase in Frameworks */ = {isa = PBXBuildFile; productRef = BE6A04DE2DB128AA0054C6F9 /* Supabase */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
@@ -73,11 +69,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				BE3E1CE12D92D747004BB4C6 /* Supabase in Frameworks */,
-				BE3E1CDF2D92D747004BB4C6 /* Storage in Frameworks */,
-				BE3E1CDD2D92D747004BB4C6 /* Realtime in Frameworks */,
-				BE3E1CDB2D92D747004BB4C6 /* PostgREST in Frameworks */,
-				BE3E1CD92D92D747004BB4C6 /* Auth in Frameworks */,
+				BE6A04DF2DB128AA0054C6F9 /* Supabase in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -138,11 +130,7 @@
 			);
 			name = outvoice;
 			packageProductDependencies = (
-				BE3E1CD82D92D747004BB4C6 /* Auth */,
-				BE3E1CDA2D92D747004BB4C6 /* PostgREST */,
-				BE3E1CDC2D92D747004BB4C6 /* Realtime */,
-				BE3E1CDE2D92D747004BB4C6 /* Storage */,
-				BE3E1CE02D92D747004BB4C6 /* Supabase */,
+				BE6A04DE2DB128AA0054C6F9 /* Supabase */,
 			);
 			productName = outvoice;
 			productReference = BE0B66662D616C37009B709F /* outvoice.app */;
@@ -227,7 +215,7 @@
 			mainGroup = BE0B665D2D616C37009B709F;
 			minimizedProjectReferenceProxies = 1;
 			packageReferences = (
-				BE3E1CD72D92D747004BB4C6 /* XCRemoteSwiftPackageReference "supabase-swift" */,
+				BE6A04DD2DB128AA0054C6F9 /* XCRemoteSwiftPackageReference "supabase-swift" */,
 			);
 			preferredProjectObjectVersion = 77;
 			productRefGroup = BE0B66672D616C37009B709F /* Products */;
@@ -438,8 +426,10 @@
 				INFOPLIST_KEY_UIApplicationSceneManifest_Generation = YES;
 				INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES;
 				INFOPLIST_KEY_UILaunchScreen_Generation = YES;
+				INFOPLIST_KEY_UILaunchStoryboardName = "Launch Screen";
 				INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight";
 				INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight";
+				INFOPLIST_KEY_UIUserInterfaceStyle = Light;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -469,8 +459,10 @@
 				INFOPLIST_KEY_UIApplicationSceneManifest_Generation = YES;
 				INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES;
 				INFOPLIST_KEY_UILaunchScreen_Generation = YES;
+				INFOPLIST_KEY_UILaunchStoryboardName = "Launch Screen";
 				INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight";
 				INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight";
+				INFOPLIST_KEY_UIUserInterfaceStyle = Light;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -598,7 +590,7 @@
 /* End XCConfigurationList section */
 
 /* Begin XCRemoteSwiftPackageReference section */
-		BE3E1CD72D92D747004BB4C6 /* XCRemoteSwiftPackageReference "supabase-swift" */ = {
+		BE6A04DD2DB128AA0054C6F9 /* XCRemoteSwiftPackageReference "supabase-swift" */ = {
 			isa = XCRemoteSwiftPackageReference;
 			repositoryURL = "https://github.com/supabase/supabase-swift.git";
 			requirement = {
@@ -609,29 +601,9 @@
 /* End XCRemoteSwiftPackageReference section */
 
 /* Begin XCSwiftPackageProductDependency section */
-		BE3E1CD82D92D747004BB4C6 /* Auth */ = {
+		BE6A04DE2DB128AA0054C6F9 /* Supabase */ = {
 			isa = XCSwiftPackageProductDependency;
-			package = BE3E1CD72D92D747004BB4C6 /* XCRemoteSwiftPackageReference "supabase-swift" */;
-			productName = Auth;
-		};
-		BE3E1CDA2D92D747004BB4C6 /* PostgREST */ = {
-			isa = XCSwiftPackageProductDependency;
-			package = BE3E1CD72D92D747004BB4C6 /* XCRemoteSwiftPackageReference "supabase-swift" */;
-			productName = PostgREST;
-		};
-		BE3E1CDC2D92D747004BB4C6 /* Realtime */ = {
-			isa = XCSwiftPackageProductDependency;
-			package = BE3E1CD72D92D747004BB4C6 /* XCRemoteSwiftPackageReference "supabase-swift" */;
-			productName = Realtime;
-		};
-		BE3E1CDE2D92D747004BB4C6 /* Storage */ = {
-			isa = XCSwiftPackageProductDependency;
-			package = BE3E1CD72D92D747004BB4C6 /* XCRemoteSwiftPackageReference "supabase-swift" */;
-			productName = Storage;
-		};
-		BE3E1CE02D92D747004BB4C6 /* Supabase */ = {
-			isa = XCSwiftPackageProductDependency;
-			package = BE3E1CD72D92D747004BB4C6 /* XCRemoteSwiftPackageReference "supabase-swift" */;
+			package = BE6A04DD2DB128AA0054C6F9 /* XCRemoteSwiftPackageReference "supabase-swift" */;
 			productName = Supabase;
 		};
 /* End XCSwiftPackageProductDependency section */

outvoice.xcodeproj/project.xcworkspace/xcuserdata/darth.xcuserdatad/UserInterfaceState.xcuserstate

@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "filename" : "google-icon.svg",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

outvoice/Assets.xcassets/google-icon.imageset/Contents.json

@@ -2,7 +2,21 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
-    <key>UIUserInterfaceStyle</key>
-    <string>Light</string>
+	<key>CFBundleURLTypes</key>
+	<array>
+		<dict>
+			<key>CFBundleTypeRole</key>
+			<string>Editor</string>
+			<key>CFBundleURLIconFile</key>
+			<string></string>
+			<key>CFBundleURLName</key>
+			<string>supabase auth</string>
+			<key>CFBundleURLSchemes</key>
+			<array>
+				<string>com.outvoiceios</string>
+			</array>
+		</dict>
+		<dict/>
+	</array>
 </dict>
 </plist>

outvoice/Assets.xcassets/google-icon.imageset/google-icon.svg

@@ -17,8 +17,9 @@
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                         <subviews>
                             <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" image="logo-svg" translatesAutoresizingMaskIntoConstraints="NO" id="yrd-DC-RFS">
-                                <rect key="frame" x="76" y="190" width="240" height="128"/>
+                                <rect key="frame" x="32" y="191" width="339" height="166"/>
                                 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                <color key="tintColor" white="0.0" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                             </imageView>
                         </subviews>
                         <viewLayoutGuide key="safeArea" id="aNK-SP-zv9"/>
@@ -27,7 +28,7 @@
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="iYj-Kq-Ea1" userLabel="First Responder" sceneMemberID="firstResponder"/>
             </objects>
-            <point key="canvasLocation" x="53" y="375"/>
+            <point key="canvasLocation" x="52.671755725190835" y="374.64788732394368"/>
         </scene>
     </scenes>
     <resources>

outvoice/Info.plist

@@ -6,6 +6,8 @@ protocol AuthServiceProtocol {
     var currentUser: User? { get }
     var isAuthenticated: Bool { get }
     func signIn(email: String, password: String) async throws -> User
+    func signUp(email: String, password: String, firstName: String) async throws -> User
+    func signInWithGoogle() async throws -> User
     func signOut() async throws
     func getCurrentUser() async throws -> User?
 }
@@ -18,21 +20,34 @@ class AuthService: AuthServiceProtocol, ObservableObject {
     private let supabase: SupabaseClient?
 
     init() {
-        // Safe initialization with proper error handling
-        if let supabaseURL = URL(string: "YOUR_SUPABASE_URL"),
-           !supabaseURL.absoluteString.contains("YOUR_SUPABASE_URL") {
-            self.supabase = SupabaseClient(
-                supabaseURL: supabaseURL,
-                supabaseKey: "YOUR_SUPABASE_KEY"
-            )
-            
-            // Only refresh session if we have a valid client
-            Task {
-                try? await refreshSession()
-            }
-        } else {
-            // For previews or development, use nil client
+        // Replace the hard‑coded string with a value from configuration/Info.plist in production.
+        let supabaseKey = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJzdXBhYmFzZSIsInJlZiI6Imp3cXZzc2VodG5ldnhtYWxqZmtoIiwicm9sZSI6ImFub24iLCJpYXQiOjE3NDI5MDcxNjQsImV4cCI6MjA1ODQ4MzE2NH0.KXr7lKsLaWu82S5G39MOXIsqaSt-wcbqyCT8zhKDt2g"
+
+        guard let supabaseURL = URL(string: "https://jwqvssehtnevxmaljfkh.supabase.co") else {
+            // For previews or development, use a nil client
+            print("[AuthService] Invalid Supabase URL – client not initialized.")
             self.supabase = nil
+            return
+        }
+
+        // Provide a default redirect URL so that auth flows (sign‑up, magic links, OAuth, etc.)
+        // always have a valid deep‑link to return to. This must correspond to a URL scheme that
+        // is registered in Info.plist (see the `CFBundleURLSchemes` entry).
+        let clientOptions = SupabaseClientOptions(
+            auth: .init(
+                redirectToURL: URL(string: "com.outvoiceios://login-callback")
+            )
+        )
+
+        self.supabase = SupabaseClient(
+            supabaseURL: supabaseURL,
+            supabaseKey: supabaseKey,
+            options: clientOptions
+        )
+
+        // Kick‑off a background refresh of any existing session.
+        Task {
+            try? await refreshSession()
         }
     }
 
@@ -123,4 +138,82 @@ class AuthService: AuthServiceProtocol, ObservableObject {
         let userData = try decoder.decode(User.self, from: response.data)
         return userData
     }
+    
+    func signUp(email: String, password: String, firstName: String) async throws -> User {
+        // If Supabase client isn't configured (e.g. previews), return a mock user
+        guard let supabase = supabase else {
+            let mockUser = User(
+                id: UUID(),
+                email: email,
+                firstName: firstName,
+                lastName: "",
+                createdAt: Date()
+            )
+            await MainActor.run {
+                self.currentUser = mockUser
+            }
+            return mockUser
+        }
+        
+        // Attempt to sign up the user with Supabase GoTrue
+        // We attach the first name as user metadata so it can be stored in the `profiles` table with the edge function/trigger
+        let metadata: [String: AnyJSON] = [
+            "first_name": .string(firstName)
+        ]
+        let _ = try await supabase.auth.signUp(
+            email: email,
+            password: password,
+            data: metadata
+        )
+        
+        // After sign‑up, Supabase automatically authenticates the session. Fetch the user profile just like sign‑in.
+        guard let session = try? await supabase.auth.session else {
+            throw NSError(domain: "AuthService", code: 2, userInfo: [NSLocalizedDescriptionKey: "Unable to retrieve session after sign‑up."])
+        }
+        
+        let user = try await fetchUserProfile(userId: session.user.id)
+        await MainActor.run {
+            self.currentUser = user
+        }
+        return user
+    }
+    
+    func signInWithGoogle() async throws -> User {
+        guard let supabase = supabase else {
+            // Return a mock Google user in preview
+            let mockUser = User(
+                id: UUID(),
+                email: "google_user@example.com",
+                firstName: "Google",
+                lastName: "User",
+                createdAt: Date()
+            )
+            await MainActor.run {
+                self.currentUser = mockUser
+            }
+            return mockUser
+        }
+        
+        // Launch the OAuth sign‑in flow. The Supabase Swift SDK will handle the deep‑link back into the app automatically.
+        let _ = try await supabase.auth.signInWithOAuth(provider: .google)
+        
+        // After the OAuth flow completes, attempt to get the current session/user.
+        guard let session = try? await supabase.auth.session else {
+            throw NSError(domain: "AuthService", code: 3, userInfo: [NSLocalizedDescriptionKey: "Google sign‑in did not return a session."])
+        }
+        
+        let user = try await fetchUserProfile(userId: session.user.id)
+        await MainActor.run {
+            self.currentUser = user
+        }
+        return user
+    }
+    
+    // MARK: - Deep‑link handling
+    /// Call this from the App's `onOpenURL` modifier so that Supabase can
+    /// exchange the OAuth redirect code for a session.
+    func handleDeepLink(_ url: URL) {
+        guard let supabase = supabase else { return }
+        Task { try? await supabase.auth.session(from: url) }
+    }
 }