lysann/passforios
1
0
Fork 0
Code Issues Pull requests Activity

Present lock view only if needed for an action

Browse source 
* Do not present lock view in 'viewDidLoad' since this might be too early for an extension ("Not running foreground").
* Instead, show it for actions requiring authentication, e.g. showing the password list or providing a password, or only in 'viewDidAppear'.
* Refactor and lazily load other view controllers and data.
* Let credential providing view controllers decide when to hide themselves.
This commit is contained in:
Danny Moesch 2021-08-27 23:34:30 +02:00 • committed by Mingshen Sun
parent 942f462db8
commit bc2d9aa8e8
4 changed files with 67 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

58
passAutoFillExtension/Controllers/CredentialProviderViewController.swift
View file

@ -10,36 +10,44 @@ import AuthenticationServices
import passKit
class CredentialProviderViewController: ASCredentialProviderViewController {
var passcodelock: PasscodeExtensionDisplay {
private lazy var passcodelock: PasscodeExtensionDisplay = { [unowned self] in
PasscodeExtensionDisplay(extensionContext: extensionContext)
}
}()
var embeddedNavigationController: UINavigationController {
children.first as! UINavigationController
}
private lazy var passwordsViewController: PasswordsViewController = {
(children.first as! UINavigationController).viewControllers.first as! PasswordsViewController
}()
var passwordsViewController: PasswordsViewController {
embeddedNavigationController.viewControllers.first as! PasswordsViewController
}
private lazy var credentialProvider: CredentialProvider = { [unowned self] in
CredentialProvider(viewController: self, extensionContext: extensionContext)
}()
lazy var credentialProvider = CredentialProvider(viewController: self, extensionContext: self.extensionContext)
private lazy var passwordsTableEntries = PasswordStore.shared.fetchPasswordEntityCoreData(withDir: false)
.map(PasswordTableEntry.init(_:))
override func viewDidLoad() {
super.viewDidLoad()
passcodelock.presentPasscodeLockIfNeeded(self)
let passwordsTableEntries = PasswordStore.shared.fetchPasswordEntityCoreData(withDir: false).compactMap { PasswordTableEntry($0) }
let dataSource = PasswordsTableDataSource(entries: passwordsTableEntries)
passwordsViewController.dataSource = dataSource
passwordsViewController.dataSource = PasswordsTableDataSource(entries: passwordsTableEntries)
passwordsViewController.selectionDelegate = self
passwordsViewController.navigationItem.leftBarButtonItem = UIBarButtonItem(barButtonSystemItem: .cancel, target: self, action: #selector(cancel))
passwordsViewController.navigationItem.leftBarButtonItem = UIBarButtonItem(
barButtonSystemItem: .cancel,
target: self,
action: #selector(cancel)
)
}
override func prepareCredentialList(for serviceIdentifiers: [ASCredentialServiceIdentifier]) {
credentialProvider.identifier = serviceIdentifiers.first
let url = serviceIdentifiers.first.flatMap { URL(string: $0.identifier) }
passwordsViewController.navigationItem.prompt = url?.host
passwordsViewController.showPasswordsWithSuggestion(matching: url?.host ?? "")
passcodelock.presentPasscodeLockIfNeeded(self) {
self.view.isHidden = true
} after: { [unowned self] in
self.view.isHidden = false
self.credentialProvider.identifier = serviceIdentifiers.first
let url = serviceIdentifiers.first
.map(\.identifier)
.flatMap(URL.init(string:))
self.passwordsViewController.navigationItem.prompt = url?.host
self.passwordsViewController.showPasswordsWithSuggestion(matching: url?.host ?? "")
}
}
override func provideCredentialWithoutUserInteraction(for credentialIdentity: ASPasswordCredentialIdentity) {
@ -55,9 +63,11 @@ class CredentialProviderViewController: ASCredentialProviderViewController {
guard let identifier = credentialIdentity.recordIdentifier else {
return
}
credentialProvider.identifier = credentialIdentity.serviceIdentifier
passwordsViewController.navigationItem.prompt = identifier
passwordsViewController.showPasswordsWithSuggestion(matching: identifier)
passcodelock.presentPasscodeLockIfNeeded(self, after: { [unowned self] in
self.credentialProvider.identifier = credentialIdentity.serviceIdentifier
self.passwordsViewController.navigationItem.prompt = identifier
self.passwordsViewController.showPasswordsWithSuggestion(matching: identifier)
})
}
@objc
@ -68,8 +78,6 @@ class CredentialProviderViewController: ASCredentialProviderViewController {
extension CredentialProviderViewController: PasswordSelectionDelegate {
func selected(password: PasswordTableEntry) {
let passwordEntity = password.passwordEntity
credentialProvider.persistAndProvideCredentials(with: passwordEntity.getPath())
credentialProvider.persistAndProvideCredentials(with: password.passwordEntity.getPath())
}
}