mirror of
https://github.com/grafana/grafana.git
synced 2025-01-01 11:47:05 -06:00
f2fcf721eb
* Add model for search org user and add handler for dispatch * 32540_org_users_with_pagination: Add endpoint for search org users * 32540_org_users_with_pagination: Add test for org user search handler * 32540_org_users_with_pagination: fix indentation * 32540_org_users_with_pagination: Remove newline * 32540_org_users_with_pagination: Remove empty line * 32540_org_users_with_pagination: Fix indentation * Update pkg/api/org_users.go Co-authored-by: Arve Knudsen <arve.knudsen@gmail.com> * Update pkg/api/org_users.go Co-authored-by: Arve Knudsen <arve.knudsen@gmail.com> * Update pkg/models/org_user.go Co-authored-by: Arve Knudsen <arve.knudsen@gmail.com> * Update pkg/api/org_users_test.go Co-authored-by: Arve Knudsen <arve.knudsen@gmail.com> * Update pkg/api/org_users_test.go Co-authored-by: Arve Knudsen <arve.knudsen@gmail.com> * 32540_org_users_with_pagination: Use hs.SQLStore.SearchOrgUsers instead of bus * Add model for search org user and add handler for dispatch * 32540_org_users_with_pagination: Add endpoint for search org users * 32540_org_users_with_pagination: Add test for org user search handler * 32540_org_users_with_pagination: fix indentation * 32540_org_users_with_pagination: Remove newline * 32540_org_users_with_pagination: Remove empty line * 32540_org_users_with_pagination: Fix indentation * Update pkg/api/org_users.go Co-authored-by: Arve Knudsen <arve.knudsen@gmail.com> * Update pkg/api/org_users.go Co-authored-by: Arve Knudsen <arve.knudsen@gmail.com> * Update pkg/models/org_user.go Co-authored-by: Arve Knudsen <arve.knudsen@gmail.com> * Update pkg/api/org_users_test.go Co-authored-by: Arve Knudsen <arve.knudsen@gmail.com> * Update pkg/api/org_users_test.go Co-authored-by: Arve Knudsen <arve.knudsen@gmail.com> * 32540_org_users_with_pagination: Use hs.SQLStore.SearchOrgUsers instead of bus * 32540_org_users_with_pagination: Add test for the sqlstore * 32540_org_users_with_pagination: Fix sqlstore test * Update pkg/api/org_users.go Co-authored-by: Arve Knudsen <arve.knudsen@gmail.com> * Update pkg/api/org_users_test.go Co-authored-by: Arve Knudsen <arve.knudsen@gmail.com> * Update pkg/api/org_users_test.go Co-authored-by: Arve Knudsen <arve.knudsen@gmail.com> * Update pkg/services/sqlstore/org_users.go Co-authored-by: Arve Knudsen <arve.knudsen@gmail.com> * Update pkg/services/sqlstore/org_users.go Co-authored-by: Arve Knudsen <arve.knudsen@gmail.com> * Update pkg/services/sqlstore/org_test.go Co-authored-by: Arve Knudsen <arve.knudsen@gmail.com> * Update pkg/services/sqlstore/org_test.go Co-authored-by: Arve Knudsen <arve.knudsen@gmail.com> * 32540: Fix search org users method * 32540: Fix sqlstore test * 32540: Fix go-lint Co-authored-by: Arve Knudsen <arve.knudsen@gmail.com>
147 lines
2.8 KiB
Go
147 lines
2.8 KiB
Go
package models
|
|
|
|
import (
|
|
"encoding/json"
|
|
"errors"
|
|
"fmt"
|
|
"time"
|
|
)
|
|
|
|
// Typed errors
|
|
var (
|
|
ErrLastOrgAdmin = errors.New("cannot remove last organization admin")
|
|
ErrOrgUserNotFound = errors.New("cannot find the organization user")
|
|
ErrOrgUserAlreadyAdded = errors.New("user is already added to organization")
|
|
)
|
|
|
|
type RoleType string
|
|
|
|
const (
|
|
ROLE_VIEWER RoleType = "Viewer"
|
|
ROLE_EDITOR RoleType = "Editor"
|
|
ROLE_ADMIN RoleType = "Admin"
|
|
)
|
|
|
|
func (r RoleType) IsValid() bool {
|
|
return r == ROLE_VIEWER || r == ROLE_ADMIN || r == ROLE_EDITOR
|
|
}
|
|
|
|
func (r RoleType) Includes(other RoleType) bool {
|
|
if r == ROLE_ADMIN {
|
|
return true
|
|
}
|
|
|
|
if r == ROLE_EDITOR {
|
|
return other != ROLE_ADMIN
|
|
}
|
|
|
|
return r == other
|
|
}
|
|
|
|
func (r RoleType) Children() []RoleType {
|
|
switch r {
|
|
case ROLE_ADMIN:
|
|
return []RoleType{ROLE_EDITOR, ROLE_VIEWER}
|
|
case ROLE_EDITOR:
|
|
return []RoleType{ROLE_VIEWER}
|
|
default:
|
|
return nil
|
|
}
|
|
}
|
|
|
|
func (r *RoleType) UnmarshalJSON(data []byte) error {
|
|
var str string
|
|
err := json.Unmarshal(data, &str)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
*r = RoleType(str)
|
|
|
|
if !r.IsValid() {
|
|
if (*r) != "" {
|
|
return fmt.Errorf("JSON validation error: invalid role value: %s", *r)
|
|
}
|
|
|
|
*r = ROLE_VIEWER
|
|
}
|
|
|
|
return nil
|
|
}
|
|
|
|
type OrgUser struct {
|
|
Id int64
|
|
OrgId int64
|
|
UserId int64
|
|
Role RoleType
|
|
Created time.Time
|
|
Updated time.Time
|
|
}
|
|
|
|
// ---------------------
|
|
// COMMANDS
|
|
|
|
type RemoveOrgUserCommand struct {
|
|
UserId int64
|
|
OrgId int64
|
|
ShouldDeleteOrphanedUser bool
|
|
UserWasDeleted bool
|
|
}
|
|
|
|
type AddOrgUserCommand struct {
|
|
LoginOrEmail string `json:"loginOrEmail" binding:"Required"`
|
|
Role RoleType `json:"role" binding:"Required"`
|
|
|
|
OrgId int64 `json:"-"`
|
|
UserId int64 `json:"-"`
|
|
}
|
|
|
|
type UpdateOrgUserCommand struct {
|
|
Role RoleType `json:"role" binding:"Required"`
|
|
|
|
OrgId int64 `json:"-"`
|
|
UserId int64 `json:"-"`
|
|
}
|
|
|
|
// ----------------------
|
|
// QUERIES
|
|
|
|
type GetOrgUsersQuery struct {
|
|
OrgId int64
|
|
Query string
|
|
Limit int
|
|
|
|
Result []*OrgUserDTO
|
|
}
|
|
|
|
type SearchOrgUsersQuery struct {
|
|
OrgID int64
|
|
Query string
|
|
Page int
|
|
Limit int
|
|
|
|
Result SearchOrgUsersQueryResult
|
|
}
|
|
|
|
type SearchOrgUsersQueryResult struct {
|
|
TotalCount int64 `json:"totalCount"`
|
|
OrgUsers []*OrgUserDTO `json:"OrgUsers"`
|
|
Page int `json:"page"`
|
|
PerPage int `json:"perPage"`
|
|
}
|
|
|
|
// ----------------------
|
|
// Projections and DTOs
|
|
|
|
type OrgUserDTO struct {
|
|
OrgId int64 `json:"orgId"`
|
|
UserId int64 `json:"userId"`
|
|
Email string `json:"email"`
|
|
Name string `json:"name"`
|
|
AvatarUrl string `json:"avatarUrl"`
|
|
Login string `json:"login"`
|
|
Role string `json:"role"`
|
|
LastSeenAt time.Time `json:"lastSeenAt"`
|
|
LastSeenAtAge string `json:"lastSeenAtAge"`
|
|
}
|