Merge branch 'trunk' into issue/8517-selection-state

Author: ealeksandrov

CHANGELOG.md

@@ -1,6 +1,9 @@
 <!--
 Contains editorialized release notes. Raw release notes should go into `RELEASE-NOTES.txt`.
 -->
+## 11.8
+You’ll notice some nice visual changes to the look of the app! Take a look and please share your feedback – more updates to come in the next few weeks!
+
 ## 11.7
 Did you know we've added a new analytics section? It's now possible to select custom date ranges when viewing your stats! Simply click on the See More button under the store stats to check it out.
 

Experiments/Experiments/ABTest.swift

@@ -63,8 +63,10 @@ public extension Variation {
         switch self {
         case .control:
             return "control"
-        case .treatment(let string):
-            return string.map { "treatment: \($0)" } ?? "treatment"
+        case .treatment:
+            return "treatment"
+        case .customTreatment(let name):
+            return "treatment: \(name)"
         }
     }
 }

Networking/Networking.xcodeproj/project.pbxproj

@@ -8,6 +8,7 @@ public enum ApplicationPasswordUseCaseError: Error {
     case duplicateName
     case applicationPasswordsDisabled
     case failedToConstructLoginOrAdminURLUsingSiteAddress
+    case unauthorizedRequest
 }
 
 public struct ApplicationPassword {
@@ -138,7 +139,7 @@ private extension DefaultApplicationPasswordUseCase {
         let passwordName = await applicationPasswordName
 
         let parameters = [ParameterKey.name: passwordName]
-        let request = WordPressOrgRequest(baseURL: siteAddress, method: .post, path: Path.applicationPasswords, parameters: parameters)
+        let request = RESTRequest(siteURL: siteAddress, method: .post, path: Path.applicationPasswords, parameters: parameters)
         return try await withCheckedThrowingContinuation { continuation in
             network.responseData(for: request) { result in
                 switch result {
@@ -163,6 +164,8 @@ private extension DefaultApplicationPasswordUseCase {
                         continuation.resume(throwing: ApplicationPasswordUseCaseError.applicationPasswordsDisabled)
                     case .responseValidationFailed(reason: .unacceptableStatusCode(code: ErrorCode.duplicateNameErrorCode)):
                         continuation.resume(throwing: ApplicationPasswordUseCaseError.duplicateName)
+                    case .responseValidationFailed(reason: .unacceptableStatusCode(code: ErrorCode.unauthorized)):
+                        continuation.resume(throwing: ApplicationPasswordUseCaseError.unauthorizedRequest)
                     default:
                         continuation.resume(throwing: error)
                     }
@@ -179,7 +182,7 @@ private extension DefaultApplicationPasswordUseCase {
 
         let passwordName = await applicationPasswordName
         let parameters = [ParameterKey.name: passwordName]
-        let request = WordPressOrgRequest(baseURL: siteAddress, method: .delete, path: Path.applicationPasswords, parameters: parameters)
+        let request = RESTRequest(siteURL: siteAddress, method: .delete, path: Path.applicationPasswords, parameters: parameters)
 
         try await withCheckedThrowingContinuation { continuation in
             network.responseData(for: request) { result in
@@ -209,6 +212,7 @@ private extension DefaultApplicationPasswordUseCase {
         static let notFound = 404
         static let applicationPasswordsDisabledErrorCode = 501
         static let duplicateNameErrorCode = 409
+        static let unauthorized = 401
     }
 
     enum Constants {

Networking/Networking/ApplicationPassword/ApplicationPasswordUseCase.swift

@@ -9,19 +9,34 @@ struct EntityIDMapper: Mapper {
     func map(response: Data) throws -> Int64 {
         let decoder = JSONDecoder()
 
-        return try decoder.decode(EntityIDEnvelope.self, from: response).id
+        do {
+            return try decoder.decode(EntityIDEnvelope.self, from: response).id
+        } catch {
+            let idDictionary = try decoder.decode(EntityIDEnvelope.EntityIDDictionaryType.self, from: response)
+            return idDictionary[Constants.idKey] ?? .zero
+        }
+    }
+}
+
+// MARK: Constants
+//
+private extension EntityIDMapper {
+    enum Constants {
+        static let idKey = "id"
     }
 }
 
 /// Disposable Entity:
 /// Allows us to parse a product ID with JSONDecoder.
 ///
 private struct EntityIDEnvelope: Decodable {
-    private let data: [String: Int64]
+    typealias EntityIDDictionaryType = [String: Int64]
+
+    private let data: EntityIDDictionaryType
 
     // Extracts the entity ID from the underlying data
     var id: Int64 {
-        data["id"] ?? .zero
+        data[EntityIDMapper.Constants.idKey] ?? .zero
     }
 
     private enum CodingKeys: String, CodingKey {

Networking/Networking/Mapper/EntityIDMapper.swift

@@ -8,7 +8,11 @@ struct LeaderboardListMapper: Mapper {
     ///
     func map(response: Data) throws -> [Leaderboard] {
         let decoder = JSONDecoder()
-        return try decoder.decode(LeaderboardsEnvelope.self, from: response).data
+        do {
+            return try decoder.decode(LeaderboardsEnvelope.self, from: response).data
+        } catch {
+            return try decoder.decode([Leaderboard].self, from: response)
+        }
     }
 }
 

Networking/Networking/Mapper/LeaderboardListMapper.swift

@@ -21,7 +21,11 @@ struct OrderListMapper: Mapper {
             .siteID: siteID
         ]
 
-        return try decoder.decode(OrderListEnvelope.self, from: response).orders
+        do {
+            return try decoder.decode(OrderListEnvelope.self, from: response).orders
+        } catch {
+            return try decoder.decode([Order].self, from: response)
+        }
     }
 }
 

Networking/Networking/Mapper/OrderListMapper.swift

@@ -20,8 +20,11 @@ struct OrderMapper: Mapper {
         decoder.userInfo = [
             .siteID: siteID
         ]
-
-        return try decoder.decode(OrderEnvelope.self, from: response).order
+        do {
+            return try decoder.decode(OrderEnvelope.self, from: response).order
+        } catch {
+            return try decoder.decode(Order.self, from: response)
+        }
     }
 }
 

Networking/Networking/Mapper/OrderMapper.swift

@@ -11,7 +11,11 @@ class OrderNoteMapper: Mapper {
         let decoder = JSONDecoder()
         decoder.dateDecodingStrategy = .formatted(DateFormatter.Defaults.dateTimeFormatter)
 
-        return try decoder.decode(OrderNoteEnvelope.self, from: response).orderNote
+        do {
+            return try decoder.decode(OrderNoteEnvelope.self, from: response).orderNote
+        } catch {
+            return try decoder.decode(OrderNote.self, from: response)
+        }
     }
 }
 

Networking/Networking/Mapper/OrderNoteMapper.swift

@@ -11,7 +11,11 @@ class OrderNotesMapper: Mapper {
         let decoder = JSONDecoder()
         decoder.dateDecodingStrategy = .formatted(DateFormatter.Defaults.dateTimeFormatter)
 
-        return try decoder.decode(OrderNotesEnvelope.self, from: response).orderNotes
+        do {
+            return try decoder.decode(OrderNotesEnvelope.self, from: response).orderNotes
+        } catch {
+            return try decoder.decode([OrderNote].self, from: response)
+        }
     }
 }