diff options
author | Christopher Speller <crspeller@gmail.com> | 2017-04-27 10:55:03 -0400 |
---|---|---|
committer | Joram Wilander <jwawilander@gmail.com> | 2017-04-27 10:55:03 -0400 |
commit | 9a87bb3af68216b53ee8f89d6604c715c7b85b2d (patch) | |
tree | 8c06aed890f388b228f3aefb8e398309bc73c0b9 /app/email_test.go | |
parent | 0e007e344bf10993529711f14c4168365c3504c3 (diff) | |
download | chat-9a87bb3af68216b53ee8f89d6604c715c7b85b2d.tar.gz chat-9a87bb3af68216b53ee8f89d6604c715c7b85b2d.tar.bz2 chat-9a87bb3af68216b53ee8f89d6604c715c7b85b2d.zip |
Creating common token store and moving email invites and verification to it (#6213)
Diffstat (limited to 'app/email_test.go')
-rw-r--r-- | app/email_test.go | 26 |
1 files changed, 17 insertions, 9 deletions
diff --git a/app/email_test.go b/app/email_test.go index 3f57c54f9..b1aa9976c 100644 --- a/app/email_test.go +++ b/app/email_test.go @@ -62,17 +62,17 @@ func TestSendChangeUsernameEmail(t *testing.T) { func TestSendEmailChangeVerifyEmail(t *testing.T) { Setup() - var userId string = "5349853498543jdfvndf9834" var newUserEmail string = "newtest@example.com" var locale string = "en" var siteURL string = "" var expectedPartialMessage string = "You updated your email" var expectedSubject string = "[" + utils.Cfg.TeamSettings.SiteName + "] Verify new email address" + var token string = "TEST_TOKEN" //Delete all the messages before check the sample email utils.DeleteMailBox(newUserEmail) - if err := SendEmailChangeVerifyEmail(userId, newUserEmail, locale, siteURL); err != nil { + if err := SendEmailChangeVerifyEmail(newUserEmail, locale, siteURL, token); err != nil { t.Log(err) t.Fatal("Should send change username email") } else { @@ -160,17 +160,17 @@ func TestSendEmailChangeEmail(t *testing.T) { func TestSendVerifyEmail(t *testing.T) { Setup() - var userId string = "5349853498543jdfvndf9834" var userEmail string = "test@example.com" var locale string = "en" var siteURL string = "" var expectedPartialMessage string = "Please verify your email address by clicking below" var expectedSubject string = "[" + utils.Cfg.TeamSettings.SiteName + "] Email Verification" + var token string = "TEST_TOKEN" //Delete all the messages before check the sample email utils.DeleteMailBox(userEmail) - if err := SendVerifyEmail(userId, userEmail, locale, siteURL); err != nil { + if err := SendVerifyEmail(userEmail, locale, siteURL, token); err != nil { t.Log(err) t.Fatal("Should send change username email") } else { @@ -582,14 +582,22 @@ func TestSendPasswordReset(t *testing.T) { t.Log(resultsEmail.Body.Text) t.Fatal("Wrong Body message") } - var recoveryKey *model.PasswordRecovery - if result := <-Srv.Store.PasswordRecovery().Get(th.BasicUser.Id); result.Err != nil { + loc := strings.Index(resultsEmail.Body.Text, "token=") + if loc == -1 { + t.Log(resultsEmail.Body.Text) + t.Fatal("Code not found in email") + } + loc += 6 + recoveryTokenString := resultsEmail.Body.Text[loc : loc+model.TOKEN_SIZE] + var recoveryToken *model.Token + if result := <-Srv.Store.Token().GetByToken(recoveryTokenString); result.Err != nil { + t.Log(recoveryTokenString) t.Fatal(result.Err) } else { - recoveryKey = result.Data.(*model.PasswordRecovery) - if !strings.Contains(resultsEmail.Body.Text, recoveryKey.Code) { + recoveryToken = result.Data.(*model.Token) + if !strings.Contains(resultsEmail.Body.Text, recoveryToken.Token) { t.Log(resultsEmail.Body.Text) - t.Log(recoveryKey.Code) + t.Log(recoveryToken.Token) t.Fatal("Received wrong recovery code") } } |