diff options
Diffstat (limited to 'internal/db/user_mail.go')
| -rw-r--r-- | internal/db/user_mail.go | 22 |
1 files changed, 2 insertions, 20 deletions
diff --git a/internal/db/user_mail.go b/internal/db/user_mail.go index eae79af7..d657faa0 100644 --- a/internal/db/user_mail.go +++ b/internal/db/user_mail.go @@ -11,7 +11,6 @@ import ( "gogs.io/gogs/internal/db/errors" "gogs.io/gogs/internal/errutil" - "gogs.io/gogs/internal/userutil" ) // EmailAddresses is the list of all email addresses of a user. Can contain the @@ -120,28 +119,11 @@ func AddEmailAddresses(emails []*EmailAddress) error { } func (email *EmailAddress) Activate() error { - user, err := Users.GetByID(context.TODO(), email.UserID) - if err != nil { - return err - } - if user.Rands, err = userutil.RandomSalt(); err != nil { - return err - } - - sess := x.NewSession() - defer sess.Close() - if err = sess.Begin(); err != nil { - return err - } - email.IsActivated = true - if _, err := sess.ID(email.ID).AllCols().Update(email); err != nil { - return err - } else if err = updateUser(sess, user); err != nil { + if _, err := x.ID(email.ID).AllCols().Update(email); err != nil { return err } - - return sess.Commit() + return Users.Update(context.TODO(), email.UserID, UpdateUserOptions{GenerateNewRands: true}) } func DeleteEmailAddress(email *EmailAddress) (err error) { |