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

Chore: Port oauth token service to identity requester (#73988)

Browse Source 
* port oauth token service to identity requester

* fix broken test

* no need to check for render
This commit is contained in:
Jo
2023-08-29 11:55:58 +02:00
committed by GitHub
parent 7c98678188
commit fe1563882a
7 changed files with 61 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/services/user/identity.go
+5 -1
View File
@@ -156,7 +156,11 @@ func (u *SignedInUser) GetNamespacedID() (string, string) {
case u.IsAnonymous:
return identity.NamespaceAnonymous, ""
case u.AuthenticatedBy == "render": //import cycle render
return identity.NamespaceRenderService, fmt.Sprintf("%d", u.UserID)
if u.UserID == 0 {
return identity.NamespaceRenderService, fmt.Sprintf("%d", u.UserID)
} else { // this should never happen as u.UserID > 0 already catches this
return identity.NamespaceUser, fmt.Sprintf("%d", u.UserID)
}
}
// backwards compatibility