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

5 files changed, 10 insertions, 10 deletions

diff --git a/internal/route/admin/users.go b/internal/route/admin/users.go
index ef890e7d..9b273b36 100644
--- a/internal/route/admin/users.go
+++ b/internal/route/admin/users.go
@@ -79,7 +79,7 @@ func NewUserPost(c *context.Context, f form.AdminCrateUser) {
 	u := &db.User{
 		Name:     f.UserName,
 		Email:    f.Email,
-		Passwd:   f.Password,
+		Password: f.Password,
 		IsActive: true,
 	}
 
@@ -186,7 +186,7 @@ func EditUserPost(c *context.Context, f form.AdminEditUser) {
 	}
 
 	if len(f.Password) > 0 {
-		u.Passwd = f.Password
+		u.Password = f.Password
 		var err error
 		if u.Salt, err = db.GetUserSalt(); err != nil {
 			c.Error(err, "get user salt")
diff --git a/internal/route/api/v1/admin/user.go b/internal/route/api/v1/admin/user.go
index 543220db..7fad5ed1 100644
--- a/internal/route/api/v1/admin/user.go
+++ b/internal/route/api/v1/admin/user.go
@@ -41,7 +41,7 @@ func CreateUser(c *context.APIContext, form api.CreateUserOption) {
 		Name:     form.Username,
 		FullName: form.FullName,
 		Email:    form.Email,
-		Passwd:   form.Password,
+		Password: form.Password,
 		IsActive: true,
 	}
 
@@ -82,7 +82,7 @@ func EditUser(c *context.APIContext, form api.EditUserOption) {
 	}
 
 	if len(form.Password) > 0 {
-		u.Passwd = form.Password
+		u.Password = form.Password
 		var err error
 		if u.Salt, err = db.GetUserSalt(); err != nil {
 			c.Error(err, "get user salt")
diff --git a/internal/route/install.go b/internal/route/install.go
index 4a529655..2e0e05b9 100644
--- a/internal/route/install.go
+++ b/internal/route/install.go
@@ -390,7 +390,7 @@ func InstallPost(c *context.Context, f form.Install) {
 		u := &db.User{
 			Name:     f.AdminName,
 			Email:    f.AdminEmail,
-			Passwd:   f.AdminPasswd,
+			Password: f.AdminPasswd,
 			IsAdmin:  true,
 			IsActive: true,
 		}
diff --git a/internal/route/user/auth.go b/internal/route/user/auth.go
index 38751cb6..213ff050 100644
--- a/internal/route/user/auth.go
+++ b/internal/route/user/auth.go
@@ -60,7 +60,7 @@ func AutoLogin(c *context.Context) (bool, error) {
 		return false, nil
 	}
 
-	if val, ok := c.GetSuperSecureCookie(u.Rands+u.Passwd, conf.Security.CookieRememberName); !ok || val != u.Name {
+	if val, ok := c.GetSuperSecureCookie(u.Rands+u.Password, conf.Security.CookieRememberName); !ok || val != u.Name {
 		return false, nil
 	}
 
@@ -122,7 +122,7 @@ func afterLogin(c *context.Context, u *db.User, remember bool) {
 	if remember {
 		days := 86400 * conf.Security.LoginRememberDays
 		c.SetCookie(conf.Security.CookieUsername, u.Name, days, conf.Server.Subpath, "", conf.Security.CookieSecure, true)
-		c.SetSuperSecureCookie(u.Rands+u.Passwd, conf.Security.CookieRememberName, u.Name, days, conf.Server.Subpath, "", conf.Security.CookieSecure, true)
+		c.SetSuperSecureCookie(u.Rands+u.Password, conf.Security.CookieRememberName, u.Name, days, conf.Server.Subpath, "", conf.Security.CookieSecure, true)
 	}
 
 	_ = c.Session.Set("uid", u.ID)
@@ -334,7 +334,7 @@ func SignUpPost(c *context.Context, cpt *captcha.Captcha, f form.Register) {
 	u := &db.User{
 		Name:     f.UserName,
 		Email:    f.Email,
-		Passwd:   f.Password,
+		Password: f.Password,
 		IsActive: !conf.Auth.RequireEmailConfirmation,
 	}
 	if err := db.CreateUser(u); err != nil {
@@ -544,7 +544,7 @@ func ResetPasswdPost(c *context.Context) {
 			return
 		}
 
-		u.Passwd = passwd
+		u.Password = passwd
 		var err error
 		if u.Rands, err = db.GetUserSalt(); err != nil {
 			c.Error(err, "get user salt")
diff --git a/internal/route/user/setting.go b/internal/route/user/setting.go
index 66e3ace2..8c0e87c1 100644
--- a/internal/route/user/setting.go
+++ b/internal/route/user/setting.go
@@ -202,7 +202,7 @@ func SettingsPasswordPost(c *context.Context, f form.ChangePassword) {
 	} else if f.Password != f.Retype {
 		c.Flash.Error(c.Tr("form.password_not_match"))
 	} else {
-		c.User.Passwd = f.Password
+		c.User.Password = f.Password
 		var err error
 		if c.User.Salt, err = db.GetUserSalt(); err != nil {
 			c.Errorf(err, "get user salt")