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
2022-08-10 11:56:48 +02:00
committed by GitHub
parent 46004037e2
commit 6afad51761
278 changed files with 1758 additions and 1543 deletions
+6 -6
View File
@@ -14,7 +14,7 @@ import (
"github.com/grafana/grafana-plugin-sdk-go/data"
"github.com/grafana/grafana/pkg/infra/filestorage"
"github.com/grafana/grafana/pkg/models"
"github.com/grafana/grafana/pkg/services/user"
"github.com/grafana/grafana/pkg/setting"
"gocloud.dev/blob"
)
@@ -339,15 +339,15 @@ func (s *rootStorageGit) Write(ctx context.Context, cmd *WriteValueRequest) (*Wr
if msg == "" {
msg = "changes from grafana ui"
}
user := cmd.User
if user == nil {
user = &models.SignedInUser{}
usr := cmd.User
if usr == nil {
usr = &user.SignedInUser{}
}
hash, err := w.Commit(msg, &git.CommitOptions{
Author: &object.Signature{
Name: firstRealString(user.Name, user.Login, user.Email, "?"),
Email: firstRealString(user.Email, user.Login, user.Name, "?"),
Name: firstRealString(usr.Name, usr.Login, usr.Email, "?"),
Email: firstRealString(usr.Email, usr.Login, usr.Name, "?"),
When: time.Now(),
},
})