Merge branch 'anya/fix-autofill-auth-issue' into hotfix/7.88.1-changes

duckduckgo · Sep 11, 2023 · f7bade3 · f7bade3
2 parents 40402c4 + 04002f3
commit f7bade3
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/DuckDuckGo/AutofillLoginDetailsViewController.swift b/DuckDuckGo/AutofillLoginDetailsViewController.swift
@@ -109,7 +109,7 @@ class AutofillLoginDetailsViewController: UIViewController {
 
     override func viewDidAppear(_ animated: Bool) {
         super.viewDidAppear(animated)
-        if !authenticationNotRequired {
+        if !authenticationNotRequired && authenticator.state == .loggedIn {
             authenticator.authenticate()
         }
     }

diff --git a/DuckDuckGo/AutofillLoginSettingsListViewController.swift b/DuckDuckGo/AutofillLoginSettingsListViewController.swift
@@ -149,7 +149,7 @@ final class AutofillLoginSettingsListViewController: UIViewController {
 
     override func viewWillDisappear(_ animated: Bool) {
         super.viewWillDisappear(animated)
-        if viewModel.authenticator.canAuthenticate() {
+        if viewModel.authenticator.canAuthenticate() && viewModel.authenticator.state == .loggedIn {
             AppDependencyProvider.shared.autofillLoginSession.startSession()
         }
     }