Skip to content

Commit 56f481d

Browse files
itsmeichigoitsmeichigo
authored
Merge pull request #8693 from woocommerce/feat/8453-revert-renaming
REST API: Revert naming to `RequestProcessor` and `RequestAuthenticator`
2 parents 351af63 + 6ce8602 commit 56f481d

File tree

6 files changed

+48
-48
lines changed

6 files changed

+48
-48
lines changed

‎Networking/Networking.xcodeproj/project.pbxproj‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -754,7 +754,7 @@
754754
DEF13C5E296686AB0024A02B /* orders-load-all-without-data.json in Resources */ = {isa = PBXBuildFile; fileRef = DEF13C5D296686AB0024A02B /* orders-load-all-without-data.json */; };
755755
DEF13C6029668C420024A02B /* order-without-data.json in Resources */ = {isa = PBXBuildFile; fileRef = DEF13C5F29668C420024A02B /* order-without-data.json */; };
756756
DEFBA74E29485A7600C35BA9 /* RESTRequest.swift in Sources */ = {isa = PBXBuildFile; fileRef = DEFBA74D29485A7600C35BA9 /* RESTRequest.swift */; };
757-
DEFBA7542949CE6600C35BA9 /* ApplicationPasswordRequestProcessor.swift in Sources */ = {isa = PBXBuildFile; fileRef = DEFBA7532949CE6600C35BA9 /* ApplicationPasswordRequestProcessor.swift */; };
757+
DEFBA7542949CE6600C35BA9 /* RequestProcessor.swift in Sources */ = {isa = PBXBuildFile; fileRef = DEFBA7532949CE6600C35BA9 /* RequestProcessor.swift */; };
758758
DEFBA7562949D17400C35BA9 /* DefaultRequestAuthenticatorTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = DEFBA7552949D17300C35BA9 /* DefaultRequestAuthenticatorTests.swift */; };
759759
E12552C526385B05001CEE70 /* ShippingLabelAddressValidationSuccess.swift in Sources */ = {isa = PBXBuildFile; fileRef = E12552C426385B05001CEE70 /* ShippingLabelAddressValidationSuccess.swift */; };
760760
E137619929151C7400FD098F /* error-wp-rest-forbidden.json in Resources */ = {isa = PBXBuildFile; fileRef = E137619829151C7400FD098F /* error-wp-rest-forbidden.json */; };
@@ -781,13 +781,13 @@
781781
EE6FDCFC2966A70400E1CECF /* product-without-data.json in Resources */ = {isa = PBXBuildFile; fileRef = EE6FDCFB2966A70400E1CECF /* product-without-data.json */; };
782782
EE71CC3D2951A8EA0074D908 /* ApplicationPasswordStorage.swift in Sources */ = {isa = PBXBuildFile; fileRef = EE71CC3C2951A8EA0074D908 /* ApplicationPasswordStorage.swift */; };
783783
EE71CC412951CE700074D908 /* generate-application-password-using-wporg-creds-success.json in Resources */ = {isa = PBXBuildFile; fileRef = EE71CC402951CE700074D908 /* generate-application-password-using-wporg-creds-success.json */; };
784-
EE76762F2962B85E000066FA /* ApplicationPasswordRequestProcessorTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = EE76762E2962B85E000066FA /* ApplicationPasswordRequestProcessorTests.swift */; };
784+
EE76762F2962B85E000066FA /* RequestProcessorTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = EE76762E2962B85E000066FA /* RequestProcessorTests.swift */; };
785785
EE80A24729547F8B003591E4 /* coupons-all-without-data.json in Resources */ = {isa = PBXBuildFile; fileRef = EE80A24529547F8B003591E4 /* coupons-all-without-data.json */; };
786786
EE80A24829547F8B003591E4 /* coupon-without-data.json in Resources */ = {isa = PBXBuildFile; fileRef = EE80A24629547F8B003591E4 /* coupon-without-data.json */; };
787787
EE80A25029556FBD003591E4 /* coupon-reports-without-data.json in Resources */ = {isa = PBXBuildFile; fileRef = EE80A24F29556FBD003591E4 /* coupon-reports-without-data.json */; };
788788
EE8A86F1286C5226003E8AA4 /* media-update-product-id-in-wordpress-site.json in Resources */ = {isa = PBXBuildFile; fileRef = EE8A86F0286C5226003E8AA4 /* media-update-product-id-in-wordpress-site.json */; };
789789
EE8DE432294B17CD005054E7 /* DefaultApplicationPasswordUseCaseTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = EE8DE431294B17CD005054E7 /* DefaultApplicationPasswordUseCaseTests.swift */; };
790-
EE99814E295AA7430074AE68 /* ApplicationPasswordAuthenticator.swift in Sources */ = {isa = PBXBuildFile; fileRef = EE99814D295AA7430074AE68 /* ApplicationPasswordAuthenticator.swift */; };
790+
EE99814E295AA7430074AE68 /* RequestAuthenticator.swift in Sources */ = {isa = PBXBuildFile; fileRef = EE99814D295AA7430074AE68 /* RequestAuthenticator.swift */; };
791791
EE998150295AACE10074AE68 /* RequestConverter.swift in Sources */ = {isa = PBXBuildFile; fileRef = EE99814F295AACE10074AE68 /* RequestConverter.swift */; };
792792
EEA6583E2966B41E00112DF0 /* products-load-all-without-data.json in Resources */ = {isa = PBXBuildFile; fileRef = EEA6583D2966B41E00112DF0 /* products-load-all-without-data.json */; };
793793
EEA658402966C05D00112DF0 /* product-search-sku-without-data.json in Resources */ = {isa = PBXBuildFile; fileRef = EEA6583F2966C05D00112DF0 /* product-search-sku-without-data.json */; };
@@ -1587,7 +1587,7 @@
15871587
DEF13C5D296686AB0024A02B /* orders-load-all-without-data.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = "orders-load-all-without-data.json"; sourceTree = "<group>"; };
15881588
DEF13C5F29668C420024A02B /* order-without-data.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = "order-without-data.json"; sourceTree = "<group>"; };
15891589
DEFBA74D29485A7600C35BA9 /* RESTRequest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RESTRequest.swift; sourceTree = "<group>"; };
1590-
DEFBA7532949CE6600C35BA9 /* ApplicationPasswordRequestProcessor.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ApplicationPasswordRequestProcessor.swift; sourceTree = "<group>"; };
1590+
DEFBA7532949CE6600C35BA9 /* RequestProcessor.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RequestProcessor.swift; sourceTree = "<group>"; };
15911591
DEFBA7552949D17300C35BA9 /* DefaultRequestAuthenticatorTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DefaultRequestAuthenticatorTests.swift; sourceTree = "<group>"; };
15921592
E12552C426385B05001CEE70 /* ShippingLabelAddressValidationSuccess.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ShippingLabelAddressValidationSuccess.swift; sourceTree = "<group>"; };
15931593
E137619829151C7400FD098F /* error-wp-rest-forbidden.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = "error-wp-rest-forbidden.json"; sourceTree = "<group>"; };
@@ -1614,13 +1614,13 @@
16141614
EE6FDCFB2966A70400E1CECF /* product-without-data.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = "product-without-data.json"; sourceTree = "<group>"; };
16151615
EE71CC3C2951A8EA0074D908 /* ApplicationPasswordStorage.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ApplicationPasswordStorage.swift; sourceTree = "<group>"; };
16161616
EE71CC402951CE700074D908 /* generate-application-password-using-wporg-creds-success.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = "generate-application-password-using-wporg-creds-success.json"; sourceTree = "<group>"; };
1617-
EE76762E2962B85E000066FA /* ApplicationPasswordRequestProcessorTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ApplicationPasswordRequestProcessorTests.swift; sourceTree = "<group>"; };
1617+
EE76762E2962B85E000066FA /* RequestProcessorTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RequestProcessorTests.swift; sourceTree = "<group>"; };
16181618
EE80A24529547F8B003591E4 /* coupons-all-without-data.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = "coupons-all-without-data.json"; sourceTree = "<group>"; };
16191619
EE80A24629547F8B003591E4 /* coupon-without-data.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = "coupon-without-data.json"; sourceTree = "<group>"; };
16201620
EE80A24F29556FBD003591E4 /* coupon-reports-without-data.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = "coupon-reports-without-data.json"; sourceTree = "<group>"; };
16211621
EE8A86F0286C5226003E8AA4 /* media-update-product-id-in-wordpress-site.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = "media-update-product-id-in-wordpress-site.json"; sourceTree = "<group>"; };
16221622
EE8DE431294B17CD005054E7 /* DefaultApplicationPasswordUseCaseTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DefaultApplicationPasswordUseCaseTests.swift; sourceTree = "<group>"; };
1623-
EE99814D295AA7430074AE68 /* ApplicationPasswordAuthenticator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ApplicationPasswordAuthenticator.swift; sourceTree = "<group>"; };
1623+
EE99814D295AA7430074AE68 /* RequestAuthenticator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RequestAuthenticator.swift; sourceTree = "<group>"; };
16241624
EE99814F295AACE10074AE68 /* RequestConverter.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RequestConverter.swift; sourceTree = "<group>"; };
16251625
EEA6583D2966B41E00112DF0 /* products-load-all-without-data.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = "products-load-all-without-data.json"; sourceTree = "<group>"; };
16261626
EEA6583F2966C05D00112DF0 /* product-search-sku-without-data.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = "product-search-sku-without-data.json"; sourceTree = "<group>"; };
@@ -2800,10 +2800,10 @@
28002800
EE54C899294777D000A9BF61 /* ApplicationPassword */ = {
28012801
isa = PBXGroup;
28022802
children = (
2803-
DEFBA7532949CE6600C35BA9 /* ApplicationPasswordRequestProcessor.swift */,
2803+
DEFBA7532949CE6600C35BA9 /* RequestProcessor.swift */,
28042804
EE54C89E2947782E00A9BF61 /* ApplicationPasswordUseCase.swift */,
28052805
EE71CC3C2951A8EA0074D908 /* ApplicationPasswordStorage.swift */,
2806-
EE99814D295AA7430074AE68 /* ApplicationPasswordAuthenticator.swift */,
2806+
EE99814D295AA7430074AE68 /* RequestAuthenticator.swift */,
28072807
EE99814F295AACE10074AE68 /* RequestConverter.swift */,
28082808
);
28092809
path = ApplicationPassword;
@@ -2850,7 +2850,7 @@
28502850
isa = PBXGroup;
28512851
children = (
28522852
EE8DE431294B17CD005054E7 /* DefaultApplicationPasswordUseCaseTests.swift */,
2853-
EE76762E2962B85E000066FA /* ApplicationPasswordRequestProcessorTests.swift */,
2853+
EE76762E2962B85E000066FA /* RequestProcessorTests.swift */,
28542854
);
28552855
path = ApplicationPassword;
28562856
sourceTree = "<group>";
@@ -3351,7 +3351,7 @@
33513351
457A574025D1817E000797AD /* ShippingLabelAddressVerification.swift in Sources */,
33523352
74ABA1D1213F22CA00FFAD30 /* TopEarnersStatsRemote.swift in Sources */,
33533353
DEC51AF127699E7A009F3DF4 /* SystemStatus+Page.swift in Sources */,
3354-
EE99814E295AA7430074AE68 /* ApplicationPasswordAuthenticator.swift in Sources */,
3354+
EE99814E295AA7430074AE68 /* RequestAuthenticator.swift in Sources */,
33553355
025CA2C0238EB8CB00B05C81 /* ProductShippingClass.swift in Sources */,
33563356
02C1CEF424C6A02B00703EBA /* ProductVariationMapper.swift in Sources */,
33573357
3105470C262E27F000C5C02B /* WCPayPaymentIntentStatusEnum.swift in Sources */,
@@ -3383,7 +3383,7 @@
33833383
020D07B823D852BB00FD9580 /* Media.swift in Sources */,
33843384
B5BB1D0C20A2050300112D92 /* DateFormatter+Woo.swift in Sources */,
33853385
743E84EE2217244C00FAC9D7 /* ShipmentTrackingListMapper.swift in Sources */,
3386-
DEFBA7542949CE6600C35BA9 /* ApplicationPasswordRequestProcessor.swift in Sources */,
3386+
DEFBA7542949CE6600C35BA9 /* RequestProcessor.swift in Sources */,
33873387
451A97E5260B631E0059D135 /* ShippingLabelPredefinedPackage.swift in Sources */,
33883388
BAB373722795A1FB00837B4A /* OrderTaxLine.swift in Sources */,
33893389
EE54C89F2947782E00A9BF61 /* ApplicationPasswordUseCase.swift in Sources */,
@@ -3777,7 +3777,7 @@
37773777
D800DA0A25EFEB9C001E13CE /* WCPayRemoteTests.swift in Sources */,
37783778
E13BAD5328F8625600217769 /* InAppPurchasesRemoteTests.swift in Sources */,
37793779
CC851D1425E52AB500249E9C /* Decimal+ExtensionsTests.swift in Sources */,
3780-
EE76762F2962B85E000066FA /* ApplicationPasswordRequestProcessorTests.swift in Sources */,
3780+
EE76762F2962B85E000066FA /* RequestProcessorTests.swift in Sources */,
37813781
B554FA8B2180B1D500C54DFF /* NotificationsRemoteTests.swift in Sources */,
37823782
B518662A20A09C6F00037A38 /* OrdersRemoteTests.swift in Sources */,
37833783
02EF166E292F0C5800D90AD6 /* PaymentRemoteTests.swift in Sources */,

‎Networking/Networking/ApplicationPassword/ApplicationPasswordAuthenticator.swift‎ renamed to ‎Networking/Networking/ApplicationPassword/RequestAuthenticator.swift‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
enum ApplicationPasswordAuthenticatorError: Error {
1+
enum RequestAuthenticatorError: Error {
22
case applicationPasswordUseCaseNotAvailable
33
case applicationPasswordNotAvailable
44
}
55

6-
protocol ApplicationPasswordAuthenticator {
6+
protocol RequestAuthenticator {
77
/// Credentials to authenticate the URLRequest
88
///
99
var credentials: Credentials? { get }
@@ -26,7 +26,7 @@ protocol ApplicationPasswordAuthenticator {
2626

2727
/// Authenticates request
2828
///
29-
public struct DefaultApplicationPasswordAuthenticator: ApplicationPasswordAuthenticator {
29+
public struct DefaultRequestAuthenticator: RequestAuthenticator {
3030
/// Credentials to authenticate the URLRequest
3131
///
3232
let credentials: Credentials?
@@ -71,7 +71,7 @@ public struct DefaultApplicationPasswordAuthenticator: ApplicationPasswordAuthen
7171
///
7272
func generateApplicationPassword() async throws {
7373
guard let applicationPasswordUseCase else {
74-
throw ApplicationPasswordAuthenticatorError.applicationPasswordUseCaseNotAvailable
74+
throw RequestAuthenticatorError.applicationPasswordUseCaseNotAvailable
7575
}
7676
let _ = try await applicationPasswordUseCase.generateNewPassword()
7777
return
@@ -84,7 +84,7 @@ public struct DefaultApplicationPasswordAuthenticator: ApplicationPasswordAuthen
8484
}
8585
}
8686

87-
private extension DefaultApplicationPasswordAuthenticator {
87+
private extension DefaultRequestAuthenticator {
8888
/// To check whether the given URLRequest is a REST API request
8989
///
9090
func isRestAPIRequest(_ urlRequest: URLRequest) -> Bool {
@@ -110,7 +110,7 @@ private extension DefaultApplicationPasswordAuthenticator {
110110
///
111111
func authenticateUsingApplicationPasswordIfPossible(_ urlRequest: URLRequest) throws -> URLRequest {
112112
guard let applicationPassword = applicationPasswordUseCase?.applicationPassword else {
113-
throw ApplicationPasswordAuthenticatorError.applicationPasswordNotAvailable
113+
throw RequestAuthenticatorError.applicationPasswordNotAvailable
114114
}
115115

116116
return AuthenticatedRESTRequest(applicationPassword: applicationPassword, request: urlRequest).asURLRequest()

‎Networking/Networking/ApplicationPassword/ApplicationPasswordRequestProcessor.swift‎ renamed to ‎Networking/Networking/ApplicationPassword/RequestProcessor.swift‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,29 +3,29 @@ import Foundation
33

44
/// Authenticates and retries requests
55
///
6-
final class ApplicationPasswordRequestProcessor {
6+
final class RequestProcessor {
77
private var requestsToRetry = [RequestRetryCompletion]()
88

99
private var isAuthenticating = false
1010

11-
private let requestAuthenticator: ApplicationPasswordAuthenticator
11+
private let requestAuthenticator: RequestAuthenticator
1212

13-
init(requestAuthenticator: ApplicationPasswordAuthenticator) {
13+
init(requestAuthenticator: RequestAuthenticator) {
1414
self.requestAuthenticator = requestAuthenticator
1515
}
1616
}
1717

1818
// MARK: Request Authentication
1919
//
20-
extension ApplicationPasswordRequestProcessor: RequestAdapter {
20+
extension RequestProcessor: RequestAdapter {
2121
func adapt(_ urlRequest: URLRequest) throws -> URLRequest {
2222
return try requestAuthenticator.authenticate(urlRequest)
2323
}
2424
}
2525

2626
// MARK: Retrying Request
2727
//
28-
extension ApplicationPasswordRequestProcessor: RequestRetrier {
28+
extension RequestProcessor: RequestRetrier {
2929
func should(_ manager: Alamofire.SessionManager,
3030
retry request: Alamofire.Request,
3131
with error: Error,
@@ -48,7 +48,7 @@ extension ApplicationPasswordRequestProcessor: RequestRetrier {
4848

4949
// MARK: Helpers
5050
//
51-
private extension ApplicationPasswordRequestProcessor {
51+
private extension RequestProcessor {
5252
func generateApplicationPassword() {
5353
Task(priority: .medium) {
5454
isAuthenticating = true
@@ -66,7 +66,7 @@ private extension ApplicationPasswordRequestProcessor {
6666

6767
func shouldRetry(_ error: Error) -> Bool {
6868
// Need to generate application password
69-
if .applicationPasswordNotAvailable == error as? ApplicationPasswordAuthenticatorError {
69+
if .applicationPasswordNotAvailable == error as? RequestAuthenticatorError {
7070
return true
7171
}
7272

‎Networking/Networking/Network/AlamofireNetwork.swift‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,15 +28,15 @@ public class AlamofireNetwork: Network {
2828

2929
/// Authenticator to update requests authorization header if possible.
3030
///
31-
private let requestAuthenticator: ApplicationPasswordRequestProcessor
31+
private let requestAuthenticator: RequestProcessor
3232

3333
public var session: URLSession { SessionManager.default.session }
3434

3535
/// Public Initializer
3636
///
3737
public required init(credentials: Credentials?) {
3838
self.requestConverter = RequestConverter(credentials: credentials)
39-
self.requestAuthenticator = ApplicationPasswordRequestProcessor(requestAuthenticator: DefaultApplicationPasswordAuthenticator(credentials: credentials))
39+
self.requestAuthenticator = RequestProcessor(requestAuthenticator: DefaultRequestAuthenticator(credentials: credentials))
4040
}
4141

4242
/// Executes the specified Network Request. Upon completion, the payload will be sent back to the caller as a Data instance.

0 commit comments

Comments
 (0)