Merge branch 'lantean/1187-updates-magic-link-endpoints' into lantean…

…/adjusting-copy
Automattic · Jul 16, 2024 · a40ea75 · a40ea75
2 parents 83f7103 + df598b0
commit a40ea75
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/SimplenoteTests/LoginRemoteTests.swift b/SimplenoteTests/LoginRemoteTests.swift
@@ -42,7 +42,7 @@ class LoginRemoteTests: XCTestCase {
         /// Verify
         let body: Dictionary<String, String> = try XCTUnwrap(urlSession.lastRequest?.decodeHtmlBody())
 
-        XCTAssertEqual(body["email"], "[email protected]")
+        XCTAssertEqual(body["username"], "[email protected]")
         XCTAssertEqual(body["auth_code"], "5678")
 
         XCTAssertEqual(expectedResponse, decodedResponse)

diff --git a/SimplenoteTests/MagicLinkAuthenticatorTests.swift b/SimplenoteTests/MagicLinkAuthenticatorTests.swift
@@ -26,9 +26,9 @@ final class MagicLinkAuthenticatorTests: XCTestCase {
 
     func testMagicLinkURLResultsInLoginConfirmationRequest() async throws {
         let expectation = expectation(description: "LoginConfirmationRequest")
-        loginRemote.onLoginConfirmationRequest = { (authKey, authCode) in
+        loginRemote.onLoginConfirmationRequest = { (email, authCode) in
             XCTAssertEqual(authCode, MagicLinkTestConstants.expectedCode)
-            XCTAssertEqual(authKey, MagicLinkTestConstants.expectedKey)
+            XCTAssertEqual(email, MagicLinkTestConstants.expectedUsername)
 
             expectation.fulfill()
 
@@ -64,6 +64,7 @@ private enum MagicLinkTestConstants {
     static let expectedSyncToken = "12345678"
     static let expectedKey = "1234"
     static let expectedCode = "5678"
-    static let sampleValidURL = URL(string: "simplenotemac://login?auth_key=\(expectedKey)&auth_code=\(expectedCode)")!
-    static let sampleInvalidURL = URL(string: "simplenotemac://login?auth_key=&auth_code=")!
+    static let encodedUsername = expectedUsername.data(using: .utf8)!.base64EncodedString()
+    static let sampleValidURL = URL(string: "simplenotemac://login?email=\(encodedUsername)&auth_code=\(expectedCode)")!
+    static let sampleInvalidURL = URL(string: "simplenotemac://login?email=&auth_code=")!
 }
diff --git a/SimplenoteTests/MockLoginRemote.swift b/SimplenoteTests/MockLoginRemote.swift
@@ -7,7 +7,7 @@ import Foundation
 class MockLoginRemote: LoginRemoteProtocol {
     var lastLoginRequestEmail: String?
 
-    var onLoginConfirmationRequest: ((_ authKey: String, _ authCode: String) -> LoginConfirmationResponse)?
+    var onLoginConfirmationRequest: ((_ email: String, _ authCode: String) -> LoginConfirmationResponse)?
 
     func requestLoginEmail(email: String) async throws {
         lastLoginRequestEmail = email