Skip to content

Commit f375b4f

Browse files
committed
Fix test failures
1 parent 1d32bbf commit f375b4f

File tree

3 files changed

+17
-28
lines changed

3 files changed

+17
-28
lines changed

Modules/Sources/Networking/Mapper/JetpackConnectionResultMapper.swift

Lines changed: 0 additions & 18 deletions
This file was deleted.

Modules/Sources/Networking/Mapper/JetpackConnectionURLMapper.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ struct JetpackConnectionURLMapper: Mapper {
88
///
99
func map(response: Data) throws -> URL {
1010
guard let escapedString = String(data: response, encoding: .utf8) else {
11-
throw JetpackConnectionRemote.ConnectionError.malformedURL
11+
throw JetpackConnectionError.malformedURL
1212
}
1313
// The API returns an escaped string with double quotes, so we need to clean it up.
1414
let urlString = escapedString

Modules/Sources/Networking/Remote/SiteRemote.swift

Lines changed: 16 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -186,15 +186,22 @@ public class SiteRemote: Remote, SiteRemoteProtocol {
186186
method: .post,
187187
path: String(format: Path.jetpackConnection, siteID),
188188
parameters: parameters)
189-
let mapper = JetpackConnectionResultMapper()
190-
let result = try await enqueue(request, mapper: mapper)
191-
switch result.code {
192-
case Constants.success:
193-
return
194-
case Constants.alreadyConnected:
195-
throw JetpackConnectionError.alreadyConnected
196-
default:
197-
throw JetpackConnectionError.connectionRequestFailed(message: result.message)
189+
do {
190+
try await enqueue(request)
191+
} catch let error as WordPressApiError {
192+
switch error {
193+
case let .unknown(code, message):
194+
if code == Constants.success {
195+
return
196+
} else if code == Constants.alreadyConnected {
197+
throw JetpackConnectionError.alreadyConnected
198+
}
199+
throw JetpackConnectionError.connectionRequestFailed(message: message)
200+
default:
201+
throw error
202+
}
203+
} catch {
204+
throw error
198205
}
199206
}
200207
}

0 commit comments

Comments
 (0)