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
2022-08-10 11:56:48 +02:00
parent 46004037e2
commit 6afad51761
278 changed files with 1758 additions and 1543 deletions
@@ -12,6 +12,7 @@ import (
 	"github.com/grafana/grafana/pkg/infra/log"
 	"github.com/grafana/grafana/pkg/models"
 	"github.com/grafana/grafana/pkg/services/contexthandler/ctxkey"
+	"github.com/grafana/grafana/pkg/services/user"
 	"github.com/grafana/grafana/pkg/web"
 )

@@ -109,7 +110,7 @@ func RequestWithWebContext(req *http.Request, c *models.ReqContext) *http.Reques
 	return req
 }

-func RequestWithSignedInUser(req *http.Request, user *models.SignedInUser) *http.Request {
+func RequestWithSignedInUser(req *http.Request, user *user.SignedInUser) *http.Request {
 	return RequestWithWebContext(req, &models.ReqContext{
 		SignedInUser: user,
 		IsSignedIn:   true,