From 34bce7acd7509df9c39e7fade6c75b3efee8b6cf Mon Sep 17 00:00:00 2001 From: Kabir Oberai Date: Sat, 16 Nov 2024 03:41:36 -0500 Subject: [PATCH] Support static GSA endpoints --- .../Supersign/GrandSlam/Anisette/ADIDataProvider.swift | 4 ++-- .../Supersign/GrandSlam/Lookup/GrandSlamEndpoints.swift | 5 ++++- .../GrandSlam/Lookup/GrandSlamLookupManager.swift | 9 +++++++-- .../Concrete/GrandSlamTrustedDeviceRequest.swift | 4 ++-- .../Requests/Concrete/GrandSlamValidateRequest.swift | 2 +- .../GrandSlam/Requests/GrandSlamOperationRequest.swift | 2 +- 6 files changed, 17 insertions(+), 9 deletions(-) diff --git a/Supersign/Sources/Supersign/GrandSlam/Anisette/ADIDataProvider.swift b/Supersign/Sources/Supersign/GrandSlam/Anisette/ADIDataProvider.swift index 21da3312..51776828 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 6021ddfb..3dd2fec6 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 +enum GrandSlamEndpoint { + case lookup(KeyPath) + case url(URL) +} diff --git a/Supersign/Sources/Supersign/GrandSlam/Lookup/GrandSlamLookupManager.swift b/Supersign/Sources/Supersign/GrandSlam/Lookup/GrandSlamLookupManager.swift index 922b43bc..709e9228 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 36121d61..24fddf7c 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 8009c58d..8c2abc8b 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 1e840abe..11faef48 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"] = "*/*"