Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use session when creating user #2638

Merged
merged 2 commits into from
Oct 3, 2017
Merged

Use session when creating user #2638

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4356b4e
Use session when creating user
ethantkoenig Oct 2, 2017
b878b37
Merge branch 'master' into fix/use_session
lafriks Oct 3, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 20 additions & 16 deletions models/user.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -591,19 +591,23 @@ func (u *User) IsMailable() bool {
return u.IsActive
}

// IsUserExist checks if given user name exist,
// the user name should be noncased unique.
// If uid is presented, then check will rule out that one,
// it is used when update a user name in settings page.
func IsUserExist(uid int64, name string) (bool, error) {
func isUserExist(e Engine, uid int64, name string) (bool, error) {
if len(name) == 0 {
return false, nil
}
return x.
return e.
Where("id!=?", uid).
Get(&User{LowerName: strings.ToLower(name)})
}

// IsUserExist checks if given user name exist,
// the user name should be noncased unique.
// If uid is presented, then check will rule out that one,
// it is used when update a user name in settings page.
func IsUserExist(uid int64, name string) (bool, error) {
return isUserExist(x, uid, name)
}

// GetUserSalt returns a random user salt token.
func GetUserSalt() (string, error) {
return base.GetRandomString(10)
Expand Down Expand Up @@ -659,24 +663,30 @@ func CreateUser(u *User) (err error) {
return err
}

isExist, err := IsUserExist(0, u.Name)
sess := x.NewSession()
defer sess.Close()
if err = sess.Begin(); err != nil {
return err
}

isExist, err := isUserExist(sess, 0, u.Name)
if err != nil {
return err
} else if isExist {
return ErrUserAlreadyExist{u.Name}
}

u.Email = strings.ToLower(u.Email)
has, err := x.
isExist, err = sess.
Where("email=?", u.Email).
Get(new(User))
if err != nil {
return err
} else if has {
} else if isExist {
return ErrEmailAlreadyUsed{u.Email}
}

isExist, err = IsEmailUsed(u.Email)
isExist, err = isEmailUsed(sess, u.Email)
if err != nil {
return err
} else if isExist {
Expand All @@ -698,12 +708,6 @@ func CreateUser(u *User) (err error) {
u.AllowCreateOrganization = setting.Service.DefaultAllowCreateOrganization
u.MaxRepoCreation = -1

sess := x.NewSession()
defer sess.Close()
if err = sess.Begin(); err != nil {
return err
}

if _, err = sess.Insert(u); err != nil {
return err
} else if err = os.MkdirAll(UserPath(u.Name), os.ModePerm); err != nil {
Expand Down