From 9a37010c1c858caf8a403c929b5b2f47bc5115fe Mon Sep 17 00:00:00 2001 From: Lukasz Janyst Date: Wed, 11 May 2022 18:25:45 +0200 Subject: [PATCH] tests: Adjust the tests to the new credentials layout --- pkg/users/user_credentials_test.go | 6 +-- pkg/users/user_new_test.go | 2 +- pkg/users/users_login_test.go | 16 ++++---- pkg/users/users_new_test.go | 2 +- pkg/users/users_test.go | 60 +++++++++++++++++------------- 5 files changed, 47 insertions(+), 39 deletions(-) diff --git a/pkg/users/user_credentials_test.go b/pkg/users/user_credentials_test.go index b9a248a..6893db0 100644 --- a/pkg/users/user_credentials_test.go +++ b/pkg/users/user_credentials_test.go @@ -37,7 +37,7 @@ func TestUpdateUser(t *testing.T) { gomock.InOrder( m.pmapiClient.EXPECT().UpdateUser(gomock.Any()).Return(testPMAPIUser, nil), - m.pmapiClient.EXPECT().ReloadKeys(gomock.Any(), testCredentials.MailboxPassword).Return(nil), + m.pmapiClient.EXPECT().ReloadKeys(gomock.Any(), testCredentials.Secret.MailboxPassword).Return(nil), m.pmapiClient.EXPECT().Addresses().Return([]*pmapi.Address{testPMAPIAddress}), m.credentialsStore.EXPECT().UpdateEmails("user", []string{testPMAPIAddress.Email}).Return(testCredentials, nil), @@ -88,7 +88,7 @@ func TestCheckBridgeLogin(t *testing.T) { user := testNewUser(t, m) defer cleanUpUserData(user) - err := user.CheckBridgeLogin(testCredentials.BridgePassword) + err := user.CheckBridgeLogin(testCredentials.Secret.BridgePassword) r.NoError(t, err) } @@ -111,7 +111,7 @@ func TestCheckBridgeLoginLoggedOut(t *testing.T) { r.Error(t, err) defer cleanUpUserData(user) - err = user.CheckBridgeLogin(testCredentialsDisconnected.BridgePassword) + err = user.CheckBridgeLogin(testCredentialsDisconnected.Secret.BridgePassword) r.Equal(t, ErrLoggedOutUser, err) } diff --git a/pkg/users/user_new_test.go b/pkg/users/user_new_test.go index 65ba8d9..b72019c 100644 --- a/pkg/users/user_new_test.go +++ b/pkg/users/user_new_test.go @@ -47,7 +47,7 @@ func TestNewUserUnlockFails(t *testing.T) { m.credentialsStore.EXPECT().Get("user").Return(testCredentials, nil), m.pmapiClient.EXPECT().AddAuthRefreshHandler(gomock.Any()), m.pmapiClient.EXPECT().IsUnlocked().Return(false), - m.pmapiClient.EXPECT().Unlock(gomock.Any(), testCredentials.MailboxPassword).Return(pmapi.ErrUnlockFailed{OriginalError: errors.New("bad password")}), + m.pmapiClient.EXPECT().Unlock(gomock.Any(), testCredentials.Secret.MailboxPassword).Return(pmapi.ErrUnlockFailed{OriginalError: errors.New("bad password")}), // Handle of unlock error. m.pmapiClient.EXPECT().AuthDelete(gomock.Any()).Return(nil), diff --git a/pkg/users/users_login_test.go b/pkg/users/users_login_test.go index 8d48d3e..574b7cb 100644 --- a/pkg/users/users_login_test.go +++ b/pkg/users/users_login_test.go @@ -35,9 +35,9 @@ func TestUsersFinishLoginBadMailboxPassword(t *testing.T) { // Set up mocks for FinishLogin. m.pmapiClient.EXPECT().AuthSalt(gomock.Any()).Return("", nil) - m.pmapiClient.EXPECT().Unlock(gomock.Any(), testCredentials.MailboxPassword).Return(errors.New("no keys could be unlocked")) + m.pmapiClient.EXPECT().Unlock(gomock.Any(), testCredentials.Secret.MailboxPassword).Return(errors.New("no keys could be unlocked")) - checkUsersFinishLogin(t, m, testAuthRefresh, testCredentials.MailboxPassword, "", ErrWrongMailboxPassword) + checkUsersFinishLogin(t, m, testAuthRefresh, testCredentials.Secret.MailboxPassword, "", ErrWrongMailboxPassword) } func TestUsersFinishLoginNewUser(t *testing.T) { @@ -50,7 +50,7 @@ func TestUsersFinishLoginNewUser(t *testing.T) { mockAddingConnectedUser(t, m) mockEventLoopNoAction(m) - checkUsersFinishLogin(t, m, testAuthRefresh, testCredentials.MailboxPassword, testCredentials.UserID, nil) + checkUsersFinishLogin(t, m, testAuthRefresh, testCredentials.Secret.MailboxPassword, testCredentials.UserID, nil) } func TestUsersFinishLoginExistingDisconnectedUser(t *testing.T) { @@ -64,10 +64,10 @@ func TestUsersFinishLoginExistingDisconnectedUser(t *testing.T) { // Mock process of FinishLogin of already added user. gomock.InOrder( m.pmapiClient.EXPECT().AuthSalt(gomock.Any()).Return("", nil), - m.pmapiClient.EXPECT().Unlock(gomock.Any(), testCredentials.MailboxPassword).Return(nil), + m.pmapiClient.EXPECT().Unlock(gomock.Any(), testCredentials.Secret.MailboxPassword).Return(nil), m.pmapiClient.EXPECT().CurrentUser(gomock.Any()).Return(testPMAPIUserDisconnected, nil), m.credentialsStore.EXPECT().UpdateToken(testCredentialsDisconnected.UserID, testAuthRefresh.UID, testAuthRefresh.RefreshToken).Return(testCredentials, nil), - m.credentialsStore.EXPECT().UpdatePassword(testCredentialsDisconnected.UserID, testCredentials.MailboxPassword).Return(testCredentials, nil), + m.credentialsStore.EXPECT().UpdatePassword(testCredentialsDisconnected.UserID, testCredentials.Secret.MailboxPassword).Return(testCredentials, nil), ) mockInitConnectedUser(t, m) mockEventLoopNoAction(m) @@ -80,7 +80,7 @@ func TestUsersFinishLoginExistingDisconnectedUser(t *testing.T) { RefreshToken: "ref", }, } - checkUsersFinishLogin(t, m, authRefresh, testCredentials.MailboxPassword, testCredentialsDisconnected.UserID, nil) + checkUsersFinishLogin(t, m, authRefresh, testCredentials.Secret.MailboxPassword, testCredentialsDisconnected.UserID, nil) } func TestUsersFinishLoginConnectedUser(t *testing.T) { @@ -95,7 +95,7 @@ func TestUsersFinishLoginConnectedUser(t *testing.T) { // Mock process of FinishLogin of already connected user. gomock.InOrder( m.pmapiClient.EXPECT().AuthSalt(gomock.Any()).Return("", nil), - m.pmapiClient.EXPECT().Unlock(gomock.Any(), testCredentials.MailboxPassword).Return(nil), + m.pmapiClient.EXPECT().Unlock(gomock.Any(), testCredentials.Secret.MailboxPassword).Return(nil), m.pmapiClient.EXPECT().CurrentUser(gomock.Any()).Return(testPMAPIUser, nil), m.pmapiClient.EXPECT().AuthDelete(gomock.Any()).Return(nil), ) @@ -103,7 +103,7 @@ func TestUsersFinishLoginConnectedUser(t *testing.T) { users := testNewUsers(t, m) defer cleanUpUsersData(users) - _, err := users.FinishLogin(m.pmapiClient, testAuthRefresh, testCredentials.MailboxPassword) + _, err := users.FinishLogin(m.pmapiClient, testAuthRefresh, testCredentials.Secret.MailboxPassword) r.EqualError(t, err, "user is already connected") } diff --git a/pkg/users/users_new_test.go b/pkg/users/users_new_test.go index c9c98b1..5b15adc 100644 --- a/pkg/users/users_new_test.go +++ b/pkg/users/users_new_test.go @@ -85,7 +85,7 @@ func TestNewUsersWithConnectedUserWithBadToken(t *testing.T) { m.clientManager.EXPECT().NewClient("uid", "", "acc", time.Time{}).Return(m.pmapiClient) m.pmapiClient.EXPECT().AddAuthRefreshHandler(gomock.Any()) m.pmapiClient.EXPECT().IsUnlocked().Return(false) - m.pmapiClient.EXPECT().Unlock(gomock.Any(), testCredentials.MailboxPassword).Return(pmapi.ErrAuthFailed{OriginalError: errors.New("not authorized")}) + m.pmapiClient.EXPECT().Unlock(gomock.Any(), testCredentials.Secret.MailboxPassword).Return(pmapi.ErrAuthFailed{OriginalError: errors.New("not authorized")}) m.pmapiClient.EXPECT().AuthDelete(gomock.Any()) m.credentialsStore.EXPECT().List().Return([]string{"user"}, nil) diff --git a/pkg/users/users_test.go b/pkg/users/users_test.go index 700af4a..71238a1 100644 --- a/pkg/users/users_test.go +++ b/pkg/users/users_test.go @@ -62,39 +62,47 @@ var ( } testCredentials = &credentials.Credentials{ //nolint[gochecknoglobals] - UserID: "user", - Name: "username", - Emails: []string{"user@pm.me"}, - APIToken: "uid:acc", - MailboxPassword: []byte("pass"), - BridgePassword: "0123456789abcdef", + UserID: "user", + Name: "username", + Emails: []string{"user@pm.me"}, + Secret: credentials.Secret{ + APIToken: "uid:acc", + MailboxPassword: []byte("pass"), + BridgePassword: "0123456789abcdef", + }, } testCredentialsSplit = &credentials.Credentials{ //nolint[gochecknoglobals] - UserID: "users", - Name: "usersname", - Emails: []string{"users@pm.me", "anotheruser@pm.me", "alsouser@pm.me"}, - APIToken: "uid:acc", - MailboxPassword: []byte("pass"), - BridgePassword: "0123456789abcdef", + UserID: "users", + Name: "usersname", + Emails: []string{"users@pm.me", "anotheruser@pm.me", "alsouser@pm.me"}, + Secret: credentials.Secret{ + APIToken: "uid:acc", + MailboxPassword: []byte("pass"), + BridgePassword: "0123456789abcdef", + }, } testCredentialsDisconnected = &credentials.Credentials{ //nolint[gochecknoglobals] - UserID: "userDisconnected", - Name: "username", - Emails: []string{"user@pm.me"}, - APIToken: "", - MailboxPassword: []byte{}, - BridgePassword: "0123456789abcdef", + UserID: "userDisconnected", + Name: "username", + Emails: []string{"user@pm.me"}, + Secret: credentials.Secret{ + APIToken: "", + MailboxPassword: []byte{}, + BridgePassword: "0123456789abcdef", + }, } testCredentialsSplitDisconnected = &credentials.Credentials{ //nolint[gochecknoglobals] - UserID: "usersDisconnected", - Name: "usersname", - Emails: []string{"users@pm.me", "anotheruser@pm.me", "alsouser@pm.me"}, - APIToken: "", - MailboxPassword: []byte{}, - BridgePassword: "0123456789abcdef", + UserID: "usersDisconnected", + Name: "usersname", + Emails: []string{"users@pm.me", "anotheruser@pm.me", "alsouser@pm.me"}, + Secret: credentials.Secret{ + APIToken: "", + MailboxPassword: []byte{}, + BridgePassword: "0123456789abcdef", + }, } usedSpace = int64(1048576) @@ -244,10 +252,10 @@ func mockAddingConnectedUser(t *testing.T, m mocks) { gomock.InOrder( // Mock of users.FinishLogin. m.pmapiClient.EXPECT().AuthSalt(gomock.Any()).Return("", nil), - m.pmapiClient.EXPECT().Unlock(gomock.Any(), testCredentials.MailboxPassword).Return(nil), + m.pmapiClient.EXPECT().Unlock(gomock.Any(), testCredentials.Secret.MailboxPassword).Return(nil), m.pmapiClient.EXPECT().CurrentUser(gomock.Any()).Return(testPMAPIUser, nil), m.pmapiClient.EXPECT().Addresses().Return([]*pmapi.Address{testPMAPIAddress}), - m.credentialsStore.EXPECT().Add("user", "username", testAuthRefresh.UID, testAuthRefresh.RefreshToken, testCredentials.MailboxPassword, []string{testPMAPIAddress.Email}).Return(testCredentials, nil), + m.credentialsStore.EXPECT().Add("user", "username", testAuthRefresh.UID, testAuthRefresh.RefreshToken, testCredentials.Secret.MailboxPassword, []string{testPMAPIAddress.Email}).Return(testCredentials, nil), m.credentialsStore.EXPECT().Get("user").Return(testCredentials, nil), )