make validateSession public

Author: MattKiazyk

Sources/XcodesLoginKit/AuthenticationState.swift

@@ -6,22 +6,22 @@
 //
 
 
-public enum AuthenticationState: Equatable {
+public enum AuthenticationState: Equatable, Sendable {
     case unauthenticated
     case waitingForSecondFactor(TwoFactorOption, AuthOptionsResponse, AppleSessionData)
     case authenticated(AppleSession)
     case notAppleDeveloper
 }
 
-public enum TwoFactorOption: Equatable {
+public enum TwoFactorOption: Equatable, Sendable {
     case smsSent(AuthOptionsResponse.TrustedPhoneNumber)
     case codeSent
     case smsPendingChoice
     case securityKey
 }
 
 @preconcurrency
-public struct AuthOptionsResponse: Equatable, Decodable {
+public struct AuthOptionsResponse: Equatable, Decodable, Sendable {
     public let trustedPhoneNumbers: [TrustedPhoneNumber]?
     public let trustedDevices: [TrustedDevice]?
     public let securityCode: SecurityCodeInfo?
@@ -69,7 +69,7 @@ public struct AuthOptionsResponse: Equatable, Decodable {
         trustedPhoneNumbers?.count == 1 && canFallBackToSMS
     }
 
-    public struct TrustedPhoneNumber: Equatable, Decodable, Identifiable {
+    public struct TrustedPhoneNumber: Equatable, Decodable, Identifiable, Sendable {
         public let id: Int
         public let numberWithDialCode: String
 
@@ -79,7 +79,7 @@ public struct AuthOptionsResponse: Equatable, Decodable {
         }
     }
 
-    public struct TrustedDevice: Equatable, Decodable {
+    public struct TrustedDevice: Equatable, Decodable, Sendable  {
         public let id: String
         public let name: String
         public let modelName: String
@@ -91,7 +91,7 @@ public struct AuthOptionsResponse: Equatable, Decodable {
         }
     }
 
-    public struct SecurityCodeInfo: Equatable, Decodable {
+    public struct SecurityCodeInfo: Equatable, Decodable, Sendable  {
         public let length: Int
         public let tooManyCodesSent: Bool
         public let tooManyCodesValidated: Bool
@@ -118,7 +118,7 @@ public struct AuthOptionsResponse: Equatable, Decodable {
     }
 }
 
-public struct AppleSessionData: Equatable, Identifiable {
+public struct AppleSessionData: Equatable, Identifiable, Sendable {
     public let serviceKey: String
     public let sessionID: String
     public let scnt: String
@@ -132,12 +132,12 @@ public struct AppleSessionData: Equatable, Identifiable {
     }
 }
 
-public struct ServiceError: Decodable, Equatable {
+public struct ServiceError: Decodable, Equatable, Sendable  {
     let code: String
     let message: String
 }
 
-public struct FSAChallenge: Equatable, Decodable {
+public struct FSAChallenge: Equatable, Decodable, Sendable {
     public let challenge: String
     public let keyHandles: [String]
     public let allowedCredentials: String

Sources/XcodesLoginKit/Client.swift

@@ -84,8 +84,7 @@ public class Client {
 
         switch httpResponse.statusCode {
         case 200:
-            let authenticationSession: AppleSession = try await networkService.requestObject(URLRequest.olympusSession)
-            return AuthenticationState.authenticated(authenticationSession)
+            return try await self.validateSession()
         case 401:
             throw AuthenticationError.invalidUsernameOrPassword(username: accountName)
         case 403:
@@ -275,10 +274,11 @@ public class Client {
 
     func updateSession(serviceKey: String, sessionID: String, scnt: String) async throws -> AuthenticationState {
         try await networkService.requestVoid(URLRequest.trust(serviceKey: serviceKey, sessionID: sessionID, scnt: scnt))
-        return try await loadSession()
+        return try await validateSession()
     }
 
-    func loadSession() async throws -> AuthenticationState {
+    @MainActor
+    public func validateSession() async throws -> AuthenticationState {
         let authenticationSession: AppleSession = try await networkService.requestObject(URLRequest.olympusSession)
         return AuthenticationState.authenticated(authenticationSession)
     }