Move SignedInUser to user service and RoleType and Roles to org (#53445)

* Move SignedInUser to user service and RoleType and Roles to org

* Use go naming convention for roles

* Fix some imports and leftovers

* Fix ldap debug test

* Fix lint

* Fix lint 2

* Fix lint 3

* Fix type and not needed conversion

* Clean up messages in api tests

* Clean up api tests 2
This commit is contained in:
idafurjes authored and GitHub committed 2022-08-10 11:56:48 +02:00
1 parent 46004037e2
commit 6afad51761
278 files changed
+1758 -1543

No files matched your search

+5 -3
View File
@@ -3,6 +3,8 @@ package models
import (
"errors"
"time"
"github.com/grafana/grafana/pkg/services/org"
)
// Typed errors
@@ -27,7 +29,7 @@ type TempUser struct {
Version int
Email string
Name string
Role RoleType
Role org.RoleType
InvitedByUserId int64
Status TempUserStatus
@@ -50,7 +52,7 @@ type CreateTempUserCommand struct {
InvitedByUserId int64
Status TempUserStatus
Code string
Role RoleType
Role org.RoleType
RemoteAddr string
Result *TempUser
@@ -90,7 +92,7 @@ type TempUserDTO struct {
OrgId int64 `json:"orgId"`
Name string `json:"name"`
Email string `json:"email"`
Role RoleType `json:"role"`
Role org.RoleType `json:"role"`
InvitedByLogin string `json:"invitedByLogin"`
InvitedByEmail string `json:"invitedByEmail"`
InvitedByName string `json:"invitedByName"`