diff options
| author | 6543 <6543@obermui.de> | 2020-12-25 09:59:32 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-25 11:59:32 +0200 |
| commit | a19447aed128ecadfcd938d6a80cd4951af1f4ce (patch) | |
| tree | 6312bf946d601aab29731645a4777feeaea66036 /models/user.go | |
| parent | 04ae0f2f3f4556c6d0b4adc5f2cffd0cc7d25151 (diff) | |
| download | gitea-a19447aed128ecadfcd938d6a80cd4951af1f4ce.tar.gz gitea-a19447aed128ecadfcd938d6a80cd4951af1f4ce.zip | |
migrate from com.* to alternatives (#14103)
* remove github.com/unknwon/com from models
* dont use "com.ToStr()"
* replace "com.ToStr" with "fmt.Sprint" where its easy to do
* more refactor
* fix test
* just "proxy" Copy func for now
* as per @lunny
Diffstat (limited to 'models/user.go')
| -rw-r--r-- | models/user.go | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/models/user.go b/models/user.go index 4bf9e196a0..73178f256c 100644 --- a/models/user.go +++ b/models/user.go @@ -32,7 +32,6 @@ import ( "code.gitea.io/gitea/modules/timeutil" "code.gitea.io/gitea/modules/util" - "github.com/unknwon/com" "golang.org/x/crypto/argon2" "golang.org/x/crypto/bcrypt" "golang.org/x/crypto/pbkdf2" @@ -315,7 +314,7 @@ func (u *User) HTMLURL() string { // GenerateEmailActivateCode generates an activate code based on user information and given e-mail. func (u *User) GenerateEmailActivateCode(email string) string { code := base.CreateTimeLimitCode( - com.ToStr(u.ID)+email+u.LowerName+u.Passwd+u.Rands, + fmt.Sprintf("%d%s%s%s%s", u.ID, email, u.LowerName, u.Passwd, u.Rands), setting.Service.ActiveCodeLives, nil) // Add tail hex username @@ -880,7 +879,7 @@ func VerifyUserActiveCode(code string) (user *User) { if user = getVerifyUser(code); user != nil { // time limit code prefix := code[:base.TimeLimitCodeLength] - data := com.ToStr(user.ID) + user.Email + user.LowerName + user.Passwd + user.Rands + data := fmt.Sprintf("%d%s%s%s%s", user.ID, user.Email, user.LowerName, user.Passwd, user.Rands) if base.VerifyTimeLimitCode(data, minutes, prefix) { return user @@ -896,7 +895,7 @@ func VerifyActiveEmailCode(code, email string) *EmailAddress { if user := getVerifyUser(code); user != nil { // time limit code prefix := code[:base.TimeLimitCodeLength] - data := com.ToStr(user.ID) + email + user.LowerName + user.Passwd + user.Rands + data := fmt.Sprintf("%d%s%s%s%s", user.ID, email, user.LowerName, user.Passwd, user.Rands) if base.VerifyTimeLimitCode(data, minutes, prefix) { emailAddress := &EmailAddress{UID: user.ID, Email: email} |