mirror of
https://github.com/grafana/grafana.git
synced 2025-02-25 18:55:37 -06:00
feat(invite): can now add org user with sername again, #2353
This commit is contained in:
parent
775e044e69
commit
e53c1e39d3
@ -3,10 +3,10 @@ package dtos
|
|||||||
import m "github.com/grafana/grafana/pkg/models"
|
import m "github.com/grafana/grafana/pkg/models"
|
||||||
|
|
||||||
type AddInviteForm struct {
|
type AddInviteForm struct {
|
||||||
Email string `json:"email" binding:"Required"`
|
LoginOrEmail string `json:"loginOrEmail" binding:"Required"`
|
||||||
Name string `json:"name"`
|
Name string `json:"name"`
|
||||||
Role m.RoleType `json:"role" binding:"Required"`
|
Role m.RoleType `json:"role" binding:"Required"`
|
||||||
SkipEmails bool `json:"skipEmails"`
|
SkipEmails bool `json:"skipEmails"`
|
||||||
}
|
}
|
||||||
|
|
||||||
type InviteInfo struct {
|
type InviteInfo struct {
|
||||||
|
@ -31,12 +31,9 @@ func AddOrgInvite(c *middleware.Context, inviteDto dtos.AddInviteForm) Response
|
|||||||
if !inviteDto.Role.IsValid() {
|
if !inviteDto.Role.IsValid() {
|
||||||
return ApiError(400, "Invalid role specified", nil)
|
return ApiError(400, "Invalid role specified", nil)
|
||||||
}
|
}
|
||||||
if !util.IsEmail(inviteDto.Email) {
|
|
||||||
return ApiError(400, "Invalid email specified", nil)
|
|
||||||
}
|
|
||||||
|
|
||||||
// first try get existing user
|
// first try get existing user
|
||||||
userQuery := m.GetUserByLoginQuery{LoginOrEmail: inviteDto.Email}
|
userQuery := m.GetUserByLoginQuery{LoginOrEmail: inviteDto.LoginOrEmail}
|
||||||
if err := bus.Dispatch(&userQuery); err != nil {
|
if err := bus.Dispatch(&userQuery); err != nil {
|
||||||
if err != m.ErrUserNotFound {
|
if err != m.ErrUserNotFound {
|
||||||
return ApiError(500, "Failed to query db for existing user check", err)
|
return ApiError(500, "Failed to query db for existing user check", err)
|
||||||
@ -46,17 +43,17 @@ func AddOrgInvite(c *middleware.Context, inviteDto dtos.AddInviteForm) Response
|
|||||||
createOrgUserCmd := m.AddOrgUserCommand{OrgId: c.OrgId, UserId: userQuery.Result.Id, Role: inviteDto.Role}
|
createOrgUserCmd := m.AddOrgUserCommand{OrgId: c.OrgId, UserId: userQuery.Result.Id, Role: inviteDto.Role}
|
||||||
if err := bus.Dispatch(&createOrgUserCmd); err != nil {
|
if err := bus.Dispatch(&createOrgUserCmd); err != nil {
|
||||||
if err == m.ErrOrgUserAlreadyAdded {
|
if err == m.ErrOrgUserAlreadyAdded {
|
||||||
return ApiError(412, fmt.Sprintf("User %s is already added to organization", inviteDto.Email), err)
|
return ApiError(412, fmt.Sprintf("User %s is already added to organization", inviteDto.LoginOrEmail), err)
|
||||||
}
|
}
|
||||||
return ApiError(500, "Error while trying to create org user", err)
|
return ApiError(500, "Error while trying to create org user", err)
|
||||||
} else {
|
} else {
|
||||||
return ApiSuccess("Existing Grafana user added to org " + c.OrgName)
|
return ApiSuccess(fmt.Sprintf("Existing Grafana user %s added to org %s", userQuery.Result.NameOrFallback(), c.OrgName))
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
cmd := m.CreateTempUserCommand{}
|
cmd := m.CreateTempUserCommand{}
|
||||||
cmd.OrgId = c.OrgId
|
cmd.OrgId = c.OrgId
|
||||||
cmd.Email = inviteDto.Email
|
cmd.Email = inviteDto.LoginOrEmail
|
||||||
cmd.Name = inviteDto.Name
|
cmd.Name = inviteDto.Name
|
||||||
cmd.Status = m.TmpUserInvitePending
|
cmd.Status = m.TmpUserInvitePending
|
||||||
cmd.InvitedByUserId = c.UserId
|
cmd.InvitedByUserId = c.UserId
|
||||||
@ -69,9 +66,9 @@ func AddOrgInvite(c *middleware.Context, inviteDto dtos.AddInviteForm) Response
|
|||||||
}
|
}
|
||||||
|
|
||||||
// send invite email
|
// send invite email
|
||||||
if !inviteDto.SkipEmails {
|
if !inviteDto.SkipEmails && util.IsEmail(inviteDto.LoginOrEmail) {
|
||||||
emailCmd := m.SendEmailCommand{
|
emailCmd := m.SendEmailCommand{
|
||||||
To: []string{inviteDto.Email},
|
To: []string{inviteDto.LoginOrEmail},
|
||||||
Template: "new_user_invite.html",
|
Template: "new_user_invite.html",
|
||||||
Data: map[string]interface{}{
|
Data: map[string]interface{}{
|
||||||
"NameOrEmail": util.StringsFallback2(cmd.Name, cmd.Email),
|
"NameOrEmail": util.StringsFallback2(cmd.Name, cmd.Email),
|
||||||
@ -85,10 +82,11 @@ func AddOrgInvite(c *middleware.Context, inviteDto dtos.AddInviteForm) Response
|
|||||||
if err := bus.Dispatch(&emailCmd); err != nil {
|
if err := bus.Dispatch(&emailCmd); err != nil {
|
||||||
return ApiError(500, "Failed to send email invite", err)
|
return ApiError(500, "Failed to send email invite", err)
|
||||||
}
|
}
|
||||||
return ApiSuccess(fmt.Sprintf("Sent invite to %s", inviteDto.Email))
|
|
||||||
|
return ApiSuccess(fmt.Sprintf("Sent invite to %s", inviteDto.LoginOrEmail))
|
||||||
}
|
}
|
||||||
|
|
||||||
return ApiSuccess(fmt.Sprintf("Created invite for %s", inviteDto.Email))
|
return ApiSuccess(fmt.Sprintf("Created invite for %s", inviteDto.LoginOrEmail))
|
||||||
}
|
}
|
||||||
|
|
||||||
func RevokeInvite(c *middleware.Context) Response {
|
func RevokeInvite(c *middleware.Context) Response {
|
||||||
|
@ -5,11 +5,11 @@
|
|||||||
</a>
|
</a>
|
||||||
|
|
||||||
<h3>
|
<h3>
|
||||||
Invite New Users
|
Invite Users
|
||||||
</h3>
|
</h3>
|
||||||
|
|
||||||
<div class="modal-tagline">
|
<div class="modal-tagline">
|
||||||
Invite new or add existing Grafana users to the organization
|
Send invite or add existing Grafana users to the organization
|
||||||
<span class="highlight-word">{{contextSrv.user.orgName}}</span>
|
<span class="highlight-word">{{contextSrv.user.orgName}}</span>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
@ -25,8 +25,7 @@
|
|||||||
Email or Username
|
Email or Username
|
||||||
</li>
|
</li>
|
||||||
<li>
|
<li>
|
||||||
<input type="email" ng-model="invite.email" required
|
<input type="text" ng-model="invite.loginOrEmail" required class="input-large tight-form-input" placeholder="email@test.com">
|
||||||
class="input-large tight-form-input" placeholder="email@test.com">
|
|
||||||
</li>
|
</li>
|
||||||
<li class="tight-form-item">
|
<li class="tight-form-item">
|
||||||
Name
|
Name
|
||||||
|
Loading…
Reference in New Issue
Block a user