diff --git a/Sources/Supersign/DeveloperServices/DeveloperServicesLoginManager.swift b/Sources/Supersign/DeveloperServices/DeveloperServicesLoginManager.swift index e9df8d76..68f3ac22 100644 --- a/Sources/Supersign/DeveloperServices/DeveloperServicesLoginManager.swift +++ b/Sources/Supersign/DeveloperServices/DeveloperServicesLoginManager.swift @@ -68,6 +68,7 @@ public struct DeveloperServicesLoginManager: Sendable { password: password, twoFactorDelegate: twoFactorDelegate ).authenticate() + _ = twoFactorDelegate return try await self.logIn(withLoginData: loginData) } diff --git a/Sources/Supersign/module.modulemap b/Sources/Supersign/module.modulemap deleted file mode 100644 index 754e3cd0..00000000 --- a/Sources/Supersign/module.modulemap +++ /dev/null @@ -1,6 +0,0 @@ -framework module Supersign { - umbrella header "Supersign.h" - - export * - module * { export * } -} diff --git a/Sources/SupersignCLISupport/DSCommand.swift b/Sources/SupersignCLISupport/DSCommand.swift index 4811d89c..df3c281a 100644 --- a/Sources/SupersignCLISupport/DSCommand.swift +++ b/Sources/SupersignCLISupport/DSCommand.swift @@ -11,50 +11,6 @@ extension DeviceInfo { } } -private extension AuthToken { - static func retrieve( - deviceInfo: DeviceInfo, - username: String?, - password: String?, - resetProvisioning: Bool = false - ) async throws -> Self { - guard let username = username ?? Console.prompt("Apple ID: "), !username.isEmpty else { - throw Console.Error("A non-empty Apple ID is required.") - } - guard let password = password ?? Console.getPassword("Password: "), !password.isEmpty else { - throw Console.Error("A non-empty password is required.") - } - - let provider = try ADIDataProvider.adiProvider( - deviceInfo: deviceInfo, - storage: SupersignCLI.config.storage - ) - if resetProvisioning { - provider.resetProvisioning() - } - let authDelegate = SupersignCLIAuthDelegate() - let manager = try DeveloperServicesLoginManager( - deviceInfo: deviceInfo, - anisetteProvider: provider - ) - let token = try await manager.logIn( - withUsername: username, - password: password, - twoFactorDelegate: authDelegate - ) - _ = authDelegate - return AuthToken(appleID: username, dsToken: token) - } - - static func retrieve(deviceInfo: DeviceInfo, account: String?) async throws -> Self { - if let account = account, let token = Self(string: account) { - return token - } else { - return try await retrieve(deviceInfo: deviceInfo, username: account, password: nil) - } - } -} - struct DSLoginCommand: AsyncParsableCommand { static let configuration = CommandConfiguration( commandName: "login", @@ -70,12 +26,34 @@ struct DSLoginCommand: AsyncParsableCommand { ) var printToken = false func run() async throws { - let fullToken = try await AuthToken.retrieve( - deviceInfo: .fetch(), - username: self.username, - password: self.password, - resetProvisioning: resetProvisioning + guard let username = username ?? Console.prompt("Apple ID: "), !username.isEmpty else { + throw Console.Error("A non-empty Apple ID is required.") + } + guard let password = password ?? Console.getPassword("Password: "), !password.isEmpty else { + throw Console.Error("A non-empty password is required.") + } + + let deviceInfo = try DeviceInfo.fetch() + + let provider = try ADIDataProvider.adiProvider( + deviceInfo: deviceInfo, + storage: SupersignCLI.config.storage ) + if resetProvisioning { + provider.resetProvisioning() + } + let authDelegate = SupersignCLIAuthDelegate() + let manager = try DeveloperServicesLoginManager( + deviceInfo: deviceInfo, + anisetteProvider: provider + ) + let token = try await manager.logIn( + withUsername: username, + password: password, + twoFactorDelegate: authDelegate + ) + let fullToken = AuthToken(appleID: username, dsToken: token) + if printToken { guard let string = fullToken.string else { throw Console.Error("Could not encode token.")