Move testing related stuff

This commit is contained in:
kolaente 2021-07-12 21:00:49 +02:00
parent 982a55dd58
commit 73f8d061cc
Signed by: konrad
GPG Key ID: F40E70337AB24C9B
8 changed files with 27 additions and 14 deletions

View File

@ -0,0 +1,15 @@
- id: 1
user_id: 3
token: passwordresettesttoken
kind: 1
created: 2021-07-12 00:00:12
- id: 2
user_id: 4
token: tiepiQueed8ahc7zeeFe1eveiy4Ein8osooxegiephauph2Ael
kind: 2
created: 2021-07-12 00:00:12
- id: 3
user_id: 5
token: tiepiQueed8ahc7zeeFe1eveiy4Ein8osooxegiephauph2Ael
kind: 2
created: 2021-07-12 00:00:12

View File

@ -20,7 +20,6 @@
username: 'user3'
password: '$2a$14$dcadBoMBL9jQoOcZK8Fju.cy0Ptx2oZECkKLnaa8ekRoTFe1w7To.' # 1234
email: 'user3@example.com'
password_reset_token: passwordresettesttoken
issuer: local
updated: 2018-12-02 15:13:12
created: 2018-12-01 15:13:12
@ -29,7 +28,6 @@
username: 'user4'
password: '$2a$14$dcadBoMBL9jQoOcZK8Fju.cy0Ptx2oZECkKLnaa8ekRoTFe1w7To.' # 1234
email: 'user4@example.com'
email_confirm_token: tiepiQueed8ahc7zeeFe1eveiy4Ein8osooxegiephauph2Ael
issuer: local
updated: 2018-12-02 15:13:12
created: 2018-12-01 15:13:12
@ -38,7 +36,6 @@
username: 'user5'
password: '$2a$14$dcadBoMBL9jQoOcZK8Fju.cy0Ptx2oZECkKLnaa8ekRoTFe1w7To.' # 1234
email: 'user5@example.com'
email_confirm_token: tiepiQueed8ahc7zeeFe1eveiy4Ein8osooxegiephauph2Ael
is_active: false
issuer: local
updated: 2018-12-02 15:13:12

View File

@ -56,11 +56,10 @@ var (
Email: "user2@example.com",
}
testuser3 = user.User{
ID: 3,
Username: "user3",
Password: "$2a$14$dcadBoMBL9jQoOcZK8Fju.cy0Ptx2oZECkKLnaa8ekRoTFe1w7To.",
Email: "user3@example.com",
PasswordResetToken: "passwordresettesttoken",
ID: 3,
Username: "user3",
Password: "$2a$14$dcadBoMBL9jQoOcZK8Fju.cy0Ptx2oZECkKLnaa8ekRoTFe1w7To.",
Email: "user3@example.com",
}
testuser4 = user.User{
ID: 4,

View File

@ -50,7 +50,6 @@ func TestListUsersFromList(t *testing.T) {
ID: 3,
Username: "user3",
Password: "$2a$14$dcadBoMBL9jQoOcZK8Fju.cy0Ptx2oZECkKLnaa8ekRoTFe1w7To.",
PasswordResetToken: "passwordresettesttoken",
Issuer: "local",
EmailRemindersEnabled: true,
OverdueTasksRemindersEnabled: true,

View File

@ -86,7 +86,8 @@ func (n *PasswordChangedNotification) Name() string {
// ResetPasswordNotification represents a ResetPasswordNotification notification
type ResetPasswordNotification struct {
User *User
User *User
Token *Token
}
// ToMail returns the mail notification for ResetPasswordNotification
@ -95,7 +96,7 @@ func (n *ResetPasswordNotification) ToMail() *notifications.Mail {
Subject("Reset your password on Vikunja").
Greeting("Hi "+n.User.GetName()+",").
Line("To reset your password, click the link below:").
Action("Reset your password", config.ServiceFrontendurl.GetString()+"?userPasswordReset="+n.User.PasswordResetToken).
Action("Reset your password", config.ServiceFrontendurl.GetString()+"?userPasswordReset="+n.Token.Token).
Line("Have a nice day!")
}

View File

@ -28,6 +28,8 @@ const (
TokenUnknown TokenKind = iota
TokenPasswordReset
TokenEmailConfirm
tokenSize = 64
)
type Token struct {
@ -46,7 +48,7 @@ func generateNewToken(s *xorm.Session, u *User, kind TokenKind) (token *Token, e
token = &Token{
UserID: u.ID,
Kind: kind,
Token: utils.MakeRandomString(60),
Token: utils.MakeRandomString(tokenSize),
}
_, err = s.Insert(token)
@ -55,7 +57,7 @@ func generateNewToken(s *xorm.Session, u *User, kind TokenKind) (token *Token, e
func getToken(s *xorm.Session, token string, kind TokenKind) (t *Token, err error) {
t = &Token{}
has, err := s.Where("user_id = ? AND kind = ? AND token = ?", t.UserID, t.Kind, t.Token).
has, err := s.Where("kind = ? AND token = ?", kind, token).
Get(t)
if err != nil || !has {
return nil, err

View File

@ -126,6 +126,7 @@ func RequestUserPasswordResetToken(s *xorm.Session, user *User) (err error) {
n := &ResetPasswordNotification{
User: user,
//Token: // TODO
}
err = notifications.Notify(user, n)

View File

@ -322,7 +322,6 @@ func TestUpdateUser(t *testing.T) {
}
func TestUpdateUserPassword(t *testing.T) {
t.Run("normal", func(t *testing.T) {
db.LoadAndAssertFixtures(t)
s := db.NewSession()