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

Show notification with OTP after providing password through extension (#509)

Browse source 
* Allow to do something with a password after providing it in the extension
* Make fields non-nil
* Show OTP in notification after providing a password through extension
This commit is contained in:
Danny Mösch 2021-09-20 09:50:05 +02:00 • committed by GitHub
parent 5057528ad9
commit 763cddf540
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
9 changed files with 67 additions and 69 deletions
Download patch file Download diff file Expand all files Collapse all files

7
pass/Controllers/PasswordNavigationViewController.swift
View file

@ -9,6 +9,7 @@
import passKit
import SVProgressHUD
import UIKit
import UserNotifications
extension UIStoryboard {
static var passwordNavigationViewController: PasswordNavigationViewController {
@ -75,6 +76,12 @@ class PasswordNavigationViewController: UIViewController {
configureTableView(in: parentPasswordEntity)
configureNotification()
configureSearchBar()
requestNotificationPermission()
}
private func requestNotificationPermission() {
let permissionOptions = UNAuthorizationOptions(arrayLiteral: .alert)
UNUserNotificationCenter.current().requestAuthorization(options: permissionOptions) { _, _ in }
}
override func viewWillAppear(_ animated: Bool) {

9
pass/Services/PasswordManager.swift
View file

@ -11,16 +11,13 @@ import SVProgressHUD
import UIKit
class PasswordManager {
weak var viewController: UIViewController?
private let viewController: UIViewController
init(viewController: UIViewController) {
self.viewController = viewController
}
func providePasswordPasteboard(with passwordPath: String) {
guard let viewController = viewController else {
return
}
decryptPassword(in: viewController, with: passwordPath) { password in
SecurePasteboard.shared.copy(textToCopy: password.password)
SVProgressHUD.setDefaultMaskType(.black)
@ -31,10 +28,6 @@ class PasswordManager {
}
func addPassword(with password: Password) {
guard let viewController = viewController else {
return
}
encryptPassword(in: viewController, with: password) {
SVProgressHUD.setDefaultMaskType(.black)
SVProgressHUD.setDefaultStyle(.light)

1
pass/de.lproj/Localizable.strings
View file

@ -22,6 +22,7 @@
"HmacBased" = "HMAC-basiert";
"None" = "Kein valides Token";
"ExpiresIn" = "(läuft in %ds ab)";
"OTPFor" = "Einmalpasswort für %@";
// General (error) messages
"Error" = "Fehler";

1
pass/en.lproj/Localizable.strings
View file

@ -22,6 +22,7 @@
"HmacBased" = "HMAC-based";
"None" = "None";
"ExpiresIn" = "(expires in %ds)";
"OTPFor" = "One-time Password for %@";
// General (error) messages
"Error" = "Error";

2
passAutoFillExtension/Controllers/CredentialProviderViewController.swift
View file

@ -19,7 +19,7 @@ class CredentialProviderViewController: ASCredentialProviderViewController {
}()
private lazy var credentialProvider: CredentialProvider = { [unowned self] in
CredentialProvider(viewController: self, extensionContext: extensionContext)
CredentialProvider(viewController: self, extensionContext: extensionContext, afterDecryption: Utils.showNotificationWithOTP)
}()
private lazy var passwordsTableEntries = PasswordStore.shared.fetchPasswordEntityCoreData(withDir: false)

60
passAutoFillExtension/Services/CredentialProvider.swift
View file

@ -10,13 +10,16 @@ import AuthenticationServices
import passKit
class CredentialProvider {
var identifier: ASCredentialServiceIdentifier?
weak var extensionContext: ASCredentialProviderExtensionContext?
weak var viewController: UIViewController?
private let viewController: UIViewController
private let extensionContext: ASCredentialProviderExtensionContext
private let afterDecryption: (Password) -> Void
init(viewController: UIViewController, extensionContext: ASCredentialProviderExtensionContext) {
var identifier: ASCredentialServiceIdentifier?
init(viewController: UIViewController, extensionContext: ASCredentialProviderExtensionContext, afterDecryption: @escaping (Password) -> Void) {
self.viewController = viewController
self.extensionContext = extensionContext
self.afterDecryption = afterDecryption
}
func credentials(for identity: ASPasswordCredentialIdentity) {
@ -24,50 +27,35 @@ class CredentialProvider {
return
}
provideCredentials(in: viewController, with: recordIdentifier) { credential in
guard let credential = credential else {
return
}
self.extensionContext?.completeRequest(withSelectedCredential: credential)
decryptPassword(in: viewController, with: recordIdentifier) { password in
self.extensionContext.completeRequest(withSelectedCredential: .from(password))
self.afterDecryption(password)
}
}
func persistAndProvideCredentials(with passwordPath: String) {
provideCredentials(in: viewController, with: passwordPath) { credential in
guard let credential = credential else {
decryptPassword(in: viewController, with: passwordPath) { password in
if let identifier = self.identifier {
ASCredentialIdentityStore.shared.getState { state in
guard state.isEnabled else {
return
}
guard let credentialIdentity = provideCredentialIdentity(for: self.identifier, user: credential.user, recordIdentifier: passwordPath) else {
self.extensionContext?.completeRequest(withSelectedCredential: credential)
return
}
let store = ASCredentialIdentityStore.shared
store.getState { state in
if state.isEnabled {
let credentialIdentity = ASPasswordCredentialIdentity(
serviceIdentifier: identifier,
user: password.getUsernameForCompletion(),
recordIdentifier: passwordPath
)
ASCredentialIdentityStore.shared.saveCredentialIdentities([credentialIdentity])
}
}
self.extensionContext?.completeRequest(withSelectedCredential: credential)
self.extensionContext.completeRequest(withSelectedCredential: .from(password))
self.afterDecryption(password)
}
}
}
private func provideCredentialIdentity(for identifier: ASCredentialServiceIdentifier?, user: String, recordIdentifier: String?) -> ASPasswordCredentialIdentity? {
guard let serviceIdentifier = identifier else {
return nil
}
return ASPasswordCredentialIdentity(serviceIdentifier: serviceIdentifier, user: user, recordIdentifier: recordIdentifier)
}
private func provideCredentials(in viewController: UIViewController?, with path: String, completion: @escaping ((ASPasswordCredential?) -> Void)) {
guard let viewController = viewController else {
return
}
decryptPassword(in: viewController, with: path) { password in
let username = password.getUsernameForCompletion()
let password = password.password
let credential = ASPasswordCredential(user: username, password: password)
completion(credential)
extension ASPasswordCredential {
static func from(_ password: Password) -> ASPasswordCredential {
ASPasswordCredential(user: password.getUsernameForCompletion(), password: password.password)
}
}

2
passExtension/Controllers/ExtensionViewController.swift
View file

@ -20,7 +20,7 @@ class ExtensionViewController: UIViewController {
}()
private lazy var credentialProvider: CredentialProvider = { [unowned self] in
CredentialProvider(viewController: self, extensionContext: extensionContext!)
CredentialProvider(viewController: self, extensionContext: extensionContext!, afterDecryption: Utils.showNotificationWithOTP)
}()
private lazy var passwordsTableEntries = PasswordStore.shared.fetchPasswordEntityCoreData(withDir: false)

32
passExtension/Services/CredentialProvider.swift
View file

@ -11,22 +11,17 @@ import passKit
import UIKit
class CredentialProvider {
weak var extensionContext: NSExtensionContext?
weak var viewController: UIViewController?
private let viewController: UIViewController
private let extensionContext: NSExtensionContext
private let afterDecryption: (Password) -> Void
init(viewController: UIViewController, extensionContext: NSExtensionContext) {
init(viewController: UIViewController, extensionContext: NSExtensionContext, afterDecryption: @escaping (Password) -> Void) {
self.viewController = viewController
self.extensionContext = extensionContext
self.afterDecryption = afterDecryption
}
func provideCredentialsFindLogin(with passwordPath: String) {
guard let viewController = viewController else {
return
}
guard let extensionContext = extensionContext else {
return
}
decryptPassword(in: viewController, with: passwordPath) { password in
let extensionItem = NSExtensionItem()
var returnDictionary = [
@ -37,30 +32,25 @@ class CredentialProvider {
returnDictionary[PassExtensionKey.totpKey] = totpPassword
}
extensionItem.attachments = [NSItemProvider(item: returnDictionary as NSSecureCoding, typeIdentifier: String(kUTTypePropertyList))]
extensionContext.completeRequest(returningItems: [extensionItem])
self.extensionContext.completeRequest(returningItems: [extensionItem])
self.afterDecryption(password)
}
}
func provideCredentialsBrowser(with passwordPath: String) {
guard let viewController = viewController else {
return
}
guard let extensionContext = extensionContext else {
return
}
decryptPassword(in: viewController, with: passwordPath) { password in
Utils.copyToPasteboard(textToCopy: password.password)
// return a dictionary for JavaScript for best-effor fill in
let extensionItem = NSExtensionItem()
let returnDictionary = [
NSExtensionJavaScriptFinalizeArgumentKey: [
"username": password.getUsernameForCompletion(),
"password": password.password,
PassExtensionKey.usernameKey: password.getUsernameForCompletion(),
PassExtensionKey.passwordKey: password.password,
],
]
extensionItem.attachments = [NSItemProvider(item: returnDictionary as NSSecureCoding, typeIdentifier: String(kUTTypePropertyList))]
extensionContext.completeRequest(returningItems: [extensionItem])
self.extensionContext.completeRequest(returningItems: [extensionItem])
self.afterDecryption(password)
}
}
}

18
passKit/Helpers/Utils.swift
View file

@ -70,4 +70,22 @@ public enum Utils {
return passphrase
}
}
public static func showNotificationWithOTP(password: Password) {
guard let otp = password.currentOtp else {
return
}
let notificationCenter = UNUserNotificationCenter.current()
notificationCenter.getNotificationSettings { state in
guard state.authorizationStatus == .authorized else {
return
}
let content = UNMutableNotificationContent()
content.title = "OTPFor".localize(password.name)
content.body = otp
let trigger = UNTimeIntervalNotificationTrigger(timeInterval: 1, repeats: false)
let request = UNNotificationRequest(identifier: "otpNotification", content: content, trigger: trigger)
notificationCenter.add(request)
}
}
}