opensource/grafana
1
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-09-27 05:43:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat(invite): more progress on completing invite form and actually creating a real user, #2353

Browse Source
This commit is contained in:
Torkel Ödegaard
2015-07-20 17:46:48 +02:00
parent d75f96fdd5
commit ab54971763
9 changed files with 89 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
pkg/api/api.go
View File

@ -45,6 +45,7 @@ func Register(r *macaron.Macaron) {
// invited
r.Get("/api/user/invite/:code", wrap(GetInviteInfoByCode))
r.Post("/api/user/invite/complete", bind(dtos.CompleteInviteForm{}), wrap(CompleteInvite))
// reset password
r.Get("/user/password/send-reset-email", Index)
@ -97,7 +98,7 @@ func Register(r *macaron.Macaron) {
// invites
r.Get("/invites", wrap(GetPendingOrgInvites))
r.Post("/invites", bind(dtos.AddInviteForm{}), wrap(AddOrgInvite))
r.Patch("/invites/:id/revoke", wrap(RevokeInvite))
r.Patch("/invites/:code/revoke", wrap(RevokeInvite))
}, regOrgAdmin)
// create new org