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

fix bugs in the first startup

Browse source
This commit is contained in:
Bob Sun 2017-02-02 15:02:57 +08:00
parent 302f544ddb
commit dd36e87959
No known key found for this signature in database
GPG key ID: 1F86BA2052FED3B4
1 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

8
pass/PasswordStore.swift
View file

@ -43,7 +43,7 @@ class PasswordStore {
let storeURL = URL(fileURLWithPath: "\(Globals.shared.documentPath)/password-store") let storeURL = URL(fileURLWithPath: "\(Globals.shared.documentPath)/password-store")
var storeRepository: GTRepository? var storeRepository: GTRepository?
var gitCredential: GitCredential var gitCredential: GitCredential?
let pgp: ObjectivePGP = ObjectivePGP() let pgp: ObjectivePGP = ObjectivePGP()
@ -61,8 +61,10 @@ class PasswordStore {
} }
if Defaults[.gitRepositoryAuthenticationMethod] == "Password" { if Defaults[.gitRepositoryAuthenticationMethod] == "Password" {
gitCredential = GitCredential(credential: GitCredential.Credential.http(userName: Defaults[.gitRepositoryUsername], password: Defaults[.gitRepositoryPassword])) gitCredential = GitCredential(credential: GitCredential.Credential.http(userName: Defaults[.gitRepositoryUsername], password: Defaults[.gitRepositoryPassword]))
} else { } else if Defaults[.gitRepositoryAuthenticationMethod] == "SSH Key"{
gitCredential = GitCredential(credential: GitCredential.Credential.ssh(userName: Defaults[.gitRepositoryUsername], password: Defaults[.gitRepositorySSHPrivateKeyPassphrase]!, publicKeyFile: Globals.shared.sshPublicKeyPath, privateKeyFile: Globals.shared.sshPrivateKeyPath)) gitCredential = GitCredential(credential: GitCredential.Credential.ssh(userName: Defaults[.gitRepositoryUsername], password: Defaults[.gitRepositorySSHPrivateKeyPassphrase]!, publicKeyFile: Globals.shared.sshPublicKeyPath, privateKeyFile: Globals.shared.sshPrivateKeyPath))
} else {
gitCredential = nil
} }
} }
@ -120,7 +122,7 @@ class PasswordStore {
print("pullRepoisitory") print("pullRepoisitory")
do { do {
print("start pulling...") print("start pulling...")
let credentialProvider = try gitCredential.credentialProvider() let credentialProvider = try gitCredential!.credentialProvider()
let options: [String: Any] = [ let options: [String: Any] = [
GTRepositoryRemoteOptionsCredentialProvider: credentialProvider GTRepositoryRemoteOptionsCredentialProvider: credentialProvider
] ]