Refactored passkey authenticator to not be stored on add delegate

Automattic · Jul 1, 2024 · 21c7469 · 21c7469
1 parent 3c53a1c
commit 21c7469
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 15 deletions.
diff --git a/Simplenote/Classes/SPAuthHandler.swift b/Simplenote/Classes/SPAuthHandler.swift
@@ -7,7 +7,7 @@ class SPAuthHandler {
 
     /// Simperium Authenticator
     ///
-    private let simperiumService: SPAuthenticator
+    let simperiumService: SPAuthenticator
 
     /// Designated Initializer.
     ///

diff --git a/Simplenote/Classes/SPAuthViewController.swift b/Simplenote/Classes/SPAuthViewController.swift
@@ -126,6 +126,8 @@ class SPAuthViewController: UIViewController {
     ///
     private lazy var validator = AuthenticationValidator()
 
+    private var passkeyAuthenticator: PasskeyAuthenticator?
+
     /// # Indicates if we've got valid Credentials. Doesn't display any validation warnings onscreen
     ///
     private var isInputValid: Bool {
@@ -323,8 +325,8 @@ private extension SPAuthViewController {
         Task {
             //TODO: Handle errors
             //TODO: Handle email not valid
-            let passkeyAuthenticator = SPAppDelegate.shared().passkeyAuthenticator
-            try? await passkeyAuthenticator.attemptPasskeyAuth(for: email, in: self)
+            passkeyAuthenticator = PasskeyAuthenticator(authenticator: controller.simperiumService)
+            try? await passkeyAuthenticator?.attemptPasskeyAuth(for: email, in: self)
         }
     }
 

diff --git a/Simplenote/Classes/SPSettingsViewController+Extensions.swift b/Simplenote/Classes/SPSettingsViewController+Extensions.swift
@@ -224,23 +224,27 @@ extension SPSettingsViewController {
 extension SPSettingsViewController {
     @objc
     func presentPasskeyAuthenticationSetupAlert() {
+        let appDelegate = SPAppDelegate.shared()
+        guard let email = appDelegate.simperium.user?.email else {
+            return
+        }
+        let authenticator = PasskeyAuthenticator(authenticator: appDelegate.simperium.authenticator)
+        self.passkeyAuthenticator = authenticator
+
         let alert = UIAlertController(title: PasskeyAuthentication.alertTitle, message: PasskeyAuthentication.message, preferredStyle: .alert)
         alert.addTextField { textField in
             textField.textContentType = .password
             textField.isSecureTextEntry = true
         }
 
         let action = UIAlertAction(title: PasskeyAuthentication.submit, style: .default) { [unowned alert] _ in
-            let appDelegate = SPAppDelegate.shared()
             guard let textfield = alert.textFields?.first,
-                  let password = textfield.text,
-                  let email = appDelegate.simperium.user?.email else {
+                  let password = textfield.text else {
                 return
             }
 
             Task {
                 do {
-                    let authenticator = appDelegate.passkeyAuthenticator
                     try await authenticator.registerPasskey(for: email, password: password, in: self)
                 } catch {
                     // TODO: Display some action for failure

diff --git a/Simplenote/Classes/SPSettingsViewController.h b/Simplenote/Classes/SPSettingsViewController.h
@@ -1,12 +1,16 @@
 #import <UIKit/UIKit.h>
 #import "SPTableViewController.h"
 
+@class PasskeyAuthenticator;
+
 @interface SPSettingsViewController : SPTableViewController <UIPickerViewDelegate, UIPickerViewDataSource> {
     //Preferences
     NSNumber *sortOrderPref;
     NSNumber *numPreviewLinesPref;
 }
 
+@property (nonatomic, strong) PasskeyAuthenticator     *passkeyAuthenticator;
+
 @end
 
 extern NSString *const SPAlphabeticalTagSortPref;

diff --git a/Simplenote/SPAppDelegate+Extensions.swift b/Simplenote/SPAppDelegate+Extensions.swift
@@ -40,10 +40,6 @@ extension SPAppDelegate {
     func setupStoreManager() {
         StoreManager.shared.initialize()
     }
-
-    @objc func setupPasskeyAuthenticator() {
-        passkeyAuthenticator = PasskeyAuthenticator(authenticator: simperium.authenticator)
-    }
 }
 
 // MARK: - Internal Methods

diff --git a/Simplenote/SPAppDelegate.h b/Simplenote/SPAppDelegate.h
@@ -14,7 +14,6 @@
 @class PublishStateObserver;
 @class AccountDeletionController;
 @class CoreDataManager;
-@class PasskeyAuthenticator;
 
 NS_ASSUME_NONNULL_BEGIN
 
@@ -42,8 +41,6 @@ NS_ASSUME_NONNULL_BEGIN
 
 @property (nullable, strong, nonatomic) AccountDeletionController       *accountDeletionController;
 
-@property (strong, nonatomic) PasskeyAuthenticator *passkeyAuthenticator;
-
 - (void)presentSettingsViewController;
 
 - (void)save;

diff --git a/Simplenote/SPAppDelegate.m b/Simplenote/SPAppDelegate.m
@@ -123,7 +123,6 @@ - (BOOL)application:(UIApplication *)application willFinishLaunchingWithOptions:
     [self setupThemeNotifications];
     [self setupSimperium];
     [self setupAuthenticator];
-    [self setupPasskeyAuthenticator];
     [self setupAppCenter];
     [self setupCrashLogging];
     [self configureVersionsController];