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

Refactor GitCredential to simplify it and to add tests

Browse source
This commit is contained in:
Danny Moesch 2020-08-23 01:15:23 +02:00 • committed by Mingshen Sun
parent 56b7b24fce
commit 6044098278
11 changed files with 295 additions and 225 deletions
Download patch file Download diff file Expand all files Collapse all files

16
passShortcuts/SyncRepositoryIntentHandler.swift
View file

@ -14,13 +14,11 @@ public class SyncRepositoryIntentHandler: NSObject, SyncRepositoryIntentHandling
private let keychain = AppKeychain.shared
private var gitCredential: GitCredential {
switch Defaults.gitAuthenticationMethod {
case .password:
return GitCredential(credential: .http(userName: Defaults.gitUsername))
case .key:
let privateKey: String = keychain.get(for: SshKey.PRIVATE.getKeychainKey()) ?? ""
return GitCredential(credential: .ssh(userName: Defaults.gitUsername, privateKey: privateKey))
}
GitCredential.from(
authenticationMethod: Defaults.gitAuthenticationMethod,
userName: Defaults.gitUsername,
keyStore: keychain
)
}
public func handle(intent _: SyncRepositoryIntent, completion: @escaping (SyncRepositoryIntentResponse) -> Void) {
@ -33,14 +31,14 @@ public class SyncRepositoryIntentHandler: NSObject, SyncRepositoryIntentHandling
return
}
do {
try passwordStore.pullRepository(credential: gitCredential, requestCredentialPassword: { _, _ in nil }, progressBlock: { _, _ in })
try passwordStore.pullRepository(options: gitCredential.getCredentialOptions())
} catch {
completion(SyncRepositoryIntentResponse(code: .pullFailed, userActivity: nil))
return
}
if passwordStore.numberOfLocalCommits > 0 {
do {
try passwordStore.pushRepository(credential: gitCredential, requestCredentialPassword: { _, _ in nil }, transferProgressBlock: { _, _, _, _ in })
try passwordStore.pushRepository(options: gitCredential.getCredentialOptions())
} catch {
completion(SyncRepositoryIntentResponse(code: .pushFailed, userActivity: nil))
return