Merge pull request #4 from darrarski/feature/auth-handle-redirect-status

Return status from redirect hander

Author: darrarski

Example/DropboxClientExampleApp/Dependencies.swift

@@ -50,7 +50,7 @@ extension DropboxClient.Client: DependencyKey {
         isSignedIn: { await isSignedIn.value },
         isSignedInStream: { isSignedIn.eraseToStream() },
         signIn: { await isSignedIn.setValue(true) },
-        handleRedirect: { _ in },
+        handleRedirect: { _ in false },
         signOut: { await isSignedIn.setValue(false) }
       ),
       listFolder: .init { _ in

Example/DropboxClientExampleApp/ExampleView.swift

@@ -25,7 +25,7 @@ struct ExampleView: 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)",

Sources/DropboxClient/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 SignOut = @Sendable () async -> Void
 
   public enum Error: Swift.Error, Sendable, Equatable {
@@ -109,8 +109,8 @@ extension Auth {
         await openURL(url)
       },
       handleRedirect: { url in
-        guard let codeVerifier = await codeVerifier.value else { return }
-        guard url.absoluteString.starts(with: config.redirectURI) else { return }
+        guard let codeVerifier = await codeVerifier.value else { return false }
+        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
@@ -177,6 +177,8 @@ extension Auth {
         )
 
         await saveCredentials(credentials)
+
+        return true
       },
       signOut: {
         await saveCredentials(nil)

Tests/DropboxClientTests/AuthTests.swift

@@ -55,7 +55,9 @@ final class AuthTests: XCTestCase {
       pkceUtils: .unimplemented()
     )
 
-    try await auth.handleRedirect(URL(string: Config.test.redirectURI)!)
+    let didHandle = try await auth.handleRedirect(URL(string: Config.test.redirectURI)!)
+
+    XCTAssertFalse(didHandle)
   }
 
   func testIgnoreUnrelatedRedirects() async throws {
@@ -73,7 +75,9 @@ final class AuthTests: XCTestCase {
 
     await auth.signIn()
 
-    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 {
@@ -93,7 +97,7 @@ final class AuthTests: XCTestCase {
     await auth.signIn()
 
     do {
-      try await auth.handleRedirect(url)
+      _ = try await auth.handleRedirect(url)
       XCTFail("Expected to throw, but didn't")
     } catch {
       XCTAssertEqual(
@@ -120,7 +124,7 @@ final class AuthTests: XCTestCase {
     await auth.signIn()
 
     do {
-      try await auth.handleRedirect(url)
+      _ = try await auth.handleRedirect(url)
       XCTFail("Expected to throw, but didn't")
     } catch {
       XCTAssertEqual(
@@ -175,7 +179,7 @@ final class AuthTests: XCTestCase {
     )
 
     await auth.signIn()
-    try await auth.handleRedirect(url)
+    let didHandle = try await auth.handleRedirect(url)
 
     await httpRequests.withValue {
       let url = URL(string: "https://api.dropboxapi.com/oauth2/token")!
@@ -208,6 +212,7 @@ final class AuthTests: XCTestCase {
     }
     let isSignedIn = await auth.isSignedIn()
     XCTAssertTrue(isSignedIn)
+    XCTAssertTrue(didHandle)
   }
 
   func testHandleRedirectErrorResponse() async {
@@ -238,7 +243,7 @@ final class AuthTests: XCTestCase {
     await auth.signIn()
 
     do {
-      try await auth.handleRedirect(url)
+      _ = try await auth.handleRedirect(url)
       XCTFail("Expected to throw, but didn't")
     } catch {
       XCTAssertEqual(