From fd798b4197dc53df872d20f5d10edb8d73c32386 Mon Sep 17 00:00:00 2001
From: Joe Chen <jc@unknwon.io>
Date: Sat, 5 Nov 2022 17:55:05 +0800
Subject: refactor(db): migrate methods off `user.go` (#7228)

---
 internal/route/user/auth.go    | 6 +++---
 internal/route/user/setting.go | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'internal/route/user')

diff --git a/internal/route/user/auth.go b/internal/route/user/auth.go
index cf6fa5e3..74c1a98f 100644
--- a/internal/route/user/auth.go
+++ b/internal/route/user/auth.go
@@ -414,7 +414,7 @@ func Activate(c *context.Context) {
 	if user := db.VerifyUserActiveCode(code); user != nil {
 		user.IsActive = true
 		var err error
-		if user.Rands, err = db.GetUserSalt(); err != nil {
+		if user.Rands, err = userutil.RandomSalt(); err != nil {
 			c.Error(err, "get user salt")
 			return
 		}
@@ -547,11 +547,11 @@ func ResetPasswdPost(c *context.Context) {
 
 		u.Password = passwd
 		var err error
-		if u.Rands, err = db.GetUserSalt(); err != nil {
+		if u.Rands, err = userutil.RandomSalt(); err != nil {
 			c.Error(err, "get user salt")
 			return
 		}
-		if u.Salt, err = db.GetUserSalt(); err != nil {
+		if u.Salt, err = userutil.RandomSalt(); err != nil {
 			c.Error(err, "get user salt")
 			return
 		}
diff --git a/internal/route/user/setting.go b/internal/route/user/setting.go
index f29ffb36..6d781cbe 100644
--- a/internal/route/user/setting.go
+++ b/internal/route/user/setting.go
@@ -198,7 +198,7 @@ func SettingsPasswordPost(c *context.Context, f form.ChangePassword) {
 	} else {
 		c.User.Password = f.Password
 		var err error
-		if c.User.Salt, err = db.GetUserSalt(); err != nil {
+		if c.User.Salt, err = userutil.RandomSalt(); err != nil {
 			c.Errorf(err, "get user salt")
 			return
 		}
-- 
cgit v1.2.3