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

feat(invite): worked on pending invitations list, revoke invite now works, #2353

Browse Source
This commit is contained in:
Torkel Ödegaard
2015-07-20 10:57:39 +02:00
parent 4ac652b127
commit 3242354a4b
11 changed files with 116 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/api/api.go
+1
View File
@@ -94,6 +94,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))
}, regOrgAdmin)
// create new org
pkg/api/org_invite.go
+17 -2
View File
@@ -10,7 +10,7 @@ import (
)
func GetPendingOrgInvites(c *middleware.Context) Response {
query := m.GetTempUsersForOrgQuery{OrgId: c.OrgId}
query := m.GetTempUsersForOrgQuery{OrgId: c.OrgId, Status: m.TmpUserInvitePending}
if err := bus.Dispatch(&query); err != nil {
return ApiError(500, "Failed to get invites from db", err)
@@ -47,10 +47,11 @@ func AddOrgInvite(c *middleware.Context, inviteDto dtos.AddInviteForm) Response
cmd.OrgId = c.OrgId
cmd.Email = inviteDto.Email
cmd.Name = inviteDto.Name
cmd.IsInvite = true
cmd.Status = m.TmpUserInvitePending
cmd.InvitedByUserId = c.UserId
cmd.Code = util.GetRandomString(30)
cmd.Role = inviteDto.Role
cmd.RemoteAddr = c.Req.RemoteAddr
if err := bus.Dispatch(&cmd); err != nil {
return ApiError(500, "Failed to save invite to database", err)
@@ -77,3 +78,17 @@ func AddOrgInvite(c *middleware.Context, inviteDto dtos.AddInviteForm) Response
return ApiSuccess("ok, done!")
}
func RevokeInvite(c *middleware.Context) Response {
cmd := m.UpdateTempUserStatusCommand{
Id: c.ParamsInt64(":id"),
OrgId: c.OrgId,
Status: m.TmpUserRevoked,
}
if err := bus.Dispatch(&cmd); err != nil {
return ApiError(500, "Failed to update invite status", err)
}
return ApiSuccess("Invite revoked")
}
pkg/models/temp_user.go
+22 -3
View File
@@ -10,6 +10,15 @@ var (
ErrTempUserNotFound = errors.New("User not found")
)
type TempUserStatus string
const (
TmpUserInvitePending TempUserStatus = "InvitePending"
TmpUserCompleted TempUserStatus = "Completed"
TmpUserEmailPending TempUserStatus = "EmailPending"
TmpUserRevoked TempUserStatus = "Revoked"
)
// TempUser holds data for org invites and unconfirmed sign ups
type TempUser struct {
Id int64
@@ -18,12 +27,13 @@ type TempUser struct {
Email string
Name string
Role RoleType
IsInvite bool
InvitedByUserId int64
Status TempUserStatus
EmailSent bool
EmailSentOn time.Time
Code string
RemoteAddr string
Created time.Time
Updated time.Time
@@ -36,16 +46,24 @@ type CreateTempUserCommand struct {
Email string
Name string
OrgId int64
IsInvite bool
InvitedByUserId int64
Status TempUserStatus
Code string
Role RoleType
RemoteAddr string
Result *TempUser
}
type UpdateTempUserStatusCommand struct {
Id int64
OrgId int64
Status TempUserStatus
}
type GetTempUsersForOrgQuery struct {
OrgId int64
OrgId int64
Status TempUserStatus
Result []*TempUserDTO
}
@@ -56,6 +74,7 @@ type TempUserDTO struct {
Email string `json:"email"`
Role string `json:"role"`
InvitedBy string `json:"invitedBy"`
Code string `json:"code"`
EmailSent bool `json:"emailSent"`
EmailSentOn time.Time `json:"emailSentOn"`
Created time.Time `json:"createdOn"`
pkg/services/sqlstore/migrations/temp_user.go
+8 -4
View File
@@ -13,10 +13,11 @@ func addTempUserMigrations(mg *Migrator) {
{Name: "name", Type: DB_NVarchar, Length: 255, Nullable: true},
{Name: "role", Type: DB_NVarchar, Length: 20, Nullable: true},
{Name: "code", Type: DB_NVarchar, Length: 255},
{Name: "is_invite", Type: DB_Bool},
{Name: "status", Type: DB_Varchar, Length: 20},
{Name: "invited_by_user_id", Type: DB_BigInt, Nullable: true},
{Name: "email_sent", Type: DB_Bool},
{Name: "email_sent_on", Type: DB_DateTime, Nullable: true},
{Name: "remote_addr", Type: DB_Varchar, Nullable: true},
{Name: "created", Type: DB_DateTime},
{Name: "updated", Type: DB_DateTime},
},
@@ -24,11 +25,14 @@ func addTempUserMigrations(mg *Migrator) {
{Cols: []string{"email"}, Type: IndexType},
{Cols: []string{"org_id"}, Type: IndexType},
{Cols: []string{"code"}, Type: IndexType},
{Cols: []string{"status"}, Type: IndexType},
},
}
// create table
mg.AddMigration("create temp user table v1-3", NewAddTableMigration(tempUserV1))
// addDropAllIndicesMigrations(mg, "v7", tempUserV1)
// mg.AddMigration("Drop old table tempUser v7", NewDropTableMigration("temp_user"))
addTableIndicesMigrations(mg, "v1-3", tempUserV1)
// create table
mg.AddMigration("create temp user table v1-7", NewAddTableMigration(tempUserV1))
addTableIndicesMigrations(mg, "v1-7", tempUserV1)
}
pkg/services/sqlstore/temp_user.go
+14 -5
View File
@@ -3,6 +3,7 @@ package sqlstore
import (
"time"
"github.com/go-xorm/xorm"
"github.com/grafana/grafana/pkg/bus"
m "github.com/grafana/grafana/pkg/models"
)
@@ -10,6 +11,15 @@ import (
func init() {
bus.AddHandler("sql", CreateTempUser)
bus.AddHandler("sql", GetTempUsersForOrg)
bus.AddHandler("sql", UpdateTempUserStatus)
}
func UpdateTempUserStatus(cmd *m.UpdateTempUserStatusCommand) error {
return inTransaction(func(sess *xorm.Session) error {
var rawSql = "UPDATE temp_user SET status=? WHERE id=? and org_id=?"
_, err := sess.Exec(rawSql, string(cmd.Status), cmd.Id, cmd.OrgId)
return err
})
}
func CreateTempUser(cmd *m.CreateTempUserCommand) error {
@@ -22,14 +32,13 @@ func CreateTempUser(cmd *m.CreateTempUserCommand) error {
OrgId: cmd.OrgId,
Code: cmd.Code,
Role: cmd.Role,
IsInvite: cmd.IsInvite,
Status: cmd.Status,
RemoteAddr: cmd.RemoteAddr,
InvitedByUserId: cmd.InvitedByUserId,
Created: time.Now(),
Updated: time.Now(),
}
sess.UseBool("is_invite")
if _, err := sess.Insert(user); err != nil {
return err
}
@@ -51,10 +60,10 @@ func GetTempUsersForOrg(query *m.GetTempUsersForOrgQuery) error {
u.login as invited_by
FROM ` + dialect.Quote("temp_user") + ` as tu
LEFT OUTER JOIN ` + dialect.Quote("user") + ` as u on u.id = tu.invited_by_user_id
WHERE tu.org_id=? ORDER BY tu.created desc`
WHERE tu.org_id=? AND tu.status =? ORDER BY tu.created desc`
query.Result = make([]*m.TempUserDTO, 0)
sess := x.Sql(rawSql, query.OrgId)
sess := x.Sql(rawSql, query.OrgId, string(query.Status))
err := sess.Find(&query.Result)
return err
}
pkg/services/sqlstore/temp_user_test.go
+11 -5
View File
@@ -15,22 +15,28 @@ func TestTempUserCommandsAndQueries(t *testing.T) {
Convey("Given saved api key", func() {
cmd := m.CreateTempUserCommand{
OrgId: 2256,
Name: "hello",
Email: "e@as.co",
IsInvite: true,
OrgId: 2256,
Name: "hello",
Email: "e@as.co",
Status: m.TmpUserInvitePending,
}
err := CreateTempUser(&cmd)
So(err, ShouldBeNil)
Convey("Should be able to get temp users by org id", func() {
query := m.GetTempUsersForOrgQuery{OrgId: 2256}
query := m.GetTempUsersForOrgQuery{OrgId: 2256, Status: m.TmpUserInvitePending}
err = GetTempUsersForOrg(&query)
So(err, ShouldBeNil)
So(len(query.Result), ShouldEqual, 1)
})
Convey("Should be able update status", func() {
cmd2 := m.UpdateTempUserStatusCommand{OrgId: 2256, Status: m.TmpUserRevoked, Id: cmd.Result.Id}
err := UpdateTempUserStatus(&cmd2)
So(err, ShouldBeNil)
})
})
})
}