Merge pull request #16 from darrarski/feature/auth-handle-redirect-st…

…atus Return status from redirect hander
darrarski · Jul 7, 2023 · 3aeb7ce · 3aeb7ce
2 parents f3b450d + 360bcec
commit 3aeb7ce
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 9 deletions.
diff --git a/Example/GoogleDriveClientExampleApp/ContentView.swift b/Example/GoogleDriveClientExampleApp/ContentView.swift
@@ -25,7 +25,7 @@ struct ContentView: View {
     .onOpenURL { url in
       Task<Void, Never> {
         do {
-          try await client.auth.handleRedirect(url)
+          _ = try await client.auth.handleRedirect(url)
         } catch {
           log.error("Auth.HandleRedirect failure", metadata: [
             "error": "\(error)",

diff --git a/Example/GoogleDriveClientExampleApp/Dependencies.swift b/Example/GoogleDriveClientExampleApp/Dependencies.swift
@@ -42,7 +42,7 @@ extension GoogleDriveClient.Client: DependencyKey {
         isSignedIn: { await isSignedIn.value },
         isSignedInStream: { isSignedIn.eraseToStream() },
         signIn: { await isSignedIn.setValue(true) },
-        handleRedirect: { _ in },
+        handleRedirect: { _ in false },
         refreshToken: {},
         signOut: { await isSignedIn.setValue(false) }
       ),

diff --git a/Sources/GoogleDriveClient/Auth.swift b/Sources/GoogleDriveClient/Auth.swift
@@ -4,7 +4,7 @@ public struct Auth: Sendable {
   public typealias IsSignedIn = @Sendable () async -> Bool
   public typealias IsSignedInStream = @Sendable () -> AsyncStream<Bool>
   public typealias SignIn = @Sendable () async -> Void
-  public typealias HandleRedirect = @Sendable (URL) async throws -> Void
+  public typealias HandleRedirect = @Sendable (URL) async throws -> Bool
   public typealias RefreshToken = @Sendable () async throws -> Void
   public typealias SignOut = @Sendable () async -> Void
 
@@ -104,7 +104,7 @@ extension Auth {
         await openURL(url)
       },
       handleRedirect: { url in
-        guard url.absoluteString.starts(with: config.redirectURI) else { return }
+        guard url.absoluteString.starts(with: config.redirectURI) else { return false }
 
         let components = URLComponents(url: url, resolvingAgainstBaseURL: false)
         let code = components?.queryItems?.first(where: { $0.name == "code" })?.value
@@ -164,6 +164,8 @@ extension Auth {
         )
 
         await saveCredentials(credentials)
+
+        return true
       },
       refreshToken: {
         guard let credentials = await loadCredentials() else { return }

diff --git a/Tests/GoogleDriveClientTests/AuthTests.swift b/Tests/GoogleDriveClientTests/AuthTests.swift
@@ -46,7 +46,9 @@ final class AuthTests: XCTestCase {
       httpClient: .unimplemented()
     )
 
-    try await auth.handleRedirect(URL(string: "https://darrarski.pl")!)
+    let didHandle = try await auth.handleRedirect(URL(string: "https://darrarski.pl")!)
+
+    XCTAssertFalse(didHandle)
   }
 
   func testHandleRedirectWithError() async throws {
@@ -60,7 +62,7 @@ final class AuthTests: XCTestCase {
     )
 
     do {
-      try await auth.handleRedirect(url)
+      _ = try await auth.handleRedirect(url)
       XCTFail("Expected to throw, but didn't")
     } catch {
       XCTAssertEqual(
@@ -81,7 +83,7 @@ final class AuthTests: XCTestCase {
     )
 
     do {
-      try await auth.handleRedirect(url)
+      _ = try await auth.handleRedirect(url)
       XCTFail("Expected to throw, but didn't")
     } catch {
       XCTAssertEqual(
@@ -128,7 +130,7 @@ final class AuthTests: XCTestCase {
       }
     )
 
-    try await auth.handleRedirect(url)
+    let didHandle = try await auth.handleRedirect(url)
 
     await httpRequests.withValue {
       let url = URL(string: "https://www.googleapis.com/oauth2/v4/token")!
@@ -157,6 +159,7 @@ final class AuthTests: XCTestCase {
     }
     let isSignedIn = await auth.isSignedIn()
     XCTAssertTrue(isSignedIn)
+    XCTAssertTrue(didHandle)
   }
 
   func testHandleRedirectErrorResponse() async {
@@ -181,7 +184,7 @@ final class AuthTests: XCTestCase {
     )
 
     do {
-      try await auth.handleRedirect(url)
+      _ = try await auth.handleRedirect(url)
       XCTFail("Expected to throw, but didn't")
     } catch {
       XCTAssertEqual(