aboutsummaryrefslogtreecommitdiffstats
path: root/models/user.go
diff options
context:
space:
mode:
Diffstat (limited to 'models/user.go')
-rw-r--r--models/user.go37
1 files changed, 8 insertions, 29 deletions
diff --git a/models/user.go b/models/user.go
index 397094920b..c5c474ee6f 100644
--- a/models/user.go
+++ b/models/user.go
@@ -27,11 +27,14 @@ const (
)
var (
- ErrUserOwnRepos = errors.New("User still have ownership of repositories")
- ErrUserAlreadyExist = errors.New("User already exist")
- ErrUserNotExist = errors.New("User does not exist")
- ErrEmailAlreadyUsed = errors.New("E-mail already used")
- ErrUserNameIllegal = errors.New("User name contains illegal characters")
+ ErrUserOwnRepos = errors.New("User still have ownership of repositories")
+ ErrUserAlreadyExist = errors.New("User already exist")
+ ErrUserNotExist = errors.New("User does not exist")
+ ErrEmailAlreadyUsed = errors.New("E-mail already used")
+ ErrUserNameIllegal = errors.New("User name contains illegal characters")
+ ErrLoginSourceNotExist = errors.New("Login source does not exist")
+ ErrLoginSourceNotActived = errors.New("Login source is not actived")
+ ErrUnsupportedLoginType = errors.New("Login source is unknow")
)
// User represents the object of individual and member of organization.
@@ -440,30 +443,6 @@ func SearchUserByName(key string, limit int) (us []*User, err error) {
return us, err
}
-// LoginUserPlain validates user by raw user name and password.
-func LoginUserPlain(uname, passwd string) (*User, error) {
- var u *User
- if strings.Contains(uname, "@") {
- u = &User{Email: uname}
- } else {
- u = &User{LowerName: strings.ToLower(uname)}
- }
-
- has, err := orm.Get(u)
- if err != nil {
- return nil, err
- } else if !has {
- return nil, ErrUserNotExist
- }
-
- newUser := &User{Passwd: passwd, Salt: u.Salt}
- newUser.EncodePasswd()
- if u.Passwd != newUser.Passwd {
- return nil, ErrUserNotExist
- }
- return u, nil
-}
-
// Follow is connection request for receiving user notifycation.
type Follow struct {
Id int64