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:
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
+4 -4
View File
@@ -308,13 +308,13 @@ func getDashboards(t *testing.T, sqlStore *SQLStore, search Search, aclUserID in
builder := NewSqlBuilder(sqlStore.Cfg)
signedInUser := &user.SignedInUser{
UserId: 9999999999,
UserID: 9999999999,
}
if search.OrgId == 0 {
signedInUser.OrgId = 1
signedInUser.OrgID = 1
} else {
signedInUser.OrgId = search.OrgId
signedInUser.OrgID = search.OrgId
}
if len(string(search.UsersOrgRole)) > 0 {
@@ -323,7 +323,7 @@ func getDashboards(t *testing.T, sqlStore *SQLStore, search Search, aclUserID in
signedInUser.OrgRole = org.RoleViewer
}
if search.UserFromACL {
signedInUser.UserId = aclUserID
signedInUser.UserID = aclUserID
}
var res []*dashboardResponse