docs: add Google Sign in Example (#212)

grdsdev · web-flow · commit b80898c4d227 · 2023-12-22T20:23:50.000Z
* docs: add Google Sign in Example

* Revert AuthClient to Actor
diff --git a/Examples/Examples.xcodeproj/project.pbxproj b/Examples/Examples.xcodeproj/project.pbxproj
@@ -19,6 +19,7 @@
 		793E03092B2CED5D00AC7DED /* Contants.swift in Sources */ = {isa = PBXBuildFile; fileRef = 793E03082B2CED5D00AC7DED /* Contants.swift */; };
 		793E030B2B2CEDDA00AC7DED /* ActionState.swift in Sources */ = {isa = PBXBuildFile; fileRef = 793E030A2B2CEDDA00AC7DED /* ActionState.swift */; };
 		793E030D2B2DAB5700AC7DED /* SignInWithApple.swift in Sources */ = {isa = PBXBuildFile; fileRef = 793E030C2B2DAB5700AC7DED /* SignInWithApple.swift */; };
+		7940E3152B36187A0089BEE1 /* GoogleSignIn.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7940E3142B36187A0089BEE1 /* GoogleSignIn.swift */; };
 		794EF1222955F26A008C9526 /* AddTodoListView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 794EF1212955F26A008C9526 /* AddTodoListView.swift */; };
 		794EF1242955F3DE008C9526 /* TodoListRow.swift in Sources */ = {isa = PBXBuildFile; fileRef = 794EF1232955F3DE008C9526 /* TodoListRow.swift */; };
 		7956405E2954ADE00088A06F /* Secrets.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7956405D2954ADE00088A06F /* Secrets.swift */; };
@@ -65,6 +66,7 @@
 		793E03082B2CED5D00AC7DED /* Contants.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Contants.swift; sourceTree = "<group>"; };
 		793E030A2B2CEDDA00AC7DED /* ActionState.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ActionState.swift; sourceTree = "<group>"; };
 		793E030C2B2DAB5700AC7DED /* SignInWithApple.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SignInWithApple.swift; sourceTree = "<group>"; };
+		7940E3142B36187A0089BEE1 /* GoogleSignIn.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GoogleSignIn.swift; sourceTree = "<group>"; };
 		794EF1212955F26A008C9526 /* AddTodoListView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AddTodoListView.swift; sourceTree = "<group>"; };
 		794EF1232955F3DE008C9526 /* TodoListRow.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TodoListRow.swift; sourceTree = "<group>"; };
 		7956405D2954ADE00088A06F /* Secrets.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Secrets.swift; sourceTree = "<group>"; };
@@ -214,6 +216,7 @@
 				79AF047E2B2CE207008761AD /* AuthWithEmailAndPassword.swift */,
 				79AF04832B2CE408008761AD /* AuthWithMagicLink.swift */,
 				793E030C2B2DAB5700AC7DED /* SignInWithApple.swift */,
+				7940E3142B36187A0089BEE1 /* GoogleSignIn.swift */,
 			);
 			path = Auth;
 			sourceTree = "<group>";
@@ -416,6 +419,7 @@
 				795640602954AE140088A06F /* AuthController.swift in Sources */,
 				79AF047F2B2CE207008761AD /* AuthWithEmailAndPassword.swift in Sources */,
 				795640622955AD2B0088A06F /* HomeView.swift in Sources */,
+				7940E3152B36187A0089BEE1 /* GoogleSignIn.swift in Sources */,
 				793895CA2954ABFF0044F2B8 /* ExamplesApp.swift in Sources */,
 				793E030D2B2DAB5700AC7DED /* SignInWithApple.swift in Sources */,
 				793E030B2B2CEDDA00AC7DED /* ActionState.swift in Sources */,
diff --git a/Examples/Examples/Auth/AuthView.swift b/Examples/Examples/Auth/AuthView.swift
@@ -12,12 +12,14 @@ struct AuthView: View {
     case emailAndPassword
     case magicLink
     case signInWithApple
+    case googleSignIn
 
     var title: String {
       switch self {
       case .emailAndPassword: "Auth with Email & Password"
       case .magicLink: "Auth with Magic Link"
       case .signInWithApple: "Sign in with Apple"
+      case .googleSignIn: "Google Sign in"
       }
     }
   }
@@ -42,6 +44,7 @@ extension AuthView.Option: View {
     case .emailAndPassword: AuthWithEmailAndPassword()
     case .magicLink: AuthWithMagicLink()
     case .signInWithApple: SignInWithApple()
+    case .googleSignIn: GoogleSignIn()
     }
   }
 }
diff --git a/Examples/Examples/Auth/GoogleSignIn.swift b/Examples/Examples/Auth/GoogleSignIn.swift
@@ -0,0 +1,40 @@
+//
+//  GoogleSignIn.swift
+//  Examples
+//
+//  Created by Guilherme Souza on 22/12/23.
+//
+
+import SwiftUI
+
+struct GoogleSignIn: View {
+  @Environment(\.webAuthenticationSession) var webAuthenticationSession
+
+  var body: some View {
+    Button("Sign in with Google") {
+      Task {
+        await signInWithGoogleButtonTapped()
+      }
+    }
+  }
+
+  private func signInWithGoogleButtonTapped() async {
+    do {
+      let url = try await supabase.auth.getOAuthSignInURL(
+        provider: .google,
+        redirectTo: Constants.redirectToURL
+      )
+      let urlWithToken = try await webAuthenticationSession.authenticate(
+        using: url,
+        callbackURLScheme: Constants.redirectToURL.scheme!
+      )
+      try await supabase.auth.session(from: urlWithToken)
+    } catch {
+      print("failed to sign in with Google: \(error)")
+    }
+  }
+}
+
+#Preview {
+  GoogleSignIn()
+}
diff --git a/Sources/PostgREST/PostgrestQueryBuilder.swift b/Sources/PostgREST/PostgrestQueryBuilder.swift
@@ -69,10 +69,15 @@ public final class PostgrestQueryBuilder: PostgrestBuilder {
       if !prefersHeaders.isEmpty {
         $0.request.headers["Prefer"] = prefersHeaders.joined(separator: ",")
       }
-      if let body = $0.request.body, let jsonObject = try JSONSerialization.jsonObject(with: body) as? [[String: Any]] {
+      if let body = $0.request.body,
+         let jsonObject = try JSONSerialization.jsonObject(with: body) as? [[String: Any]]
+      {
         let allKeys = jsonObject.flatMap(\.keys)
         let uniqueKeys = Set(allKeys).sorted()
-        $0.request.query.append(URLQueryItem(name: "columns", value: uniqueKeys.joined(separator: ",")))
+        $0.request.query.append(URLQueryItem(
+          name: "columns",
+          value: uniqueKeys.joined(separator: ",")
+        ))
       }
     }
 
@@ -115,10 +120,15 @@ public final class PostgrestQueryBuilder: PostgrestBuilder {
         $0.request.headers["Prefer"] = prefersHeaders.joined(separator: ",")
       }
 
-      if let body = $0.request.body, let jsonObject = try JSONSerialization.jsonObject(with: body) as? [[String: Any]] {
+      if let body = $0.request.body,
+         let jsonObject = try JSONSerialization.jsonObject(with: body) as? [[String: Any]]
+      {
         let allKeys = jsonObject.flatMap(\.keys)
         let uniqueKeys = Set(allKeys).sorted()
-        $0.request.query.append(URLQueryItem(name: "columns", value: uniqueKeys.joined(separator: ",")))
+        $0.request.query.append(URLQueryItem(
+          name: "columns",
+          value: uniqueKeys.joined(separator: ",")
+        ))
       }
     }
     return PostgrestFilterBuilder(self)
diff --git a/Tests/PostgRESTTests/BuildURLRequestTests.swift b/Tests/PostgRESTTests/BuildURLRequestTests.swift
@@ -63,7 +63,7 @@ final class BuildURLRequestTests: XCTestCase {
             as: .curl,
             named: runningTestCase.name,
             record: runningTestCase.record,
-            file: runningTestCase.file, 
+            file: runningTestCase.file,
             testName: "testBuildRequest()",
             line: runningTestCase.line
           )

Original file line number	Diff line number	Diff line change
`@@ -12,12 +12,14 @@ struct AuthView: View {`
`12`	`12`	`case emailAndPassword`
`13`	`13`	`case magicLink`
`14`	`14`	`case signInWithApple`
	`15`	`+ case googleSignIn`
`15`	`16`
`16`	`17`	`var title: String {`
`17`	`18`	`switch self {`
`18`	`19`	`case .emailAndPassword: "Auth with Email & Password"`
`19`	`20`	`case .magicLink: "Auth with Magic Link"`
`20`	`21`	`case .signInWithApple: "Sign in with Apple"`
	`22`	`+ case .googleSignIn: "Google Sign in"`
`21`	`23`	`}`
`22`	`24`	`}`
`23`	`25`	`}`
`@@ -42,6 +44,7 @@ extension AuthView.Option: View {`
`42`	`44`	`case .emailAndPassword: AuthWithEmailAndPassword()`
`43`	`45`	`case .magicLink: AuthWithMagicLink()`
`44`	`46`	`case .signInWithApple: SignInWithApple()`
	`47`	`+ case .googleSignIn: GoogleSignIn()`
`45`	`48`	`}`
`46`	`49`	`}`
`47`	`50`	`}`
Original file line number	Diff line number	Diff line change
`@@ -69,10 +69,15 @@ public final class PostgrestQueryBuilder: PostgrestBuilder {`
`69`	`69`	`if !prefersHeaders.isEmpty {`
`70`	`70`	`$0.request.headers["Prefer"] = prefersHeaders.joined(separator: ",")`
`71`	`71`	`}`
`72`		`- if let body = $0.request.body, let jsonObject = try JSONSerialization.jsonObject(with: body) as? [[String: Any]] {`
	`72`	`+ if let body = $0.request.body,`
	`73`	`+ let jsonObject = try JSONSerialization.jsonObject(with: body) as? [[String: Any]]`
	`74`	`+ {`
`73`	`75`	`let allKeys = jsonObject.flatMap(\.keys)`
`74`	`76`	`let uniqueKeys = Set(allKeys).sorted()`
`75`		`- $0.request.query.append(URLQueryItem(name: "columns", value: uniqueKeys.joined(separator: ",")))`
	`77`	`+ $0.request.query.append(URLQueryItem(`
	`78`	`+ name: "columns",`
	`79`	`+ value: uniqueKeys.joined(separator: ",")`
	`80`	`+ ))`
`76`	`81`	`}`
`77`	`82`	`}`
`78`	`83`
`@@ -115,10 +120,15 @@ public final class PostgrestQueryBuilder: PostgrestBuilder {`
`115`	`120`	`$0.request.headers["Prefer"] = prefersHeaders.joined(separator: ",")`
`116`	`121`	`}`
`117`	`122`
`118`		`- if let body = $0.request.body, let jsonObject = try JSONSerialization.jsonObject(with: body) as? [[String: Any]] {`
	`123`	`+ if let body = $0.request.body,`
	`124`	`+ let jsonObject = try JSONSerialization.jsonObject(with: body) as? [[String: Any]]`
	`125`	`+ {`
`119`	`126`	`let allKeys = jsonObject.flatMap(\.keys)`
`120`	`127`	`let uniqueKeys = Set(allKeys).sorted()`
`121`		`- $0.request.query.append(URLQueryItem(name: "columns", value: uniqueKeys.joined(separator: ",")))`
	`128`	`+ $0.request.query.append(URLQueryItem(`
	`129`	`+ name: "columns",`
	`130`	`+ value: uniqueKeys.joined(separator: ",")`
	`131`	`+ ))`
`122`	`132`	`}`
`123`	`133`	`}`
`124`	`134`	`return PostgrestFilterBuilder(self)`
Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,7 @@ final class BuildURLRequestTests: XCTestCase {`
`63`	`63`	`as: .curl,`
`64`	`64`	`named: runningTestCase.name,`
`65`	`65`	`record: runningTestCase.record,`
`66`		`- file: runningTestCase.file,`
	`66`	`+ file: runningTestCase.file,`
`67`	`67`	`testName: "testBuildRequest()",`
`68`	`68`	`line: runningTestCase.line`
`69`	`69`	`)`