Wires SimplenoteEndpoints SPM

Automattic · Jul 25, 2024 · fd6845f · fd6845f
1 parent 7049055
commit fd6845f
Show file tree

Hide file tree

Showing 16 changed files with 68 additions and 48 deletions.
diff --git a/Simplenote.xcodeproj/project.pbxproj b/Simplenote.xcodeproj/project.pbxproj
diff --git a/Simplenote.xcworkspace/xcshareddata/swiftpm/Package.resolved b/Simplenote.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -1,5 +1,5 @@
 {
-  "originHash" : "1f66ac352dc04da5870abacba5f42306bd560111ad295c7c60a13a7af5c25ec8",
+  "originHash" : "7f8dc02b0065be779873bdc5b585794a5005edfeb5a5e51a04644d5b3c18e322",
   "pins" : [
     {
       "identity" : "automattic-tracks-ios",
@@ -19,6 +19,15 @@
         "version" : "8.28.0"
       }
     },
+    {
+      "identity" : "simplenoteendpoints-swift",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/Automattic/SimplenoteEndpoints-Swift",
+      "state" : {
+        "branch" : "trunk",
+        "revision" : "3d1c0a5db39ca798a7de10e7faeef8ae66e941e6"
+      }
+    },
     {
       "identity" : "simplenotefoundation-swift",
       "kind" : "remoteSourceControl",

diff --git a/Simplenote/AccountDeletionController.swift b/Simplenote/AccountDeletionController.swift
@@ -1,4 +1,6 @@
 import Foundation
+import SimplenoteEndpoints
+
 
 @objc
 class AccountDeletionController: NSObject {

diff --git a/Simplenote/AccountVerificationController.swift b/Simplenote/AccountVerificationController.swift
@@ -1,4 +1,6 @@
 import Foundation
+import SimplenoteEndpoints
+
 
 // MARK: - AccountVerificationController
 //

diff --git a/Simplenote/AuthViewController+Swift.swift b/Simplenote/AuthViewController+Swift.swift
@@ -1,4 +1,6 @@
 import Foundation
+import SimplenoteEndpoints
+
 
 // MARK: - AuthViewController: Interface Initialization
 //

diff --git a/Simplenote/MagicLinkAuthenticator.swift b/Simplenote/MagicLinkAuthenticator.swift
@@ -1,4 +1,5 @@
 import Foundation
+import SimplenoteEndpoints
 
 
 // MARK: - Notifications

diff --git a/Simplenote/SimperiumAuthenticatorProtocol.swift b/Simplenote/SimperiumAuthenticatorProtocol.swift
@@ -1,4 +1,6 @@
 import Foundation
+import SimplenoteEndpoints
+import Simperium_OSX
 
 
 // MARK: - SimperiumAuthenticatorProtocol
@@ -9,3 +11,6 @@ protocol SimperiumAuthenticatorProtocol {
 
 
 extension SPAuthenticator: SimperiumAuthenticatorProtocol { }
+
+
+extension SPUser: UserProtocol { }
diff --git a/SimplenoteTests/AccountVerificationController+TestHelpers.swift b/SimplenoteTests/AccountVerificationController+TestHelpers.swift
@@ -1,8 +1,15 @@
 import Foundation
+import SimplenoteEndpoints
 @testable import Simplenote
 
+
 extension AccountVerificationController {
     func randomResult() -> Result<Data?, RemoteError> {
-        return Bool.random() ? .success(nil) : .failure(RemoteError.requestError(0, nil))
+        if Bool.random() {
+            return .success(nil)
+        }
+
+        let error = RemoteError(statusCode: .zero, response: nil, networkError: nil)
+        return .failure(error)
     }
 }
diff --git a/SimplenoteTests/AccountVerificationControllerTests.swift b/SimplenoteTests/AccountVerificationControllerTests.swift
@@ -1,4 +1,5 @@
 import XCTest
+import SimplenoteEndpoints
 @testable import Simplenote
 
 // MARK: - AccountVerificationControllerTests

diff --git a/SimplenoteTests/AccountVerificationRemoteTests.swift b/SimplenoteTests/AccountVerificationRemoteTests.swift
@@ -1,6 +1,8 @@
 import XCTest
+import SimplenoteEndpoints
 @testable import Simplenote
 
+
 // MARK: - AccountVerificationRemoteTests
 //
 class AccountVerificationRemoteTests: XCTestCase {
@@ -16,12 +18,14 @@ class AccountVerificationRemoteTests: XCTestCase {
     func testFailureWhenStatusCodeIs4xxOr5xx() {
         for _ in 0..<5 {
             let statusCode = Int.random(in: 400..<600)
-            test(withStatusCode: statusCode, expectedResult: Result.failure(RemoteError.requestError(statusCode, nil)))
+            let error = RemoteError(statusCode: statusCode, response: nil, networkError: nil)
+            test(withStatusCode: statusCode, expectedResult: Result.failure(error))
         }
     }
 
     func testFailureWhenNoResponse() {
-        test(withStatusCode: nil, expectedResult: Result.failure(RemoteError.network))
+        let expectedError = RemoteError(statusCode: .zero, response: nil, networkError: nil)
+        test(withStatusCode: nil, expectedResult: Result.failure(expectedError))
     }
 
     private func test(withStatusCode statusCode: Int?, expectedResult: Result<Data?, RemoteError>) {

diff --git a/SimplenoteTests/LoginRemoteTests.swift b/SimplenoteTests/LoginRemoteTests.swift
@@ -1,4 +1,5 @@
 import XCTest
+import SimplenoteEndpoints
 @testable import Simplenote
 
 class LoginRemoteTests: XCTestCase {
@@ -13,7 +14,7 @@ class LoginRemoteTests: XCTestCase {
         do {
             try await loginRemote.requestLoginEmail(email: "email@gmail.com")
         } catch {
-            XCTAssertEqual(error as? RemoteError, RemoteError.init(statusCode: statusCode))
+            XCTAssertEqual(error as? RemoteError, RemoteError(statusCode: statusCode, response: nil, networkError: nil))
         }
     }
 

diff --git a/SimplenoteTests/MagicLinkAuthenticatorTests.swift b/SimplenoteTests/MagicLinkAuthenticatorTests.swift
@@ -1,4 +1,5 @@
 import XCTest
+import SimplenoteEndpoints
 @testable import Simplenote
 
 

diff --git a/SimplenoteTests/MockAccountVerificationRemote.swift b/SimplenoteTests/MockAccountVerificationRemote.swift
@@ -1,6 +1,8 @@
 import XCTest
+@testable import SimplenoteEndpoints
 @testable import Simplenote
 
+
 // MARK: - MockAccountVerificationRemote
 //
 class MockAccountRemote: AccountRemote {

diff --git a/SimplenoteTests/MockLoginRemote.swift b/SimplenoteTests/MockLoginRemote.swift
@@ -1,4 +1,5 @@
 import Foundation
+import SimplenoteEndpoints
 @testable import Simplenote
 
 
@@ -15,7 +16,7 @@ class MockLoginRemote: LoginRemoteProtocol {
 
     func requestLoginConfirmation(email: String, authCode: String) async throws -> LoginConfirmationResponse {
         guard let response = onLoginConfirmationRequest?(email, authCode) else {
-            throw RemoteError.network
+            throw RemoteError(statusCode: .zero, response: nil, networkError: nil)
         }
 
         return response

diff --git a/SimplenoteTests/MockURLSession.swift b/SimplenoteTests/MockURLSession.swift
@@ -1,6 +1,8 @@
 import Foundation
+import SimplenoteEndpoints
 @testable import Simplenote
 
+
 // MARK: - MockURLSession
 //
 class MockURLSession: URLSessionProtocol {
@@ -31,6 +33,6 @@ class MockURLSession: URLSessionProtocol {
             return (responseData, urlResponse)
         }
 
-        throw RemoteError.network
+        throw RemoteError(statusCode: .zero, response: nil, networkError: nil)
     }
 }
diff --git a/SimplenoteTests/SignupRemoteTests.swift b/SimplenoteTests/SignupRemoteTests.swift
@@ -1,6 +1,8 @@
 import XCTest
+import SimplenoteEndpoints
 @testable import Simplenote
 
+
 class SignupRemoteTests: XCTestCase {
     private lazy var urlSession = MockURLSession()
     private lazy var signupRemote = SignupRemote(urlSession: urlSession)
@@ -11,7 +13,8 @@ class SignupRemoteTests: XCTestCase {
 
     func testFailureWhenStatusCodeIs4xxOr5xx() {
         let statusCode = Int.random(in: 400..<600)
-        verifySignupSucceeds(withStatusCode: statusCode, email: "email@gmail.com", expectedSuccess: Result.failure(RemoteError.requestError(statusCode, nil)))
+        let expectedError = RemoteError(statusCode: statusCode, response: nil, networkError: nil)
+        verifySignupSucceeds(withStatusCode: statusCode, email: "email@gmail.com", expectedSuccess: Result.failure(expectedError))
     }
 
     func testRequestSetsEmailToCorrectCase() throws {