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/web/webtest/webtest_test.go
+4 -4
View File
@@ -89,7 +89,7 @@ func TestServerClient(t *testing.T) {
req := s.NewRequest(http.MethodGet, "/test", nil)
req = RequestWithWebContext(req, &models.ReqContext{
SignedInUser: &user.SignedInUser{
UserId: 1,
UserID: 1,
},
})
resp, err := s.Send(req)
@@ -104,14 +104,14 @@ func TestServerClient(t *testing.T) {
err = json.Unmarshal(bytes, &user)
require.NoError(t, err)
require.NotNil(t, user)
require.Equal(t, int64(1), user.UserId)
require.Equal(t, int64(1), user.UserID)
})
t.Run("Making a request with user 2 should return user 2 as signed in user", func(t *testing.T) {
req := s.NewRequest(http.MethodGet, "/test", nil)
req = RequestWithWebContext(req, &models.ReqContext{
SignedInUser: &user.SignedInUser{
UserId: 2,
UserID: 2,
},
})
resp, err := s.Send(req)
@@ -126,6 +126,6 @@ func TestServerClient(t *testing.T) {
err = json.Unmarshal(bytes, &user)
require.NoError(t, err)
require.NotNil(t, user)
require.Equal(t, int64(2), user.UserId)
require.Equal(t, int64(2), user.UserID)
})
}