Login persistence

This commit is contained in:
Kabir Oberai
2024-11-22 02:47:02 -08:00
Unverified
parent 5316905e5f
commit 6e561d0d94
3 changed files with 29 additions and 16 deletions
@@ -57,4 +57,16 @@ extension AuthToken {
return "@\(data.base64EncodedString())"
}
static func saved() throws -> Self {
guard let string = try SupersignCLI.config.storage.string(forKey: "SUPAuthToken"),
let token = AuthToken(string: string) else {
throw Console.Error("Please log in with `supersign ds login` before running this command.")
}
return token
}
func save() throws {
try SupersignCLI.config.storage.setString(string, forKey: "SUPAuthToken")
}
}
+14 -4
View File
@@ -65,6 +65,10 @@ struct DSLoginCommand: AsyncParsableCommand {
@Flag(name: [.short, .long]) var resetProvisioning = false
@Option(name: [.short, .long], help: "Apple ID") var username: String?
@Option(name: [.short, .long]) var password: String?
@Flag(
name: [.long],
help: "Print the auth token to standard output instead of persisting it."
) var printToken = false
func run() async throws {
let fullToken = try await AuthToken.retrieve(
@@ -73,10 +77,15 @@ struct DSLoginCommand: AsyncParsableCommand {
password: self.password,
resetProvisioning: resetProvisioning
)
guard let string = fullToken.string else {
throw Console.Error("Could not encode token.")
if printToken {
guard let string = fullToken.string else {
throw Console.Error("Could not encode token.")
}
print(string)
} else {
try fullToken.save()
print("Logged in!")
}
print(string)
}
}
@@ -89,13 +98,14 @@ struct DSTeamsListCommand: AsyncParsableCommand {
@Option(name: .shortAndLong) var account: String?
func run() async throws {
let token = try account.flatMap(AuthToken.init(string:)) ?? AuthToken.saved()
let deviceInfo = try DeviceInfo.fetch()
// let anisetteProvider = SupersetteDataProvider(deviceInfo: deviceInfo)
let anisetteProvider = try ADIDataProvider.omnisetteProvider(
deviceInfo: deviceInfo, storage: SupersignCLI.config.storage
)
let token = try await AuthToken.retrieve(deviceInfo: deviceInfo, account: account)
let client = DeveloperServicesClient(
loginToken: token.dsToken,
deviceInfo: deviceInfo,
@@ -21,19 +21,10 @@ struct InstallCommand: ParsableCommand {
) var path: String
func run() throws {
let username: String
let credentials: IntegratedInstaller.Credentials
let token = try account.flatMap(AuthToken.init(string:)) ?? AuthToken.saved()
if let account = account, let auth = AuthToken(string: account) {
username = auth.appleID
credentials = .token(auth.dsToken)
} else {
guard let appleID = account ?? Console.prompt("Apple ID: "),
let password = Console.getPassword("Password: ")
else { return }
username = appleID
credentials = .password(password)
}
let username = token.appleID
let credentials: IntegratedInstaller.Credentials = .token(token.dsToken)
print("Installing to device: \(client.deviceName) (udid: \(client.udid))")