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

Refactor the request credential function

Browse source
This commit is contained in:
Mingshen Sun 2019-11-30 22:39:21 -08:00
parent 902930ddfc
commit 2f3e51947a
No known key found for this signature in database
GPG key ID: 1F86BA2052FED3B4
4 changed files with 90 additions and 107 deletions
Download patch file Download diff file Expand all files Collapse all files

43
passKit/Models/GitCredential.swift
View file

@ -8,6 +8,43 @@
import Foundation
import ObjectiveGit
import SVProgressHUD
public func requestCredentialPassword(credential: GitCredential.Credential,
lastPassword: String?,
controller: UIViewController) -> String? {
let sem = DispatchSemaphore(value: 0)
var password: String?
let message: String = {
switch credential {
case .http:
return "FillInGitAccountPassword.".localize()
case .ssh:
return "FillInSshKeyPassphrase.".localize()
}
}()
DispatchQueue.main.async {
SVProgressHUD.dismiss()
let alert = UIAlertController(title: "Password".localize(), message: message, preferredStyle: .alert)
alert.addTextField() {
$0.text = lastPassword ?? ""
$0.isSecureTextEntry = true
}
alert.addAction(UIAlertAction(title: "Ok".localize(), style: .default) { _ in
password = alert.textFields?.first?.text
sem.signal()
})
alert.addAction(UIAlertAction(title: "Cancel".localize(), style: .cancel) { _ in
password = nil
sem.signal()
})
controller.present(alert, animated: true)
}
let _ = sem.wait(timeout: .distantFuture)
return password
}
public struct GitCredential {
private var credential: Credential
@ -22,7 +59,7 @@ public struct GitCredential {
self.credential = credential
}
public func credentialProvider(requestGitPassword: @escaping (Credential, String?) -> String?) throws -> GTCredentialProvider {
public func credentialProvider(requestCredentialPassword: @escaping (Credential, String?) -> String?) throws -> GTCredentialProvider {
var attempts = 0
return GTCredentialProvider { (_, _, _) -> (GTCredential?) in
var credential: GTCredential? = nil
@ -35,7 +72,7 @@ public struct GitCredential {
}
var lastPassword = self.passwordStore.gitPassword
if lastPassword == nil || attempts != 0 {
if let requestedPassword = requestGitPassword(self.credential, lastPassword) {
if let requestedPassword = requestCredentialPassword(self.credential, lastPassword) {
if SharedDefaults[.isRememberGitCredentialPassphraseOn] {
self.passwordStore.gitPassword = requestedPassword
}
@ -53,7 +90,7 @@ public struct GitCredential {
}
var lastPassword = self.passwordStore.gitSSHPrivateKeyPassphrase
if lastPassword == nil || attempts != 0 {
if let requestedPassword = requestGitPassword(self.credential, lastPassword) {
if let requestedPassword = requestCredentialPassword(self.credential, lastPassword) {
if SharedDefaults[.isRememberGitCredentialPassphraseOn] {
self.passwordStore.gitSSHPrivateKeyPassphrase = requestedPassword
}