ami/tl-vikunja
1
0
Fork 0
Code Activity

Various user fixes (#38)

Browse Source
This commit is contained in:
konrad
2018-12-19 21:05:25 +00:00
committed by Gitea
parent 3e4f7fb2f4
commit cbc5995ad3
16 changed files with 55 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
pkg/models/user_add_update.go
View File

@ -20,6 +20,7 @@ import (
"code.vikunja.io/api/pkg/mail"
"code.vikunja.io/api/pkg/metrics"
"code.vikunja.io/api/pkg/utils"
"github.com/spf13/viper"
"golang.org/x/crypto/bcrypt"
)
@ -67,11 +68,13 @@ func CreateUser(user User) (newUser User, err error) {
return User{}, err
}
// Generate a confirm token
newUser.EmailConfirmToken = utils.MakeRandomString(400)
// The new user should not be activated until it confirms his mail address
newUser.IsActive = false
newUser.IsActive = true
if viper.GetBool("mailer.enabled") {
// The new user should not be activated until it confirms his mail address
newUser.IsActive = false
// Generate a confirm token
newUser.EmailConfirmToken = utils.MakeRandomString(400)
}
// Insert it
_, err = x.Insert(newUser)
@ -96,7 +99,7 @@ func CreateUser(user User) (newUser User, err error) {
}
// Dont send a mail if we're testing
if IsTesting {
if !viper.GetBool("mailer.enabled") {
return newUserOut, err
}