opensource/grafana
1
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-08-01 13:12:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

Handle request service account when not enabled (#42122)

Browse Source 
* Handle request service account when not enabled
This commit is contained in:
Jeremy Price
2021-11-24 11:56:55 +01:00
committed by GitHub
parent fe84454bb0
commit a145ec37bb
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/api/apikey.go
View File

@ -96,6 +96,10 @@ func (hs *HTTPServer) AddAPIKey(c *models.ReqContext, cmd models.AddApiKeyComman
return response.Error(403, "Target service is not in the same organisation as requesting user or api key", err) return response.Error(403, "Target service is not in the same organisation as requesting user or api key", err)
} }
} }
} else {
if cmd.CreateNewServiceAccount {
return response.Error(400, "Service accounts disabled. Retry create api request without service account flag.", err)
}
} }
newKeyInfo, err := apikeygen.New(cmd.OrgId, cmd.Name) newKeyInfo, err := apikeygen.New(cmd.OrgId, cmd.Name)