IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix panic in legacy alerting after identity.Requester migration (#74265)

Browse Source
This commit is contained in:
Marcus Efraimsson
2023-09-01 12:30:53 +02:00
committed by GitHub
parent 124f445db0
commit 76d9f46edb
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/services/pluginsintegration/plugincontext/plugincontext.go
View File

@@ -49,7 +49,7 @@ func (p *Provider) Get(ctx context.Context, pluginID string, user identity.Reque
pCtx := backend.PluginContext{ pCtx := backend.PluginContext{
PluginID: pluginID, PluginID: pluginID,
} }
if user != nil { if user != nil && !user.IsNil() {
pCtx.OrgID = user.GetOrgID() pCtx.OrgID = user.GetOrgID()
pCtx.User = adapters.BackendUserFromSignedInUser(user) pCtx.User = adapters.BackendUserFromSignedInUser(user)
} }
@@ -77,7 +77,7 @@ func (p *Provider) GetWithDataSource(ctx context.Context, pluginID string, user
pCtx := backend.PluginContext{ pCtx := backend.PluginContext{
PluginID: pluginID, PluginID: pluginID,
} }
if user != nil { if user != nil && !user.IsNil() {
pCtx.OrgID = user.GetOrgID() pCtx.OrgID = user.GetOrgID()
pCtx.User = adapters.BackendUserFromSignedInUser(user) pCtx.User = adapters.BackendUserFromSignedInUser(user)
} }