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

Use OrgUser method from org service (#55674)

Browse Source 
* Use OrgUser method from org service

* Use GetOrgUser from org service
This commit is contained in:
idafurjes
2022-09-26 10:27:38 +02:00
committed by GitHub
parent 15de96286a
commit 178cd0a232
3 changed files with 44 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/services/login/loginservice/loginservice.go
+7 -7
View File
@@ -280,16 +280,16 @@ func (ls *Implementation) syncOrgRoles(ctx context.Context, usr *user.User, extU
deleteOrgIds := []int64{}
// update existing org roles
for _, org := range orgsQuery.Result {
handledOrgIds[org.OrgId] = true
for _, orga := range orgsQuery.Result {
handledOrgIds[orga.OrgId] = true
extRole := extUser.OrgRoles[org.OrgId]
extRole := extUser.OrgRoles[orga.OrgId]
if extRole == "" {
deleteOrgIds = append(deleteOrgIds, org.OrgId)
} else if extRole != org.Role {
deleteOrgIds = append(deleteOrgIds, orga.OrgId)
} else if extRole != orga.Role {
// update role
cmd := &models.UpdateOrgUserCommand{OrgId: org.OrgId, UserId: usr.ID, Role: extRole}
if err := ls.SQLStore.UpdateOrgUser(ctx, cmd); err != nil {
cmd := &org.UpdateOrgUserCommand{OrgID: orga.OrgId, UserID: usr.ID, Role: extRole}
if err := ls.orgService.UpdateOrgUser(ctx, cmd); err != nil {
return err
}
}