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

Auth: Duplicate API Key Name Handle With Useful HTTP Code (#17905)

Browse Source 
* API: Duplicate API Key Name Handle With Useful HTTP Code

* 17447: make changes requested during review

- use dialect.IsUniqueContraintViolation
- change if statement to match others
- return error properly

* Revert "17447: make changes requested during review"

This reverts commit a4a674ea83.

* API: useful http code on duplicate api key error w/ tests

* API: API Key Duplicate Handling

fixed small typo associated with error
This commit is contained in:
Anthony Templeton
2019-07-11 11:20:34 +03:00
committed by Sofia Papagiannaki
parent 04e7970375
commit 3680b95b44
4 changed files with 31 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/api/apikey.go
+4 -1
View File
@@ -68,7 +68,10 @@ func (hs *HTTPServer) AddAPIKey(c *models.ReqContext, cmd models.AddApiKeyComman
if err == models.ErrInvalidApiKeyExpiration {
return Error(400, err.Error(), nil)
}
return Error(500, "Failed to add API key", err)
if err == models.ErrDuplicateApiKey {
return Error(409, err.Error(), nil)
}
return Error(500, "Failed to add API Key", err)
}
result := &dtos.NewApiKeyResult{