mirror of
https://github.com/grafana/grafana.git
synced 2024-11-27 11:20:27 -06:00
ef631582ba
* API: Improve error handling (#26934) * New ErrUserAlreadyExists error has been introduced * Create user endpoint returns 412 Precondition Failed on ErrUserAlreadyExists errors * Make ErrUserAlreadyExists error message clearer Co-authored-by: Emil Tullstedt <emil.tullstedt@grafana.com> * Use errors.Is instead of equality comparator on AdminCreateUser handler * Improve sqlstore/user test definition Co-authored-by: Arve Knudsen <arve.knudsen@gmail.com> * Improve sqlstore/user tests for ErrUserAlreadyExists cases * Remove no needed string fmt and err declaration on sqlstore/user tests * Code improvements for sqlstore/user tests Co-authored-by: Arve Knudsen <arve.knudsen@gmail.com> * Use err.Error() instead of sentinel error value on AdminCreateUser Co-authored-by: Arve Knudsen <arve.knudsen@gmail.com> * Add ErrUserAlreadyExists handling for signup & org invite use cases Co-authored-by: Emil Tullstedt <emil.tullstedt@grafana.com> Co-authored-by: Arve Knudsen <arve.knudsen@gmail.com>
267 lines
5.3 KiB
Go
267 lines
5.3 KiB
Go
package models
|
|
|
|
import (
|
|
"errors"
|
|
"time"
|
|
)
|
|
|
|
// Typed errors
|
|
var (
|
|
ErrUserNotFound = errors.New("User not found")
|
|
ErrUserAlreadyExists = errors.New("User already exists")
|
|
ErrLastGrafanaAdmin = errors.New("Cannot remove last grafana admin")
|
|
)
|
|
|
|
type Password string
|
|
|
|
func (p Password) IsWeak() bool {
|
|
return len(p) <= 4
|
|
}
|
|
|
|
type User struct {
|
|
Id int64
|
|
Version int
|
|
Email string
|
|
Name string
|
|
Login string
|
|
Password string
|
|
Salt string
|
|
Rands string
|
|
Company string
|
|
EmailVerified bool
|
|
Theme string
|
|
HelpFlags1 HelpFlags1
|
|
IsDisabled bool
|
|
|
|
IsAdmin bool
|
|
OrgId int64
|
|
|
|
Created time.Time
|
|
Updated time.Time
|
|
LastSeenAt time.Time
|
|
}
|
|
|
|
func (u *User) NameOrFallback() string {
|
|
if u.Name != "" {
|
|
return u.Name
|
|
}
|
|
if u.Login != "" {
|
|
return u.Login
|
|
}
|
|
return u.Email
|
|
}
|
|
|
|
// ---------------------
|
|
// COMMANDS
|
|
|
|
type CreateUserCommand struct {
|
|
Email string
|
|
Login string
|
|
Name string
|
|
Company string
|
|
OrgId int64
|
|
OrgName string
|
|
Password string
|
|
EmailVerified bool
|
|
IsAdmin bool
|
|
IsDisabled bool
|
|
SkipOrgSetup bool
|
|
DefaultOrgRole string
|
|
|
|
Result User
|
|
}
|
|
|
|
type UpdateUserCommand struct {
|
|
Name string `json:"name"`
|
|
Email string `json:"email"`
|
|
Login string `json:"login"`
|
|
Theme string `json:"theme"`
|
|
|
|
UserId int64 `json:"-"`
|
|
}
|
|
|
|
type ChangeUserPasswordCommand struct {
|
|
OldPassword string `json:"oldPassword"`
|
|
NewPassword string `json:"newPassword"`
|
|
|
|
UserId int64 `json:"-"`
|
|
}
|
|
|
|
type UpdateUserPermissionsCommand struct {
|
|
IsGrafanaAdmin bool
|
|
UserId int64 `json:"-"`
|
|
}
|
|
|
|
type DisableUserCommand struct {
|
|
UserId int64
|
|
IsDisabled bool
|
|
}
|
|
|
|
type BatchDisableUsersCommand struct {
|
|
UserIds []int64
|
|
IsDisabled bool
|
|
}
|
|
|
|
type DeleteUserCommand struct {
|
|
UserId int64
|
|
}
|
|
|
|
type SetUsingOrgCommand struct {
|
|
UserId int64
|
|
OrgId int64
|
|
}
|
|
|
|
// ----------------------
|
|
// QUERIES
|
|
|
|
type GetUserByLoginQuery struct {
|
|
LoginOrEmail string
|
|
Result *User
|
|
}
|
|
|
|
type GetUserByEmailQuery struct {
|
|
Email string
|
|
Result *User
|
|
}
|
|
|
|
type GetUserByIdQuery struct {
|
|
Id int64
|
|
Result *User
|
|
}
|
|
|
|
type GetSignedInUserQuery struct {
|
|
UserId int64
|
|
Login string
|
|
Email string
|
|
OrgId int64
|
|
Result *SignedInUser
|
|
}
|
|
|
|
type GetUserProfileQuery struct {
|
|
UserId int64
|
|
Result UserProfileDTO
|
|
}
|
|
|
|
type SearchUsersQuery struct {
|
|
OrgId int64
|
|
Query string
|
|
Page int
|
|
Limit int
|
|
AuthModule string
|
|
|
|
IsDisabled *bool
|
|
|
|
Result SearchUserQueryResult
|
|
}
|
|
|
|
type SearchUserQueryResult struct {
|
|
TotalCount int64 `json:"totalCount"`
|
|
Users []*UserSearchHitDTO `json:"users"`
|
|
Page int `json:"page"`
|
|
PerPage int `json:"perPage"`
|
|
}
|
|
|
|
type GetUserOrgListQuery struct {
|
|
UserId int64
|
|
Result []*UserOrgDTO
|
|
}
|
|
|
|
// ------------------------
|
|
// DTO & Projections
|
|
|
|
type SignedInUser struct {
|
|
UserId int64
|
|
OrgId int64
|
|
OrgName string
|
|
OrgRole RoleType
|
|
Login string
|
|
Name string
|
|
Email string
|
|
ApiKeyId int64
|
|
OrgCount int
|
|
IsGrafanaAdmin bool
|
|
IsAnonymous bool
|
|
HelpFlags1 HelpFlags1
|
|
LastSeenAt time.Time
|
|
Teams []int64
|
|
}
|
|
|
|
func (u *SignedInUser) ShouldUpdateLastSeenAt() bool {
|
|
return u.UserId > 0 && time.Since(u.LastSeenAt) > time.Minute*5
|
|
}
|
|
|
|
func (u *SignedInUser) NameOrFallback() string {
|
|
if u.Name != "" {
|
|
return u.Name
|
|
}
|
|
if u.Login != "" {
|
|
return u.Login
|
|
}
|
|
return u.Email
|
|
}
|
|
|
|
type UpdateUserLastSeenAtCommand struct {
|
|
UserId int64
|
|
}
|
|
|
|
func (user *SignedInUser) HasRole(role RoleType) bool {
|
|
if user.IsGrafanaAdmin {
|
|
return true
|
|
}
|
|
|
|
return user.OrgRole.Includes(role)
|
|
}
|
|
|
|
func (user *SignedInUser) IsRealUser() bool {
|
|
return user.UserId != 0
|
|
}
|
|
|
|
type UserProfileDTO struct {
|
|
Id int64 `json:"id"`
|
|
Email string `json:"email"`
|
|
Name string `json:"name"`
|
|
Login string `json:"login"`
|
|
Theme string `json:"theme"`
|
|
OrgId int64 `json:"orgId"`
|
|
IsGrafanaAdmin bool `json:"isGrafanaAdmin"`
|
|
IsDisabled bool `json:"isDisabled"`
|
|
IsExternal bool `json:"isExternal"`
|
|
AuthLabels []string `json:"authLabels"`
|
|
UpdatedAt time.Time `json:"updatedAt"`
|
|
CreatedAt time.Time `json:"createdAt"`
|
|
AvatarUrl string `json:"avatarUrl"`
|
|
}
|
|
|
|
type UserSearchHitDTO struct {
|
|
Id int64 `json:"id"`
|
|
Name string `json:"name"`
|
|
Login string `json:"login"`
|
|
Email string `json:"email"`
|
|
AvatarUrl string `json:"avatarUrl"`
|
|
IsAdmin bool `json:"isAdmin"`
|
|
IsDisabled bool `json:"isDisabled"`
|
|
LastSeenAt time.Time `json:"lastSeenAt"`
|
|
LastSeenAtAge string `json:"lastSeenAtAge"`
|
|
AuthLabels []string `json:"authLabels"`
|
|
AuthModule AuthModuleConversion `json:"-"`
|
|
}
|
|
|
|
type UserIdDTO struct {
|
|
Id int64 `json:"id"`
|
|
Message string `json:"message"`
|
|
}
|
|
|
|
// implement Conversion interface to define custom field mapping (xorm feature)
|
|
type AuthModuleConversion []string
|
|
|
|
func (auth *AuthModuleConversion) FromDB(data []byte) error {
|
|
auth_module := string(data)
|
|
*auth = []string{auth_module}
|
|
return nil
|
|
}
|
|
|
|
// Just a stub, we don't want to write to database
|
|
func (auth *AuthModuleConversion) ToDB() ([]byte, error) {
|
|
return []byte{}, nil
|
|
}
|