yesBad/proton-bridge
1
0
Fork 0
forked from Silverfish/proton-bridge
Code Actions Activity

feat: migrate to gopenpgp v2

Browse Source
This commit is contained in:
James Houlahan
2020-06-05 09:33:37 +02:00
parent de16f6f2d1
commit c19bb0fa97
54 changed files with 928 additions and 684 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
test/accounts/account.go
View File

@ -29,9 +29,8 @@ import (
)
const (
testUserKey = "user_key.json"
testAddressKey = "address_key.json"
testKeyPassphrase = "testpassphrase"
testUserKey = "user_key.json"
testAddressKey = "address_key.json"
)
type TestAccount struct {
@ -78,14 +77,9 @@ func newTestAccount(
}
func (a *TestAccount) initKeys() {
if a.user.Keys.Keys != nil {
return
}
userKeys := loadPMKeys(readTestFile(testUserKey))
_ = userKeys.KeyRing.Unlock([]byte(testKeyPassphrase))
addressKeys := loadPMKeys(readTestFile(testAddressKey))
_ = addressKeys.KeyRing.Unlock([]byte(testKeyPassphrase))
a.user.Keys = *userKeys
for _, addressEmail := range a.Addresses().ActiveEmails() {

32
test/accounts/fake.json
View File

@ -27,7 +27,8 @@
"ID": "userAddress",
"Email": "user@pm.me",
"Order": 1,
"Receive": 1
"Receive": 1,
"HasKeys": 1
}
},
"user2fa": {
@ -35,7 +36,8 @@
"ID": "user2faAddress",
"Email": "user@pm.me",
"Order": 1,
"Receive": 1
"Receive": 1,
"HasKeys": 1
}
},
"userAddressWithCapitalLetter": {
@ -43,7 +45,8 @@
"ID": "userAddressWithCapitalLetterAddress",
"Email": "uSeR@pm.me",
"Order": 1,
"Receive": 1
"Receive": 1,
"HasKeys": 1
}
},
"userMoreAddresses": {
@ -51,13 +54,15 @@
"ID": "primary",
"Email": "primaryaddress@pm.me",
"Order": 1,
"Receive": 1
"Receive": 1,
"HasKeys": 1
},
"secondary": {
"ID": "secondary",
"Email": "secondaryaddress@pm.me",
"Order": 2,
"Receive": 1
"Receive": 1,
"HasKeys": 1
},
"disabled": {
"ID": "disabled",
@ -75,9 +80,10 @@
},
"secondary": {
"ID": "secondary",
"Email": "user@pm.me",
"Email": "secondaryaddress@pm.me",
"Order": 2,
"Receive": 1
"Receive": 1,
"HasKeys": 1
}
}
},
@ -89,11 +95,11 @@
"userDisabledPrimaryAddress": "password"
},
"mailboxPasswords": {
"user": "password",
"user2fa": "password",
"userAddressWithCapitalLetter": "password",
"userMoreAddresses": "password",
"userDisabledPrimaryAddress": "password"
"user": "testpassphrase",
"user2fa": "testpassphrase",
"userAddressWithCapitalLetter": "testpassphrase",
"userMoreAddresses": "testpassphrase",
"userDisabledPrimaryAddress": "testpassphrase"
},
"twoFAs": {
"user": false,
@ -102,4 +108,4 @@
"userMoreAddresses": false,
"userDisabledPrimaryAddress": false
}
}
}