Merge branch 'add/magic-link-auth' into lantean/1605-invalid-link-alert

Automattic · Jul 1, 2024 · ff81101 · ff81101
2 parents 86af35a + 0c8cc26
commit ff81101
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 3 deletions.
diff --git a/.swiftlint.yml b/.swiftlint.yml
@@ -45,7 +45,6 @@ only_rules:
   # - trailing_whitespace
 
   # - vertical_whitespace
-
   - custom_rules
 
 # Rules configuration

diff --git a/Simplenote/SPAppDelegate+Extensions.swift b/Simplenote/SPAppDelegate+Extensions.swift
@@ -452,13 +452,13 @@ extension SPAppDelegate {
     func performMagicLinkAuthentication(with url: URL) -> Bool {
         MagicLinkAuthenticator(authenticator: simperium.authenticator).handle(url: url)
     }
-    
+
     @objc(performMagicLinkAuthenticationWithUserActivity:)
     func performMagicLinkAuthentication(with userActivity: NSUserActivity) -> Bool {
         guard let url = userActivity.webpageURL else {
             return false
         }
-        
+
         return performMagicLinkAuthentication(with: url)
     }
 }

diff --git a/SimplenoteUITests/EmailLogin.swift b/SimplenoteUITests/EmailLogin.swift
@@ -34,6 +34,7 @@ class EmailLogin {
 
     class func logIn(email: String, password: String) {
         enterEmail(enteredValue: email)
+        app.buttons[UID.Button.continueWithPassword].tap()
         enterPassword(enteredValue: password)
         app.buttons[UID.Button.logIn].tap()
         handleSavePasswordPrompt()

diff --git a/SimplenoteUITests/UIDs.swift b/SimplenoteUITests/UIDs.swift
@@ -26,6 +26,7 @@ enum UID {
         static let menu = "menu"
         static let signUp = "Sign Up"
         static let logIn = "Log In"
+        static let continueWithPassword = "Continue with Password"
         static let logInWithEmail = "Log in with email"
         static let allNotes = "All Notes"
         static let trash = "Trash"