diff options
Diffstat (limited to 'models')
| -rw-r--r-- | models/migrations/migrations.go | 4 | ||||
| -rw-r--r-- | models/token.go | 2 | ||||
| -rw-r--r-- | models/two_factor.go | 4 | ||||
| -rw-r--r-- | models/user.go | 10 |
4 files changed, 10 insertions, 10 deletions
diff --git a/models/migrations/migrations.go b/models/migrations/migrations.go index 30733423..29cb288a 100644 --- a/models/migrations/migrations.go +++ b/models/migrations/migrations.go @@ -159,10 +159,10 @@ func generateOrgRandsAndSalt(x *xorm.Engine) (err error) { } for _, org := range orgs { - if org.Rands, err = tool.GetRandomString(10); err != nil { + if org.Rands, err = tool.RandomString(10); err != nil { return err } - if org.Salt, err = tool.GetRandomString(10); err != nil { + if org.Salt, err = tool.RandomString(10); err != nil { return err } if _, err = sess.Id(org.ID).Update(org); err != nil { diff --git a/models/token.go b/models/token.go index 6824e43c..9a69a601 100644 --- a/models/token.go +++ b/models/token.go @@ -49,7 +49,7 @@ func (t *AccessToken) AfterSet(colName string, _ xorm.Cell) { // NewAccessToken creates new access token. func NewAccessToken(t *AccessToken) error { - t.Sha1 = tool.EncodeSha1(gouuid.NewV4().String()) + t.Sha1 = tool.SHA1(gouuid.NewV4().String()) _, err := x.Insert(t) return err } diff --git a/models/two_factor.go b/models/two_factor.go index 2f6e7991..60d26147 100644 --- a/models/two_factor.go +++ b/models/two_factor.go @@ -66,9 +66,9 @@ func IsUserEnabledTwoFactor(userID int64) bool { func generateRecoveryCodes(userID int64) ([]*TwoFactorRecoveryCode, error) { recoveryCodes := make([]*TwoFactorRecoveryCode, 10) for i := 0; i < 10; i++ { - code, err := tool.GetRandomString(10) + code, err := tool.RandomString(10) if err != nil { - return nil, fmt.Errorf("GetRandomString: %v", err) + return nil, fmt.Errorf("RandomString: %v", err) } recoveryCodes[i] = &TwoFactorRecoveryCode{ UserID: userID, diff --git a/models/user.go b/models/user.go index d9a1e2a0..9f7b602a 100644 --- a/models/user.go +++ b/models/user.go @@ -489,7 +489,7 @@ func IsUserExist(uid int64, name string) (bool, error) { // GetUserSalt returns a ramdom user salt token. func GetUserSalt() (string, error) { - return tool.GetRandomString(10) + return tool.RandomString(10) } // NewGhostUser creates and returns a fake user for someone has deleted his/her account. @@ -601,12 +601,12 @@ func Users(page, pageSize int) ([]*User, error) { // get user by erify code func getVerifyUser(code string) (user *User) { - if len(code) <= tool.TimeLimitCodeLength { + if len(code) <= tool.TIME_LIMIT_CODE_LENGTH { return nil } // use tail hex username query user - hexStr := code[tool.TimeLimitCodeLength:] + hexStr := code[tool.TIME_LIMIT_CODE_LENGTH:] if b, err := hex.DecodeString(hexStr); err == nil { if user, err = GetUserByName(string(b)); user != nil { return user @@ -623,7 +623,7 @@ func VerifyUserActiveCode(code string) (user *User) { if user = getVerifyUser(code); user != nil { // time limit code - prefix := code[:tool.TimeLimitCodeLength] + prefix := code[:tool.TIME_LIMIT_CODE_LENGTH] data := com.ToStr(user.ID) + user.Email + user.LowerName + user.Passwd + user.Rands if tool.VerifyTimeLimitCode(data, minutes, prefix) { @@ -639,7 +639,7 @@ func VerifyActiveEmailCode(code, email string) *EmailAddress { if user := getVerifyUser(code); user != nil { // time limit code - prefix := code[:tool.TimeLimitCodeLength] + prefix := code[:tool.TIME_LIMIT_CODE_LENGTH] data := com.ToStr(user.ID) + email + user.LowerName + user.Passwd + user.Rands if tool.VerifyTimeLimitCode(data, minutes, prefix) { |