mirror of https://github.com/go-gitea/gitea.git
parent
d0183dfa49
commit
155269fa58
|
@ -595,8 +595,6 @@ func GetOrgByID(ctx context.Context, id int64) (*Organization, error) {
|
||||||
} else if !has {
|
} else if !has {
|
||||||
return nil, user_model.ErrUserNotExist{
|
return nil, user_model.ErrUserNotExist{
|
||||||
UID: id,
|
UID: id,
|
||||||
Name: "",
|
|
||||||
KeyID: 0,
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return u, nil
|
return u, nil
|
||||||
|
|
|
@ -333,8 +333,6 @@ func MakeEmailPrimary(ctx context.Context, email *EmailAddress) error {
|
||||||
} else if !has {
|
} else if !has {
|
||||||
return ErrUserNotExist{
|
return ErrUserNotExist{
|
||||||
UID: email.UID,
|
UID: email.UID,
|
||||||
Name: "",
|
|
||||||
KeyID: 0,
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -33,7 +33,6 @@ func (err ErrUserAlreadyExist) Unwrap() error {
|
||||||
type ErrUserNotExist struct {
|
type ErrUserNotExist struct {
|
||||||
UID int64
|
UID int64
|
||||||
Name string
|
Name string
|
||||||
KeyID int64
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// IsErrUserNotExist checks if an error is a ErrUserNotExist.
|
// IsErrUserNotExist checks if an error is a ErrUserNotExist.
|
||||||
|
@ -43,7 +42,7 @@ func IsErrUserNotExist(err error) bool {
|
||||||
}
|
}
|
||||||
|
|
||||||
func (err ErrUserNotExist) Error() string {
|
func (err ErrUserNotExist) Error() string {
|
||||||
return fmt.Sprintf("user does not exist [uid: %d, name: %s, keyid: %d]", err.UID, err.Name, err.KeyID)
|
return fmt.Sprintf("user does not exist [uid: %d, name: %s]", err.UID, err.Name)
|
||||||
}
|
}
|
||||||
|
|
||||||
// Unwrap unwraps this error as a ErrNotExist error
|
// Unwrap unwraps this error as a ErrNotExist error
|
||||||
|
|
|
@ -835,7 +835,7 @@ func GetUserByID(ctx context.Context, id int64) (*User, error) {
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
} else if !has {
|
} else if !has {
|
||||||
return nil, ErrUserNotExist{id, "", 0}
|
return nil, ErrUserNotExist{UID: id}
|
||||||
}
|
}
|
||||||
return u, nil
|
return u, nil
|
||||||
}
|
}
|
||||||
|
@ -885,14 +885,14 @@ func GetPossibleUserByIDs(ctx context.Context, ids []int64) ([]*User, error) {
|
||||||
// GetUserByNameCtx returns user by given name.
|
// GetUserByNameCtx returns user by given name.
|
||||||
func GetUserByName(ctx context.Context, name string) (*User, error) {
|
func GetUserByName(ctx context.Context, name string) (*User, error) {
|
||||||
if len(name) == 0 {
|
if len(name) == 0 {
|
||||||
return nil, ErrUserNotExist{0, name, 0}
|
return nil, ErrUserNotExist{Name: name}
|
||||||
}
|
}
|
||||||
u := &User{LowerName: strings.ToLower(name), Type: UserTypeIndividual}
|
u := &User{LowerName: strings.ToLower(name), Type: UserTypeIndividual}
|
||||||
has, err := db.GetEngine(ctx).Get(u)
|
has, err := db.GetEngine(ctx).Get(u)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
} else if !has {
|
} else if !has {
|
||||||
return nil, ErrUserNotExist{0, name, 0}
|
return nil, ErrUserNotExist{Name: name}
|
||||||
}
|
}
|
||||||
return u, nil
|
return u, nil
|
||||||
}
|
}
|
||||||
|
@ -1033,7 +1033,7 @@ func ValidateCommitsWithEmails(ctx context.Context, oldCommits []*git.Commit) []
|
||||||
// GetUserByEmail returns the user object by given e-mail if exists.
|
// GetUserByEmail returns the user object by given e-mail if exists.
|
||||||
func GetUserByEmail(ctx context.Context, email string) (*User, error) {
|
func GetUserByEmail(ctx context.Context, email string) (*User, error) {
|
||||||
if len(email) == 0 {
|
if len(email) == 0 {
|
||||||
return nil, ErrUserNotExist{0, email, 0}
|
return nil, ErrUserNotExist{Name: email}
|
||||||
}
|
}
|
||||||
|
|
||||||
email = strings.ToLower(email)
|
email = strings.ToLower(email)
|
||||||
|
@ -1060,7 +1060,7 @@ func GetUserByEmail(ctx context.Context, email string) (*User, error) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return nil, ErrUserNotExist{0, email, 0}
|
return nil, ErrUserNotExist{Name: email}
|
||||||
}
|
}
|
||||||
|
|
||||||
// GetUser checks if a user already exists
|
// GetUser checks if a user already exists
|
||||||
|
@ -1071,7 +1071,7 @@ func GetUser(ctx context.Context, user *User) (bool, error) {
|
||||||
// GetUserByOpenID returns the user object by given OpenID if exists.
|
// GetUserByOpenID returns the user object by given OpenID if exists.
|
||||||
func GetUserByOpenID(ctx context.Context, uri string) (*User, error) {
|
func GetUserByOpenID(ctx context.Context, uri string) (*User, error) {
|
||||||
if len(uri) == 0 {
|
if len(uri) == 0 {
|
||||||
return nil, ErrUserNotExist{0, uri, 0}
|
return nil, ErrUserNotExist{Name: uri}
|
||||||
}
|
}
|
||||||
|
|
||||||
uri, err := openid.Normalize(uri)
|
uri, err := openid.Normalize(uri)
|
||||||
|
@ -1091,7 +1091,7 @@ func GetUserByOpenID(ctx context.Context, uri string) (*User, error) {
|
||||||
return GetUserByID(ctx, oid.UID)
|
return GetUserByID(ctx, oid.UID)
|
||||||
}
|
}
|
||||||
|
|
||||||
return nil, ErrUserNotExist{0, uri, 0}
|
return nil, ErrUserNotExist{Name: uri}
|
||||||
}
|
}
|
||||||
|
|
||||||
// GetAdminUser returns the first administrator
|
// GetAdminUser returns the first administrator
|
||||||
|
|
Loading…
Reference in New Issue