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

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

8
pkg/services/sqlstore/temp_user.go
View File

@@ -12,13 +12,13 @@ func init() {
bus.AddHandler("sql", CreateTempUser)
bus.AddHandler("sql", GetTempUsersForOrg)
bus.AddHandler("sql", UpdateTempUserStatus)
bus.AddHandler("sql", GetTempUsersByCode)
bus.AddHandler("sql", GetTempUserByCode)
}
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)
var rawSql = "UPDATE temp_user SET status=? WHERE code=?"
_, err := sess.Exec(rawSql, string(cmd.Status), cmd.Code)
return err
})
}
@@ -70,7 +70,7 @@ func GetTempUsersForOrg(query *m.GetTempUsersForOrgQuery) error {
return err
}
func GetTempUsersByCode(query *m.GetTempUsersByCodeQuery) error {
func GetTempUserByCode(query *m.GetTempUserByCodeQuery) error {
var user m.TempUser
has, err := x.Table("temp_user").Where("code=?", query.Code).Get(&user)

3
pkg/services/sqlstore/temp_user_test.go
View File

@@ -17,6 +17,7 @@ func TestTempUserCommandsAndQueries(t *testing.T) {
cmd := m.CreateTempUserCommand{
OrgId: 2256,
Name: "hello",
Code: "asd",
Email: "e@as.co",
Status: m.TmpUserInvitePending,
}
@@ -32,7 +33,7 @@ func TestTempUserCommandsAndQueries(t *testing.T) {
})
Convey("Should be able update status", func() {
cmd2 := m.UpdateTempUserStatusCommand{OrgId: 2256, Status: m.TmpUserRevoked, Id: cmd.Result.Id}
cmd2 := m.UpdateTempUserStatusCommand{Code: "asd", Status: m.TmpUserRevoked}
err := UpdateTempUserStatus(&cmd2)
So(err, ShouldBeNil)
})