Cross-platform Xcode replacement. Build and deploy iOS apps with SwiftPM on Linux, Windows, macOS.
Propagate provisioning data
Kabir Oberai4de79a557e68
diff --git a/Sources/Supersign/GrandSlam/Anisette/ADIDataProvider.swift b/Sources/Supersign/GrandSlam/Anisette/ADIDataProvider.swiftindex 5177682..27d5bdc 100644--- a/Sources/Supersign/GrandSlam/Anisette/ADIDataProvider.swift+++ b/Sources/Supersign/GrandSlam/Anisette/ADIDataProvider.swift@@ -68,6 +68,7 @@ public final class ADIDataProvider: AnisetteDataProvider {rawProvider: RawADIProvider,deviceInfo: DeviceInfo,storage: KeyValueStorage, // ideally secure, eg keychain+ provisioningData: ProvisioningData? = nil,httpFactory: HTTPClientFactory = defaultHTTPClientFactory) throws {self.rawProvider = rawProvider@@ -77,7 +78,11 @@ public final class ADIDataProvider: AnisetteDataProvider {self.httpClient = httpFactory.makeClient()self.lookupManager = .init(deviceInfo: deviceInfo, httpFactory: httpFactory)- if let localUserUIDString = try storage.string(forKey: Self.localUserUIDKey),+ if let provisioningData {+ self.localUserUID = provisioningData.localUserUID+ try? storage.setData(provisioningData.adiPb, forKey: Self.provisioningKey)+ try? storage.setString("\(provisioningData.routingInfo)", forKey: Self.routingInfoKey)+ } else if let localUserUIDString = try storage.string(forKey: Self.localUserUIDKey),let localUserUID = UUID(uuidString: localUserUIDString) {self.localUserUID = localUserUID} else {@@ -217,9 +222,21 @@ public final class ADIDataProvider: AnisetteDataProvider {)}- public func resetProvisioning() throws {- try storage.setData(nil, forKey: Self.provisioningKey)- try storage.setString(nil, forKey: Self.routingInfoKey)+ public func resetProvisioning() {+ try? storage.setData(nil, forKey: Self.provisioningKey)+ try? storage.setString(nil, forKey: Self.routingInfoKey)+ }++ public func provisioningData() -> ProvisioningData? {+ guard let provisioningInfo = try? storage.data(forKey: Self.provisioningKey),+ let routingInfoString = try? storage.string(forKey: Self.routingInfoKey),+ let routingInfo = UInt64(routingInfoString)+ else { return nil }+ return ProvisioningData(+ localUserUID: localUserUID,+ routingInfo: routingInfo,+ adiPb: provisioningInfo+ )}public func fetchAnisetteData() async throws -> AnisetteData {diff --git a/Sources/Supersign/GrandSlam/Anisette/AnisetteDataProvider.swift b/Sources/Supersign/GrandSlam/Anisette/AnisetteDataProvider.swiftindex 95b160f..a807942 100644--- a/Sources/Supersign/GrandSlam/Anisette/AnisetteDataProvider.swift+++ b/Sources/Supersign/GrandSlam/Anisette/AnisetteDataProvider.swift@@ -12,10 +12,19 @@ public protocol AnisetteDataProvider {// This is a suggestion and not a requirement. The default implementation// does nothing.func resetProvisioning() async+ func provisioningData() -> ProvisioningData?func fetchAnisetteData() async throws -> AnisetteData}+public struct ProvisioningData: Hashable, Codable {+ public var localUserUID: UUID+ public var routingInfo: UInt64+ public var adiPb: Data+}+extension AnisetteDataProvider {+ public func provisioningData() -> ProvisioningData? { nil }+ public func setProvisioningData(_ data: ProvisioningData) {}public func resetProvisioning() async {}}diff --git a/Sources/Supersign/GrandSlam/Anisette/OmnisetteADIProvider.swift b/Sources/Supersign/GrandSlam/Anisette/OmnisetteADIProvider.swiftindex b5b5284..cfcd9cf 100644--- a/Sources/Supersign/GrandSlam/Anisette/OmnisetteADIProvider.swift+++ b/Sources/Supersign/GrandSlam/Anisette/OmnisetteADIProvider.swift@@ -7,7 +7,7 @@ struct OmnisetteADIProvider: RawADIProvider {private let url: URLprivate let client: HTTPClientProtocolinit(- url: URL = URL(string: "https://ani.sidestore.io")!, // URL(string: "http://localhost:6969")!,+ url: URL = URL(string: "https://ani3server.fly.dev")!, // URL(string: "http://localhost:6969")!,httpFactory: HTTPClientFactory = defaultHTTPClientFactory) {self.url = url@@ -187,12 +187,14 @@ extension ADIDataProvider {public static func omnisetteProvider(deviceInfo: DeviceInfo,storage: KeyValueStorage,+ provisioningData: ProvisioningData? = nil,httpFactory: HTTPClientFactory = defaultHTTPClientFactory) throws -> ADIDataProvider {return try ADIDataProvider(rawProvider: OmnisetteADIProvider(),deviceInfo: deviceInfo,storage: storage,+ provisioningData: provisioningData,httpFactory: httpFactory)}diff --git a/Sources/Supersign/Integration/SuperchargeInstaller.swift b/Sources/Supersign/Integration/SuperchargeInstaller.swiftindex fc8b4e5..c0d8aeb 100644--- a/Sources/Supersign/Integration/SuperchargeInstaller.swift+++ b/Sources/Supersign/Integration/SuperchargeInstaller.swift@@ -343,6 +343,7 @@ public final class IntegratedInstaller {private func install(deviceInfo: DeviceInfo,+ provisioningData: ProvisioningData?,token: DeveloperServicesLoginToken,client: DeveloperServicesClient,team: DeveloperServicesTeam,@@ -396,6 +397,7 @@ public final class IntegratedInstaller {preferredTeamID: team.id.rawValue,preferredSigningInfo: info,appleID: self.appleID,+ provisioningData: provisioningData,token: token).save(inAppDir: appDir)}@@ -416,6 +418,7 @@ public final class IntegratedInstaller {private func install(deviceInfo: DeviceInfo,+ provisioningData: ProvisioningData?,token: DeveloperServicesLoginToken,anisetteProvider: AnisetteDataProvider,appDir: URL@@ -432,12 +435,12 @@ public final class IntegratedInstaller {case 0:return self.completion(.failure(Error.noTeamFound))case 1:- self.install(deviceInfo: deviceInfo, token: token, client: client, team: teams[0], appDir: appDir)+ self.install(deviceInfo: deviceInfo, provisioningData: provisioningData, token: token, client: client, team: teams[0], appDir: appDir)default:self.delegate?.fetchTeam(fromTeams: teams) { team inself.installQueue.async {guard let team = team else { return self.completion(.failure(Error.userCancelled)) }- self.install(deviceInfo: deviceInfo, token: token, client: client, team: team, appDir: appDir)+ self.install(deviceInfo: deviceInfo, provisioningData: provisioningData, token: token, client: client, team: team, appDir: appDir)}}}@@ -473,6 +476,7 @@ public final class IntegratedInstaller {guard self.updateProgress(to: 1/2) else { return }self.install(deviceInfo: deviceInfo,+ provisioningData: anisetteProvider.provisioningData(),token: token,anisetteProvider: anisetteProvider,appDir: appDir@@ -481,6 +485,7 @@ public final class IntegratedInstaller {case .token(let token):self.install(deviceInfo: deviceInfo,+ provisioningData: anisetteProvider.provisioningData(),token: token,anisetteProvider: anisetteProvider,appDir: appDirdiff --git a/Sources/Supersign/Integration/Superconfig.swift b/Sources/Supersign/Integration/Superconfig.swiftindex 7724a0d..3b57300 100644--- a/Sources/Supersign/Integration/Superconfig.swift+++ b/Sources/Supersign/Integration/Superconfig.swift@@ -17,6 +17,7 @@ public struct Superconfig: Codable {public let preferredTeamID: Stringpublic let preferredSigningInfo: SigningInfo?public let appleID: String+ public let provisioningData: ProvisioningData?public let token: DeveloperServicesLoginTokenpublic init(@@ -26,6 +27,7 @@ public struct Superconfig: Codable {preferredTeamID: String,preferredSigningInfo: SigningInfo?,appleID: String,+ provisioningData: ProvisioningData?,token: DeveloperServicesLoginToken) {self.udid = udid@@ -34,6 +36,7 @@ public struct Superconfig: Codable {self.preferredTeamID = preferredTeamIDself.preferredSigningInfo = preferredSigningInfoself.appleID = appleID+ self.provisioningData = provisioningDataself.token = token}