aboutsummaryrefslogtreecommitdiff
path: root/models
diff options
context:
space:
mode:
Diffstat (limited to 'models')
-rw-r--r--models/action.go3
-rw-r--r--models/comment.go3
-rw-r--r--models/error.go14
-rw-r--r--models/errors/user.go14
-rw-r--r--models/issue.go8
-rw-r--r--models/login_source.go14
-rw-r--r--models/pull.go3
-rw-r--r--models/release.go3
-rw-r--r--models/user.go12
-rw-r--r--models/user_mail.go2
10 files changed, 40 insertions, 36 deletions
diff --git a/models/action.go b/models/action.go
index b68e9a47..b2ddf12f 100644
--- a/models/action.go
+++ b/models/action.go
@@ -20,6 +20,7 @@ import (
"github.com/gogits/git-module"
api "github.com/gogits/go-gogs-client"
+ "github.com/gogits/gogs/models/errors"
"github.com/gogits/gogs/modules/base"
"github.com/gogits/gogs/modules/setting"
)
@@ -292,7 +293,7 @@ func (push *PushCommits) AvatarLink(email string) string {
u, err := GetUserByEmail(email)
if err != nil {
push.avatars[email] = base.AvatarLink(email)
- if !IsErrUserNotExist(err) {
+ if !errors.IsUserNotExist(err) {
log.Error(4, "GetUserByEmail: %v", err)
}
} else {
diff --git a/models/comment.go b/models/comment.go
index 078be582..2b5ac923 100644
--- a/models/comment.go
+++ b/models/comment.go
@@ -15,6 +15,7 @@ import (
api "github.com/gogits/go-gogs-client"
+ "github.com/gogits/gogs/models/errors"
"github.com/gogits/gogs/modules/markdown"
)
@@ -95,7 +96,7 @@ func (c *Comment) loadAttributes(e Engine) (err error) {
if c.Poster == nil {
c.Poster, err = GetUserByID(c.PosterID)
if err != nil {
- if IsErrUserNotExist(err) {
+ if errors.IsUserNotExist(err) {
c.PosterID = -1
c.Poster = NewGhostUser()
} else {
diff --git a/models/error.go b/models/error.go
index 182a944a..18df15ce 100644
--- a/models/error.go
+++ b/models/error.go
@@ -54,20 +54,6 @@ func (err ErrUserAlreadyExist) Error() string {
return fmt.Sprintf("user already exists [name: %s]", err.Name)
}
-type ErrUserNotExist struct {
- UID int64
- Name string
-}
-
-func IsErrUserNotExist(err error) bool {
- _, ok := err.(ErrUserNotExist)
- return ok
-}
-
-func (err ErrUserNotExist) Error() string {
- return fmt.Sprintf("user does not exist [uid: %d, name: %s]", err.UID, err.Name)
-}
-
type ErrEmailAlreadyUsed struct {
Email string
}
diff --git a/models/errors/user.go b/models/errors/user.go
index cda49e0e..526d4b2d 100644
--- a/models/errors/user.go
+++ b/models/errors/user.go
@@ -17,6 +17,20 @@ func (err EmptyName) Error() string {
return "empty name"
}
+type UserNotExist struct {
+ UserID int64
+ Name string
+}
+
+func IsUserNotExist(err error) bool {
+ _, ok := err.(UserNotExist)
+ return ok
+}
+
+func (err UserNotExist) Error() string {
+ return fmt.Sprintf("user does not exist [user_id: %d, name: %s]", err.UserID, err.Name)
+}
+
type UserNotKeyOwner struct {
KeyID int64
}
diff --git a/models/issue.go b/models/issue.go
index 3caa3b8f..1eb26119 100644
--- a/models/issue.go
+++ b/models/issue.go
@@ -90,7 +90,7 @@ func (issue *Issue) loadAttributes(e Engine) (err error) {
if issue.Poster == nil {
issue.Poster, err = getUserByID(e, issue.PosterID)
if err != nil {
- if IsErrUserNotExist(err) {
+ if errors.IsUserNotExist(err) {
issue.PosterID = -1
issue.Poster = NewGhostUser()
} else {
@@ -390,7 +390,7 @@ func (i *Issue) GetAssignee() (err error) {
}
i.Assignee, err = GetUserByID(i.AssigneeID)
- if IsErrUserNotExist(err) {
+ if errors.IsUserNotExist(err) {
return nil
}
return err
@@ -595,7 +595,7 @@ func (issue *Issue) ChangeAssignee(doer *User, assigneeID int64) (err error) {
}
issue.Assignee, err = GetUserByID(issue.AssigneeID)
- if err != nil && !IsErrUserNotExist(err) {
+ if err != nil && !errors.IsUserNotExist(err) {
log.Error(4, "GetUserByID [assignee_id: %v]: %v", issue.AssigneeID, err)
return nil
}
@@ -668,7 +668,7 @@ func newIssue(e *xorm.Session, opts NewIssueOptions) (err error) {
if opts.Issue.AssigneeID > 0 {
assignee, err := getUserByID(e, opts.Issue.AssigneeID)
- if err != nil && !IsErrUserNotExist(err) {
+ if err != nil && !errors.IsUserNotExist(err) {
return fmt.Errorf("getUserByID: %v", err)
}
diff --git a/models/login_source.go b/models/login_source.go
index 1191994d..29977fa3 100644
--- a/models/login_source.go
+++ b/models/login_source.go
@@ -296,7 +296,7 @@ func LoginViaLDAP(user *User, login, password string, source *LoginSource, autoR
username, fn, sn, mail, isAdmin, succeed := source.Cfg.(*LDAPConfig).SearchEntry(login, password, source.Type == LOGIN_DLDAP)
if !succeed {
// User not in LDAP, do nothing
- return nil, ErrUserNotExist{0, login}
+ return nil, errors.UserNotExist{0, login}
}
if !autoRegister {
@@ -404,9 +404,9 @@ func LoginViaSMTP(user *User, login, password string, sourceID int64, cfg *SMTPC
if len(cfg.AllowedDomains) > 0 {
idx := strings.Index(login, "@")
if idx == -1 {
- return nil, ErrUserNotExist{0, login}
+ return nil, errors.UserNotExist{0, login}
} else if !com.IsSliceContainsStr(strings.Split(cfg.AllowedDomains, ","), login[idx+1:]) {
- return nil, ErrUserNotExist{0, login}
+ return nil, errors.UserNotExist{0, login}
}
}
@@ -425,7 +425,7 @@ func LoginViaSMTP(user *User, login, password string, sourceID int64, cfg *SMTPC
tperr, ok := err.(*textproto.Error)
if (ok && tperr.Code == 535) ||
strings.Contains(err.Error(), "Username and Password not accepted") {
- return nil, ErrUserNotExist{0, login}
+ return nil, errors.UserNotExist{0, login}
}
return nil, err
}
@@ -465,7 +465,7 @@ func LoginViaSMTP(user *User, login, password string, sourceID int64, cfg *SMTPC
func LoginViaPAM(user *User, login, password string, sourceID int64, cfg *PAMConfig, autoRegister bool) (*User, error) {
if err := pam.PAMAuth(cfg.ServiceName, login, password); err != nil {
if strings.Contains(err.Error(), "Authentication failure") {
- return nil, ErrUserNotExist{0, login}
+ return nil, errors.UserNotExist{0, login}
}
return nil, err
}
@@ -525,7 +525,7 @@ func UserSignIn(username, password string) (*User, error) {
return user, nil
}
- return nil, ErrUserNotExist{user.ID, user.Name}
+ return nil, errors.UserNotExist{user.ID, user.Name}
default:
var source LoginSource
@@ -554,5 +554,5 @@ func UserSignIn(username, password string) (*User, error) {
log.Warn("Failed to login '%s' via '%s': %v", username, source.Name, err)
}
- return nil, ErrUserNotExist{user.ID, user.Name}
+ return nil, errors.UserNotExist{user.ID, user.Name}
}
diff --git a/models/pull.go b/models/pull.go
index d1c5078d..f36a0e18 100644
--- a/models/pull.go
+++ b/models/pull.go
@@ -18,6 +18,7 @@ import (
"github.com/gogits/git-module"
api "github.com/gogits/go-gogs-client"
+ "github.com/gogits/gogs/models/errors"
"github.com/gogits/gogs/modules/process"
"github.com/gogits/gogs/modules/setting"
"github.com/gogits/gogs/modules/sync"
@@ -101,7 +102,7 @@ func (pr *PullRequest) loadAttributes(e Engine) (err error) {
if pr.HasMerged && pr.Merger == nil {
pr.Merger, err = getUserByID(e, pr.MergerID)
- if IsErrUserNotExist(err) {
+ if errors.IsUserNotExist(err) {
pr.MergerID = -1
pr.Merger = NewGhostUser()
} else if err != nil {
diff --git a/models/release.go b/models/release.go
index 47771bc1..993fa19a 100644
--- a/models/release.go
+++ b/models/release.go
@@ -16,6 +16,7 @@ import (
"github.com/gogits/git-module"
api "github.com/gogits/go-gogs-client"
+ "github.com/gogits/gogs/models/errors"
"github.com/gogits/gogs/modules/process"
)
@@ -67,7 +68,7 @@ func (r *Release) loadAttributes(e Engine) (err error) {
if r.Publisher == nil {
r.Publisher, err = getUserByID(e, r.PublisherID)
if err != nil {
- if IsErrUserNotExist(err) {
+ if errors.IsUserNotExist(err) {
r.PublisherID = -1
r.Publisher = NewGhostUser()
} else {
diff --git a/models/user.go b/models/user.go
index 2737d375..a19f2a17 100644
--- a/models/user.go
+++ b/models/user.go
@@ -896,7 +896,7 @@ func getUserByID(e Engine, id int64) (*User, error) {
if err != nil {
return nil, err
} else if !has {
- return nil, ErrUserNotExist{id, ""}
+ return nil, errors.UserNotExist{id, ""}
}
return u, nil
}
@@ -912,7 +912,7 @@ func GetAssigneeByID(repo *Repository, userID int64) (*User, error) {
if err != nil {
return nil, err
} else if !has {
- return nil, ErrUserNotExist{userID, ""}
+ return nil, errors.UserNotExist{userID, ""}
}
return GetUserByID(userID)
}
@@ -920,14 +920,14 @@ func GetAssigneeByID(repo *Repository, userID int64) (*User, error) {
// GetUserByName returns user by given name.
func GetUserByName(name string) (*User, error) {
if len(name) == 0 {
- return nil, ErrUserNotExist{0, name}
+ return nil, errors.UserNotExist{0, name}
}
u := &User{LowerName: strings.ToLower(name)}
has, err := x.Get(u)
if err != nil {
return nil, err
} else if !has {
- return nil, ErrUserNotExist{0, name}
+ return nil, errors.UserNotExist{0, name}
}
return u, nil
}
@@ -1005,7 +1005,7 @@ func ValidateCommitsWithEmails(oldCommits *list.List) *list.List {
// GetUserByEmail returns the user object by given e-mail if exists.
func GetUserByEmail(email string) (*User, error) {
if len(email) == 0 {
- return nil, ErrUserNotExist{0, "email"}
+ return nil, errors.UserNotExist{0, "email"}
}
email = strings.ToLower(email)
@@ -1029,7 +1029,7 @@ func GetUserByEmail(email string) (*User, error) {
return GetUserByID(emailAddress.UID)
}
- return nil, ErrUserNotExist{0, email}
+ return nil, errors.UserNotExist{0, email}
}
type SearchUserOptions struct {
diff --git a/models/user_mail.go b/models/user_mail.go
index b1b23ee3..7c1cdd16 100644
--- a/models/user_mail.go
+++ b/models/user_mail.go
@@ -177,7 +177,7 @@ func MakeEmailPrimary(email *EmailAddress) error {
if err != nil {
return err
} else if !has {
- return ErrUserNotExist{email.UID, ""}
+ return errors.UserNotExist{email.UID, ""}
}
// Make sure the former primary email doesn't disappear.
Powered by cgit, Themed by Ted Yin.