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

Server: Return 404 when non-pending invite is requested (#20863)

Browse Source 
Server API: Return 404 when non-pending invite is requested
This commit is contained in:
Arve Knudsen
2019-12-04 13:01:37 +01:00
committed by GitHub
parent 6682a36b8a
commit abc7893fdc
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
pkg/api/org_invite.go
View File

@@ -132,9 +132,11 @@ func RevokeInvite(c *m.ReqContext) Response {
return Success("Invite revoked") return Success("Invite revoked")
} }
// GetInviteInfoByCode gets a pending user invite corresponding to a certain code.
// A response containing an InviteInfo object is returned if the invite is found.
// If a (pending) invite is not found, 404 is returned.
func GetInviteInfoByCode(c *m.ReqContext) Response { func GetInviteInfoByCode(c *m.ReqContext) Response {
query := m.GetTempUserByCodeQuery{Code: c.Params(":code")} query := m.GetTempUserByCodeQuery{Code: c.Params(":code")}
if err := bus.Dispatch(&query); err != nil { if err := bus.Dispatch(&query); err != nil {
if err == m.ErrTempUserNotFound { if err == m.ErrTempUserNotFound {
return Error(404, "Invite not found", nil) return Error(404, "Invite not found", nil)
@@ -143,6 +145,9 @@ func GetInviteInfoByCode(c *m.ReqContext) Response {
} }
invite := query.Result invite := query.Result
if invite.Status != m.TmpUserInvitePending {
return Error(404, "Invite not found", nil)
}
return JSON(200, dtos.InviteInfo{ return JSON(200, dtos.InviteInfo{
Email: invite.Email, Email: invite.Email,