mirror of
https://github.com/grafana/grafana.git
synced 2025-02-25 18:55:37 -06:00
Chore: Add user service method SetUsingOrg and GetSignedInUserWithCacheCtx (#53343)
* Chore: Add user service method SetUsingOrg * Chore: Add user service method GetSignedInUserWithCacheCtx * Use method GetSignedInUserWithCacheCtx from user service * Fix lint after rebase * Fix lint * Fix lint error * roll back some changes * Roll back changes in api and middleware * Add xorm tags to SignedInUser ID fields
This commit is contained in:
@@ -54,7 +54,7 @@ func TestGetPluginDashboards(t *testing.T) {
|
||||
|
||||
t.Run("Signed in and not org admin should return 403 Forbidden", func(t *testing.T) {
|
||||
user := &user.SignedInUser{
|
||||
UserId: 1,
|
||||
UserID: 1,
|
||||
OrgRole: org.RoleEditor,
|
||||
}
|
||||
|
||||
@@ -66,8 +66,8 @@ func TestGetPluginDashboards(t *testing.T) {
|
||||
|
||||
t.Run("Signed in and org admin", func(t *testing.T) {
|
||||
user := &user.SignedInUser{
|
||||
UserId: 1,
|
||||
OrgId: 1,
|
||||
UserID: 1,
|
||||
OrgID: 1,
|
||||
OrgRole: org.RoleAdmin,
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user