opensource/grafana
1
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-07-30 05:12:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

chore: avoid aliasing imports in services (#22499)

Browse Source
This commit is contained in:
Carl Bergquist
2020-02-29 13:35:15 +01:00
committed by GitHub
parent a8531978b6
commit f9962eabff
51 changed files with 858 additions and 861 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/services/notifications/codes.go
View File

@ -8,7 +8,7 @@ import (
"github.com/unknwon/com"
m "github.com/grafana/grafana/pkg/models"
"github.com/grafana/grafana/pkg/models"
"github.com/grafana/grafana/pkg/setting"
)
@ -49,7 +49,7 @@ func createTimeLimitCode(data string, minutes int, startInf interface{}) (string
}
// verify time limit code
func validateUserEmailCode(user *m.User, code string) (bool, error) {
func validateUserEmailCode(user *models.User, code string) (bool, error) {
if len(code) <= 18 {
return false, nil
}
@ -94,7 +94,7 @@ func getLoginForEmailCode(code string) string {
return string(b)
}
func createUserEmailCode(u *m.User, startInf interface{}) (string, error) {
func createUserEmailCode(u *models.User, startInf interface{}) (string, error) {
minutes := setting.EmailCodeValidMinutes
data := com.ToStr(u.Id) + u.Email + u.Login + u.Password + u.Rands
code, err := createTimeLimitCode(data, minutes, startInf)