public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Chore: Add user service method SetUsingOrg and GetSignedInUserWithCacheCtx (#53343)

Browse Source 
* 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:
idafurjes
2022-08-11 13:28:55 +02:00
committed by GitHub
parent ca72cd570e
commit a14621fff6
191 changed files with 1108 additions and 1049 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/services/dashboardimport/api/api_test.go
+5 -5
View File
@@ -52,7 +52,7 @@ func TestImportDashboardAPI(t *testing.T) {
require.NoError(t, err)
req := s.NewPostRequest("/api/dashboards/import", bytes.NewReader(jsonBytes))
webtest.RequestWithSignedInUser(req, &user.SignedInUser{
UserId: 1,
UserID: 1,
})
resp, err := s.SendJSON(req)
require.NoError(t, err)
@@ -68,7 +68,7 @@ func TestImportDashboardAPI(t *testing.T) {
require.NoError(t, err)
req := s.NewPostRequest("/api/dashboards/import", bytes.NewReader(jsonBytes))
webtest.RequestWithSignedInUser(req, &user.SignedInUser{
UserId: 1,
UserID: 1,
})
resp, err := s.SendJSON(req)
require.NoError(t, err)
@@ -85,7 +85,7 @@ func TestImportDashboardAPI(t *testing.T) {
require.NoError(t, err)
req := s.NewPostRequest("/api/dashboards/import?trimdefaults=true", bytes.NewReader(jsonBytes))
webtest.RequestWithSignedInUser(req, &user.SignedInUser{
UserId: 1,
UserID: 1,
})
resp, err := s.SendJSON(req)
require.NoError(t, err)
@@ -117,7 +117,7 @@ func TestImportDashboardAPI(t *testing.T) {
require.NoError(t, err)
req := s.NewPostRequest("/api/dashboards/import?trimdefaults=true", bytes.NewReader(jsonBytes))
webtest.RequestWithSignedInUser(req, &user.SignedInUser{
UserId: 1,
UserID: 1,
})
resp, err := s.SendJSON(req)
require.NoError(t, err)
@@ -143,7 +143,7 @@ func TestImportDashboardAPI(t *testing.T) {
require.NoError(t, err)
req := s.NewPostRequest("/api/dashboards/import", bytes.NewReader(jsonBytes))
webtest.RequestWithSignedInUser(req, &user.SignedInUser{
UserId: 1,
UserID: 1,
})
resp, err := s.SendJSON(req)
require.NoError(t, err)