From ae2cc4f96d33a43cefc3dc8be7f3e6bc29ec1223 Mon Sep 17 00:00:00 2001 From: Max Radermacher Date: Wed, 14 Feb 2024 16:53:51 -0600 Subject: [PATCH] Remove unused OWSRequestFactory methods --- .../Network/API/Requests/OWSRequestFactory.h | 30 ---- .../Network/API/Requests/OWSRequestFactory.m | 136 ------------------ 2 files changed, 166 deletions(-) diff --git a/SignalServiceKit/src/Network/API/Requests/OWSRequestFactory.h b/SignalServiceKit/src/Network/API/Requests/OWSRequestFactory.h index eeb46f3d1d..6d193b9a01 100644 --- a/SignalServiceKit/src/Network/API/Requests/OWSRequestFactory.h +++ b/SignalServiceKit/src/Network/API/Requests/OWSRequestFactory.h @@ -19,11 +19,6 @@ NS_ASSUME_NONNULL_BEGIN @class SignedPreKeyRecord; @class TSRequest; -typedef NS_ENUM(NSUInteger, TSVerificationTransport) { - TSVerificationTransportVoice = 1, - TSVerificationTransportSMS -}; - @interface OWSRequestFactory : NSObject + (instancetype)new NS_UNAVAILABLE; @@ -53,8 +48,6 @@ typedef NS_ENUM(NSUInteger, TSVerificationTransport) { + (TSRequest *)allocAttachmentRequestV4; -+ (TSRequest *)contactsIntersectionRequestWithHashesArray:(NSArray *)hashes; - + (TSRequest *)profileAvatarUploadFormRequest; + (TSRequest *)registerForPushRequestWithPushIdentifier:(NSString *)identifier @@ -62,12 +55,6 @@ typedef NS_ENUM(NSUInteger, TSVerificationTransport) { + (TSRequest *)unregisterAccountRequest; -+ (TSRequest *)requestVerificationCodeRequestWithE164:(NSString *)e164 - preauthChallenge:(nullable NSString *)preauthChallenge - captchaToken:(nullable NSString *)captchaToken - transport:(TSVerificationTransport)transport - NS_SWIFT_NAME(requestVerificationCodeRequest(e164:preauthChallenge:captchaToken:transport:)); - + (TSRequest *)submitMessageRequestWithServiceId:(ServiceIdObjC *)serviceId messages:(NSArray *)messages timestamp:(uint64_t)timestamp @@ -110,23 +97,6 @@ typedef NS_ENUM(NSUInteger, TSVerificationTransport) { + (TSRequest *)remoteAttestationAuthRequestForCDSI; + (TSRequest *)remoteAttestationAuthRequestForSVR2; -#pragma mark - KBS - -+ (TSRequest *)kbsEnclaveTokenRequestWithEnclaveName:(NSString *)enclaveName - authUsername:(NSString *)authUsername - authPassword:(NSString *)authPassword - cookies:(NSArray *)cookies; - -+ (TSRequest *)kbsEnclaveRequestWithRequestId:(NSData *)requestId - data:(NSData *)data - cryptIv:(NSData *)cryptIv - cryptMac:(NSData *)cryptMac - enclaveName:(NSString *)enclaveName - authUsername:(NSString *)authUsername - authPassword:(NSString *)authPassword - cookies:(NSArray *)cookies - requestType:(NSString *)requestType; - #pragma mark - UD + (TSRequest *)udSenderCertificateRequestWithUuidOnly:(BOOL)uuidOnly diff --git a/SignalServiceKit/src/Network/API/Requests/OWSRequestFactory.m b/SignalServiceKit/src/Network/API/Requests/OWSRequestFactory.m index b370f018af..8066479eb6 100644 --- a/SignalServiceKit/src/Network/API/Requests/OWSRequestFactory.m +++ b/SignalServiceKit/src/Network/API/Requests/OWSRequestFactory.m @@ -113,18 +113,6 @@ NSString *const OWSRequestKey_AuthKey = @"AuthKey"; return [TSRequest requestWithUrl:[NSURL URLWithString:path] method:@"GET" parameters:@{}]; } -+ (TSRequest *)contactsIntersectionRequestWithHashesArray:(NSArray *)hashes -{ - OWSAssertDebug(hashes.count > 0); - - NSString *path = [NSString stringWithFormat:@"%@/%@", self.textSecureDirectoryAPI, @"tokens"]; - return [TSRequest requestWithUrl:[NSURL URLWithString:path] - method:@"PUT" - parameters:@{ - @"contacts" : hashes, - }]; -} - + (TSRequest *)currentSignedPreKeyRequest { NSString *path = self.textSecureSignedKeysAPI; @@ -174,75 +162,6 @@ NSString *const OWSRequestKey_AuthKey = @"AuthKey"; return [TSRequest requestWithUrl:[NSURL URLWithString:path] method:@"DELETE" parameters:@{}]; } -+ (TSRequest *)requestVerificationCodeRequestWithE164:(NSString *)e164 - preauthChallenge:(nullable NSString *)preauthChallenge - captchaToken:(nullable NSString *)captchaToken - transport:(TSVerificationTransport)transport -{ - OWSAssertDebug(e164.length > 0); - - NSMutableArray *queryItems = [NSMutableArray new]; - [queryItems addObject:[NSURLQueryItem queryItemWithName:@"client" value:@"ios"]]; - - if (captchaToken.length > 0) { - [queryItems addObject:[NSURLQueryItem queryItemWithName:@"captcha" value:captchaToken]]; - } - - if (preauthChallenge.length > 0) { - [queryItems addObject:[NSURLQueryItem queryItemWithName:@"challenge" value:preauthChallenge]]; - } - - NSString *path = [NSString - stringWithFormat:@"%@/%@/code/%@", self.textSecureAccountsAPI, [self stringForTransport:transport], e164]; - - NSURLComponents *components = [[NSURLComponents alloc] initWithString:path]; - components.queryItems = queryItems; - - TSRequest *request = [TSRequest requestWithUrl:components.URL method:@"GET" parameters:@{}]; - request.shouldHaveAuthorizationHeaders = NO; - - if (transport == TSVerificationTransportVoice) { - NSString *_Nullable localizationHeader = [self voiceCodeLocalizationHeader]; - if (localizationHeader.length > 0) { - [request setValue:localizationHeader forHTTPHeaderField:@"Accept-Language"]; - } - } - - return request; -} - -+ (nullable NSString *)voiceCodeLocalizationHeader -{ - NSLocale *locale = [NSLocale currentLocale]; - NSString *_Nullable languageCode = [locale objectForKey:NSLocaleLanguageCode]; - NSString *_Nullable countryCode = [locale objectForKey:NSLocaleCountryCode]; - - if (!languageCode) { - return nil; - } - - OWSAssertDebug([languageCode rangeOfString:@"-"].location == NSNotFound); - - if (!countryCode) { - // In the absence of a country code, just send a language code. - return languageCode; - } - - OWSAssertDebug(languageCode.length == 2); - OWSAssertDebug(countryCode.length == 2); - return [NSString stringWithFormat:@"%@-%@", languageCode, countryCode]; -} - -+ (NSString *)stringForTransport:(TSVerificationTransport)transport -{ - switch (transport) { - case TSVerificationTransportSMS: - return @"sms"; - case TSVerificationTransportVoice: - return @"voice"; - } -} - + (TSRequest *)currencyConversionRequest NS_SWIFT_NAME(currencyConversionRequest()) { return [TSRequest requestWithUrl:[NSURL URLWithString:@"v1/payments/conversions"] method:@"GET" parameters:@{}]; @@ -351,61 +270,6 @@ NSString *const OWSRequestKey_AuthKey = @"AuthKey"; return [TSRequest requestWithUrl:[NSURL URLWithString:@"v2/backup/auth"] method:@"GET" parameters:@{}]; } -#pragma mark - KBS - -+ (TSRequest *)kbsEnclaveTokenRequestWithEnclaveName:(NSString *)enclaveName - authUsername:(NSString *)authUsername - authPassword:(NSString *)authPassword - cookies:(NSArray *)cookies -{ - NSString *path = [NSString stringWithFormat:@"v1/token/%@", enclaveName]; - - TSRequest *request = [TSRequest requestWithUrl:[NSURL URLWithString:path] method:@"GET" parameters:@{}]; - - request.authUsername = authUsername; - request.authPassword = authPassword; - - // Set the cookie header. - // OWSURLSession disables default cookie handling for all requests. - OWSAssertDebug(request.allHTTPHeaderFields.count == 0); - [request setAllHTTPHeaderFields:[NSHTTPCookie requestHeaderFieldsWithCookies:cookies]]; - - return request; -} - -+ (TSRequest *)kbsEnclaveRequestWithRequestId:(NSData *)requestId - data:(NSData *)data - cryptIv:(NSData *)cryptIv - cryptMac:(NSData *)cryptMac - enclaveName:(NSString *)enclaveName - authUsername:(NSString *)authUsername - authPassword:(NSString *)authPassword - cookies:(NSArray *)cookies - requestType:(NSString *)requestType -{ - NSString *path = [NSString stringWithFormat:@"v1/backup/%@", enclaveName]; - - TSRequest *request = [TSRequest requestWithUrl:[NSURL URLWithString:path] - method:@"PUT" - parameters:@{ - @"requestId" : requestId.base64EncodedString, - @"data" : data.base64EncodedString, - @"iv" : cryptIv.base64EncodedString, - @"mac" : cryptMac.base64EncodedString, - @"type" : requestType - }]; - - request.authUsername = authUsername; - request.authPassword = authPassword; - - // Set the cookie header. - // OWSURLSession disables default cookie handling for all requests. - OWSAssertDebug(request.allHTTPHeaderFields.count == 0); - [request setAllHTTPHeaderFields:[NSHTTPCookie requestHeaderFieldsWithCookies:cookies]]; - - return request; -} - #pragma mark - UD + (TSRequest *)udSenderCertificateRequestWithUuidOnly:(BOOL)uuidOnly