mirrors/Signal-iOS
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-iOS.git synced 2025-12-05 01:10:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

EVEN LESS REST

Browse Source
This commit is contained in:
Max Radermacher
2025-09-10 18:41:20 -05:00
committed by GitHub
parent 95a5310662
commit 2b763d5f26
2 changed files with 7 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
Signal/Registration/RegistrationCoordinatorImpl+Service.swift
View File

@@ -26,8 +26,7 @@ extension RegistrationCoordinatorImpl {
credentials: candidateCredentials
)
return await makeRequest(
request,
signalService: signalService,
{ try await signalService.urlSessionForMainSignalService().performRequest(request) },
handler: self.handleSVR2AuthCheckResponse(statusCode:retryAfterHeader:bodyData:),
fallbackError: .genericError,
networkFailureError: .networkError
@@ -80,8 +79,7 @@ extension RegistrationCoordinatorImpl {
prekeyBundles: prekeyBundles
)
return await makeRequest(
request,
signalService: signalService,
{ try await signalService.urlSessionForMainSignalService().performRequest(request) },
handler: {
self.handleCreateAccountResponse(
authPassword: authPassword,
@@ -177,7 +175,7 @@ extension RegistrationCoordinatorImpl {
reglockToken: String?,
authPassword: String,
pniChangeNumberParameters: PniDistribution.Parameters,
signalService: OWSSignalServiceProtocol,
networkManager: any NetworkManagerProtocol,
) async -> AccountResponse {
let request = RegistrationRequestFactory.changeNumberRequest(
verificationMethod: method,
@@ -186,8 +184,7 @@ extension RegistrationCoordinatorImpl {
pniChangeNumberParameters: pniChangeNumberParameters
)
return await makeRequest(
request,
signalService: signalService,
{ try await networkManager.asyncRequest(request) },
handler: {
return self.handleChangeNumberResponse(authPassword: authPassword, statusCode: $0, retryAfterHeader: $1, bodyData: $2)
},
@@ -342,14 +339,13 @@ extension RegistrationCoordinatorImpl {
}
private static func makeRequest<ResponseType>(
_ request: TSRequest,
signalService: OWSSignalServiceProtocol,
_ makeRequest: () async throws -> any HTTPResponse,
handler: (_ statusCode: Int, _ retryAfterHeader: String?, _ bodyData: Data?) -> ResponseType,
fallbackError: ResponseType,
networkFailureError: ResponseType
) async -> ResponseType {
do {
let response = try await signalService.urlSessionForMainSignalService().performRequest(request)
let response = try await makeRequest()
return handler(
response.responseStatusCode,
response.headers[Constants.retryAfterHeader],

2
Signal/Registration/RegistrationCoordinatorImpl.swift
View File

@@ -4404,7 +4404,7 @@ public class RegistrationCoordinatorImpl: RegistrationCoordinator {
reglockToken: reglockToken,
authPassword: changeNumberState.oldAuthToken,
pniChangeNumberParameters: pniParams,
signalService: deps.signalService,
networkManager: deps.networkManager,
))
}