fix: ASWebAuthenticationPresentationContextProviding requires @mainactor (#108)

* chore: update dependencies

* chore: fix issue with MainActor presentation context

* chore: make requests numbered

* chore: update tests

---------

Co-authored-by: danthorpe <danthorpe@users.noreply.github.com>

Author: danthorpe

Examples/Examples.xcworkspace/xcshareddata/swiftpm/Package.resolved

@@ -37,8 +37,8 @@ struct SignedOutFeature {
         state = .failed
         return .none
       case .view(.signInButtonTapped):
-        return .run { send in
-          try await spotify.signIn(nil)
+        return .run { @MainActor send in
+          try await spotify.signIn(presentationContext: DefaultPresentationContext())
           await send(.signInResponse(.success(true)))
         } catch: { error, send in
           await send(.signInResponse(.failure(error)))

Examples/Spotify/App/SignedOut/SignedOutFeature.swift

@@ -47,6 +47,7 @@ extension Spotify {
       .logged(using: Logger(subsystem: "works.dan.networking.examples.spotify", category: "Spotify API"))
       .server(prefixPath: "v1")
       .server(authority: "api.spotify.com")
+      .numbered()
       .authenticated(
         oauth: .spotify(
           clientId: "b4937bc99da547b4b90559f5024d8467",

Examples/Spotify/App/SpotifyClient/SpotifyClient.swift

@@ -43,8 +43,8 @@ extension ASWebAuthenticationSession {
   }
 }
 
-final class DefaultPresentationContext: NSObject, ASWebAuthenticationPresentationContextProviding {
-  func presentationAnchor(for session: ASWebAuthenticationSession) -> ASPresentationAnchor {
+@MainActor public final class DefaultPresentationContext: NSObject, ASWebAuthenticationPresentationContextProviding {
+  public func presentationAnchor(for session: ASWebAuthenticationSession) -> ASPresentationAnchor {
     #if os(macOS)
     ASPresentationAnchor()
     #else

Package.resolved

@@ -11,7 +11,7 @@ extension OAuth {
     let upstream: any NetworkingComponent
     var system: any OAuthSystem<Credentials>
 
-    var presentationContext: (any ASWebAuthenticationPresentationContextProviding) = DefaultPresentationContext()
+    var presentationContext: (any ASWebAuthenticationPresentationContextProviding)?
 
     @Dependency(\.webAuthenticationSession) var webAuthenticationSession
 
@@ -46,6 +46,10 @@ extension OAuth.Delegate: AuthenticationDelegate {
       codeChallenge: codeChallenge
     )
 
+    guard let presentationContext else {
+      throw OAuth.Error.presentationContextNotSet
+    }
+
     let callbackURL = try await webAuthenticationSession.start(
       state: state,
       authorizationURL: url,

Sources/OAuth/ASWebAuthenticationSession+.swift

@@ -3,6 +3,7 @@ import Foundation
 extension OAuth {
   public enum Error: Swift.Error, Equatable {
     case oauthNotInstalled
+    case presentationContextNotSet
     case invalidAuthorizationEndpoint(String)
     case invalidTokenEndpoint(String)
 

Sources/OAuth/OAuthDelegate.swift

@@ -43,6 +43,11 @@ final class OAuthDelegateTests: OAuthTestCase {
         .server(authenticationMethod: .stub)
         .authenticated(oauth: stub)
 
+      // Configure Network
+      try await network.stubOAuthSystem {
+        await $0.set(presentationContext: DefaultPresentationContext())
+      }
+
       // Make a request to protected resource
       var request = HTTPRequestData(path: "/protected-resource")
       request.authenticationMethod = .stub

Sources/OAuth/OAuthError.swift

@@ -21,7 +21,7 @@ struct StubOAuthSystem: StandardOAuthSystem {
 
 extension NetworkingComponent {
   func stubOAuthSystem<ReturnValue>(
-    perform: (any OAuthProxy<StubOAuthSystem.Credentials>) async throws -> ReturnValue
+    perform: @MainActor (any OAuthProxy<StubOAuthSystem.Credentials>) async throws -> ReturnValue
   ) async throws -> ReturnValue {
     try await oauth(of: StubOAuthSystem.Credentials.self, perform: perform)
   }