Silverfish/proton-bridge
1
0
Fork 1
mirror of https://github.com/ProtonMail/proton-bridge.git synced 2025-12-18 08:06:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

GODT-1166: Reduce the number of auth for live test

Browse Source 
- Changed: Do not reauth controller clients.
- Changed: Verbosisty is set only once before run
- Changed: AddUser takes TestAccount as argument
- Added: Setup/clean up before/after test run
- Added: Access to the current refresh token from pmapi.Client interface.
- Added: Context function to add test a user to bridge without login, just call users.FinishLogin.
- Added: PMAPIController.GetAuthClient returns authenticated client for username.
- Added: Persistent clients does not loggout after every scenario.
- Changed: Disabled no-internet tests.
This commit is contained in:
Jakub
2021-05-19 09:57:36 +02:00
committed by Jakub Cuth
parent 5bf359d34f
commit 0c6a098af9
25 changed files with 334 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
test/liveapi/users.go
View File

@ -21,43 +21,42 @@ import (
"context"
"github.com/ProtonMail/proton-bridge/pkg/pmapi"
"github.com/ProtonMail/proton-bridge/test/accounts"
"github.com/cucumber/godog"
"github.com/pkg/errors"
)
func (ctl *Controller) AddUser(user *pmapi.User, addresses *pmapi.AddressList, password []byte, twoFAEnabled bool) error {
if twoFAEnabled {
func (ctl *Controller) AddUser(account *accounts.TestAccount) error {
if account.IsTwoFAEnabled() {
return godog.ErrPending
}
client, _, err := ctl.clientManager.NewClientWithLogin(context.Background(), user.Name, password)
client, err := addPersistentClient(account.User().Name, account.Password(), account.MailboxPassword())
if err != nil {
return errors.Wrap(err, "failed to create new client")
return errors.Wrap(err, "failed to add persistent client")
}
salt, err := client.AuthSalt(context.Background())
if err != nil {
return errors.Wrap(err, "failed to get salt")
}
mailboxPassword, err := pmapi.HashMailboxPassword(password, salt)
if err != nil {
return errors.Wrap(err, "failed to hash mailbox password")
}
if err := client.Unlock(context.Background(), mailboxPassword); err != nil {
return errors.Wrap(err, "failed to unlock user")
}
if err := cleanup(client, addresses); err != nil {
if err := cleanup(client, account.Addresses()); err != nil {
return errors.Wrap(err, "failed to clean user")
}
ctl.pmapiByUsername[user.Name] = client
return nil
}
func (ctl *Controller) ReorderAddresses(user *pmapi.User, addressIDs []string) error {
return ctl.pmapiByUsername[user.Name].ReorderAddresses(context.Background(), addressIDs)
client, err := getPersistentClient(user.Name)
if err != nil {
return err
}
return client.ReorderAddresses(context.Background(), addressIDs)
}
func (ctl *Controller) GetAuthClient(username string) pmapi.Client {
client, err := getPersistentClient(username)
if err != nil {
ctl.log.WithError(err).
WithField("username", username).
Fatal("Cannot get authenticated client")
}
return client
}