Skip to content

armgit / xtool

Public Imported from GitHub
0

Cross-platform Xcode replacement. Build and deploy iOS apps with SwiftPM on Linux, Windows, macOS.

Support static GSA endpoints

Kabir Oberai34bce7acd750
diff --git a/Supersign/Sources/Supersign/GrandSlam/Anisette/ADIDataProvider.swift b/Supersign/Sources/Supersign/GrandSlam/Anisette/ADIDataProvider.swift
index 21da331..5177682 100644
--- a/Supersign/Sources/Supersign/GrandSlam/Anisette/ADIDataProvider.swift
+++ b/Supersign/Sources/Supersign/GrandSlam/Anisette/ADIDataProvider.swift
@@ -174,7 +174,7 @@ public final class ADIDataProvider: AnisetteDataProvider {
cpim: Data
) async throws -> (routingInfo: UInt64, provisioningInfo: Data) {
let resp: EndProvisioningResponse = try await sendRequest(
- endpoint: \.midFinishProvisioning,
+ endpoint: .lookup(\.midFinishProvisioning),
request: EndProvisioningRequest(cpim: cpim.base64EncodedString())
)
@@ -192,7 +192,7 @@ public final class ADIDataProvider: AnisetteDataProvider {
private func provision() async throws -> (routingInfo: UInt64, provisioningInfo: Data) {
let resp: StartProvisioningResponse = try await sendRequest(
- endpoint: \.midStartProvisioning,
+ endpoint: .lookup(\.midStartProvisioning),
request: StartProvisioningRequest()
)
guard let spim = Data(base64Encoded: resp.spim) else { throw ADIError.badStartResponse }
diff --git a/Supersign/Sources/Supersign/GrandSlam/Lookup/GrandSlamEndpoints.swift b/Supersign/Sources/Supersign/GrandSlam/Lookup/GrandSlamEndpoints.swift
index 6021ddf..3dd2fec 100644
--- a/Supersign/Sources/Supersign/GrandSlam/Lookup/GrandSlamEndpoints.swift
+++ b/Supersign/Sources/Supersign/GrandSlam/Lookup/GrandSlamEndpoints.swift
@@ -17,4 +17,7 @@ struct GrandSlamEndpoints: Decodable {
let midFinishProvisioning: String
}
-typealias GrandSlamEndpoint = KeyPath<GrandSlamEndpoints, String>
+enum GrandSlamEndpoint {
+ case lookup(KeyPath<GrandSlamEndpoints, String>)
+ case url(URL)
+}
diff --git a/Supersign/Sources/Supersign/GrandSlam/Lookup/GrandSlamLookupManager.swift b/Supersign/Sources/Supersign/GrandSlam/Lookup/GrandSlamLookupManager.swift
index 922b43b..709e922 100644
--- a/Supersign/Sources/Supersign/GrandSlam/Lookup/GrandSlamLookupManager.swift
+++ b/Supersign/Sources/Supersign/GrandSlam/Lookup/GrandSlamLookupManager.swift
@@ -58,8 +58,13 @@ class GrandSlamLookupManager {
}
func fetchURL(forEndpoint endpoint: GrandSlamEndpoint) async throws -> URL {
- let endpoints = try await fetchEndpoints()
- return URL(string: endpoints[keyPath: endpoint])!
+ switch endpoint {
+ case .lookup(let keyPath):
+ let endpoints = try await fetchEndpoints()
+ return URL(string: endpoints[keyPath: keyPath])!
+ case .url(let url):
+ return url
+ }
}
}
diff --git a/Supersign/Sources/Supersign/GrandSlam/Requests/Concrete/GrandSlamTrustedDeviceRequest.swift b/Supersign/Sources/Supersign/GrandSlam/Requests/Concrete/GrandSlamTrustedDeviceRequest.swift
index 36121d6..24fddf7 100644
--- a/Supersign/Sources/Supersign/GrandSlam/Requests/Concrete/GrandSlamTrustedDeviceRequest.swift
+++ b/Supersign/Sources/Supersign/GrandSlam/Requests/Concrete/GrandSlamTrustedDeviceRequest.swift
@@ -13,7 +13,7 @@ struct GrandSlamTrustedDeviceRequest: GrandSlamTwoFactorRequest {
static func decode(data: Data) throws {}
}
- static let endpoint: GrandSlamEndpoint = \.trustedDeviceSecondaryAuth
+ static let endpoint: GrandSlamEndpoint = .lookup(\.trustedDeviceSecondaryAuth)
let loginData: GrandSlamLoginData
}
@@ -25,7 +25,7 @@ struct GrandSlamSecondaryAuthRequest: GrandSlamTwoFactorRequest {
}
}
- static let endpoint: GrandSlamEndpoint = \.secondaryAuth
+ static let endpoint: GrandSlamEndpoint = .lookup(\.secondaryAuth)
let loginData: GrandSlamLoginData
}
diff --git a/Supersign/Sources/Supersign/GrandSlam/Requests/Concrete/GrandSlamValidateRequest.swift b/Supersign/Sources/Supersign/GrandSlam/Requests/Concrete/GrandSlamValidateRequest.swift
index 8009c58..8c2abc8 100644
--- a/Supersign/Sources/Supersign/GrandSlam/Requests/Concrete/GrandSlamValidateRequest.swift
+++ b/Supersign/Sources/Supersign/GrandSlam/Requests/Concrete/GrandSlamValidateRequest.swift
@@ -13,7 +13,7 @@ struct GrandSlamValidateRequest: GrandSlamTwoFactorRequest {
static func decode(data: Data) throws {}
}
- static let endpoint: GrandSlamEndpoint = \.validateCode
+ static let endpoint: GrandSlamEndpoint = .lookup(\.validateCode)
let loginData: GrandSlamLoginData
let verificationCode: String
diff --git a/Supersign/Sources/Supersign/GrandSlam/Requests/GrandSlamOperationRequest.swift b/Supersign/Sources/Supersign/GrandSlam/Requests/GrandSlamOperationRequest.swift
index 1e840ab..11faef4 100644
--- a/Supersign/Sources/Supersign/GrandSlam/Requests/GrandSlamOperationRequest.swift
+++ b/Supersign/Sources/Supersign/GrandSlam/Requests/GrandSlamOperationRequest.swift
@@ -67,7 +67,7 @@ protocol GrandSlamOperationRequest: GrandSlamRequest
extension GrandSlamOperationRequest {
- static var endpoint: GrandSlamEndpoint { \.gsService }
+ static var endpoint: GrandSlamEndpoint { .lookup(\.gsService) }
func configure(request: inout HTTPRequest, deviceInfo: DeviceInfo, anisetteData: AnisetteData) {
request.headers["Accept"] = "*/*"