refactor(db): rename `User.Passwd` to `User.Password` (#7196)

3 files changed, 9 insertions, 9 deletions

diff --git a/internal/db/issue_mail.go b/internal/db/issue_mail.go
index 91d89a41..e1dbb671 100644
--- a/internal/db/issue_mail.go
+++ b/internal/db/issue_mail.go
@@ -42,7 +42,7 @@ func (this mailerUser) GenerateEmailActivateCode(email string) string {
 		this.user.ID,
 		email,
 		this.user.Name,
-		this.user.Passwd,
+		this.user.Password,
 		this.user.Rands,
 	)
 }
diff --git a/internal/db/user.go b/internal/db/user.go
index 33b69af1..11e4c4a6 100644
--- a/internal/db/user.go
+++ b/internal/db/user.go
@@ -168,15 +168,15 @@ func (u *User) NewGitSig() *git.Signature {
 
 // EncodePassword encodes password to safe format.
 func (u *User) EncodePassword() {
-	newPasswd := pbkdf2.Key([]byte(u.Passwd), []byte(u.Salt), 10000, 50, sha256.New)
-	u.Passwd = fmt.Sprintf("%x", newPasswd)
+	newPasswd := pbkdf2.Key([]byte(u.Password), []byte(u.Salt), 10000, 50, sha256.New)
+	u.Password = fmt.Sprintf("%x", newPasswd)
 }
 
 // ValidatePassword checks if given password matches the one belongs to the user.
 func (u *User) ValidatePassword(passwd string) bool {
-	newUser := &User{Passwd: passwd, Salt: u.Salt}
+	newUser := &User{Password: passwd, Salt: u.Salt}
 	newUser.EncodePassword()
-	return subtle.ConstantTimeCompare([]byte(u.Passwd), []byte(newUser.Passwd)) == 1
+	return subtle.ConstantTimeCompare([]byte(u.Password), []byte(newUser.Password)) == 1
 }
 
 // UploadAvatar saves custom avatar for user.
@@ -499,7 +499,7 @@ func VerifyUserActiveCode(code string) (user *User) {
 	if user = parseUserFromCode(code); user != nil {
 		// time limit code
 		prefix := code[:tool.TIME_LIMIT_CODE_LENGTH]
-		data := com.ToStr(user.ID) + user.Email + user.LowerName + user.Passwd + user.Rands
+		data := com.ToStr(user.ID) + user.Email + user.LowerName + user.Password + user.Rands
 
 		if tool.VerifyTimeLimitCode(data, minutes, prefix) {
 			return user
@@ -515,7 +515,7 @@ func VerifyActiveEmailCode(code, email string) *EmailAddress {
 	if user := parseUserFromCode(code); user != nil {
 		// time limit code
 		prefix := code[:tool.TIME_LIMIT_CODE_LENGTH]
-		data := com.ToStr(user.ID) + email + user.LowerName + user.Passwd + user.Rands
+		data := com.ToStr(user.ID) + email + user.LowerName + user.Password + user.Rands
 
 		if tool.VerifyTimeLimitCode(data, minutes, prefix) {
 			emailAddress := &EmailAddress{Email: email}
diff --git a/internal/db/users.go b/internal/db/users.go
index 94bc25f5..1ae50064 100644
--- a/internal/db/users.go
+++ b/internal/db/users.go
@@ -230,7 +230,7 @@ func (db *users) Create(ctx context.Context, username, email string, opts Create
 		Name:            username,
 		FullName:        opts.FullName,
 		Email:           email,
-		Passwd:          opts.Password,
+		Password:        opts.Password,
 		LoginSource:     opts.LoginSource,
 		LoginName:       opts.LoginName,
 		Location:        opts.Location,
@@ -355,7 +355,7 @@ type User struct {
 	FullName  string
 	// Email is the primary email address (to be used for communication)
 	Email       string `xorm:"NOT NULL" gorm:"not null"`
-	Passwd      string `xorm:"NOT NULL" gorm:"not null"`
+	Password    string `xorm:"passwd NOT NULL" gorm:"column:passwd;not null"`
 	LoginSource int64  `xorm:"NOT NULL DEFAULT 0" gorm:"not null;default:0"`
 	LoginName   string
 	Type        UserType