vikunja
/
vikunja
6
43
Fork 71
Code Issues 150 Pull Requests 15 Packages Releases 32 Activity

Better variable names

This commit is contained in:
kolaente 2020-11-19 21:09:17 +01:00
parent e11e7485f8
commit c90328896a
Signed by: konrad
GPG Key ID: F40E70337AB24C9B
1 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
pkg/user/user_create.go
View File

@ -27,44 +27,42 @@ import (
// CreateUser creates a new user and inserts it into the database
func CreateUser(user *User) (newUser *User, err error) {
newUser = user
if newUser.Issuer == "" {
newUser.Issuer = "local"
if user.Issuer == "" {
user.Issuer = "local"
}
// Check if we have all needed information
err = checkIfUserIsValid(newUser)
err = checkIfUserIsValid(user)
if err != nil {
return nil, err
}
// Check if the user already exists with that username
err = checkIfUserExists(newUser)
err = checkIfUserExists(user)
if err != nil {
return nil, err
}
if newUser.Issuer == "local" {
if user.Issuer == "local" {
// Hash the password
newUser.Password, err = hashPassword(user.Password)
user.Password, err = hashPassword(user.Password)
if err != nil {
return &User{}, err
}
}
newUser.IsActive = true
if config.MailerEnabled.GetBool() && newUser.Issuer == "local" {
user.IsActive = true
if config.MailerEnabled.GetBool() && user.Issuer == "local" {
// The new user should not be activated until it confirms his mail address
newUser.IsActive = false
user.IsActive = false
// Generate a confirm token
newUser.EmailConfirmToken = utils.MakeRandomString(60)
user.EmailConfirmToken = utils.MakeRandomString(60)
}
newUser.AvatarProvider = "initials"
user.AvatarProvider = "initials"
// Insert it
_, err = x.Insert(newUser)
_, err = x.Insert(user)
if err != nil {
return &User{}, err
}
@ -73,7 +71,7 @@ func CreateUser(user *User) (newUser *User, err error) {
metrics.UpdateCount(1, metrics.ActiveUsersKey)
// Get the full new User
newUserOut, err := GetUser(newUser)
newUserOut, err := GetUserByID(user.ID)
if err != nil {
return &User{}, err
}