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

Fix issues when no PGP passphase and enabling passcode

Browse source
This commit is contained in:
Mingshen Sun 2021-01-03 17:38:02 -08:00
parent 29d74c48e5
commit 1f2a0e5458
No known key found for this signature in database
GPG key ID: 1F86BA2052FED3B4
4 changed files with 62 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

46
passAutoFillExtension/Services/CredentialProvider.swift
View file

@ -23,28 +23,32 @@ class CredentialProvider {
guard let recordIdentifier = identity.recordIdentifier else {
return
}
guard let pwCredentials = provideCredentials(in: viewController, with: recordIdentifier) else {
return
}
extensionContext?.completeRequest(withSelectedCredential: pwCredentials)
provideCredentials(in: viewController, with: recordIdentifier) { credential in
guard let credential = credential else {
return
}
self.extensionContext?.completeRequest(withSelectedCredential: credential)
}
}
func persistAndProvideCredentials(with passwordPath: String) {
guard let pwCredentials = provideCredentials(in: viewController, with: passwordPath) else {
return
}
guard let credentialIdentity = provideCredentialIdentity(for: identifier, user: pwCredentials.user, recordIdentifier: passwordPath) else {
return
}
let store = ASCredentialIdentityStore.shared
store.getState { state in
if state.isEnabled {
ASCredentialIdentityStore.shared.saveCredentialIdentities([credentialIdentity])
provideCredentials(in: viewController, with: passwordPath) { credential in
guard let credential = credential else {
return
}
guard let credentialIdentity = provideCredentialIdentity(for: self.identifier, user: credential.user, recordIdentifier: passwordPath) else {
return
}
let store = ASCredentialIdentityStore.shared
store.getState { state in
if state.isEnabled {
ASCredentialIdentityStore.shared.saveCredentialIdentities([credentialIdentity])
}
}
self.extensionContext?.completeRequest(withSelectedCredential: credential)
}
extensionContext?.completeRequest(withSelectedCredential: pwCredentials)
}
}
@ -55,16 +59,14 @@ private func provideCredentialIdentity(for identifier: ASCredentialServiceIdenti
return ASPasswordCredentialIdentity(serviceIdentifier: serviceIdentifier, user: user, recordIdentifier: recordIdentifier)
}
private func provideCredentials(in viewController: UIViewController?, with path: String) -> ASPasswordCredential? {
print(path)
private func provideCredentials(in viewController: UIViewController?, with path: String, completion: @escaping ((ASPasswordCredential?) -> Void)) {
guard let viewController = viewController else {
return nil
return
}
var credential: ASPasswordCredential?
decryptPassword(in: viewController, with: path) { password in
let username = password.getUsernameForCompletion()
let password = password.password
credential = ASPasswordCredential(user: username, password: password)
let credential = ASPasswordCredential(user: username, password: password)
completion(credential)
}
return credential
}