Auth: Allow inviting existing users when login form is disabled (#19048)

Allow api to accept inviting existing users when login form is disabled.
UI shows invite button when login form is disabled.
pull/19061/head
548017 6 years ago committed by Marcus Efraimsson
parent 9eafc693b2
commit 09b434bdd0
  1. 8
      pkg/api/org_invite.go
  2. 2
      public/app/features/users/state/reducers.ts

@ -27,10 +27,6 @@ func GetPendingOrgInvites(c *m.ReqContext) Response {
}
func AddOrgInvite(c *m.ReqContext, inviteDto dtos.AddInviteForm) Response {
if setting.DisableLoginForm {
return Error(400, "Cannot invite when login is disabled.", nil)
}
if !inviteDto.Role.IsValid() {
return Error(400, "Invalid role specified", nil)
}
@ -45,6 +41,10 @@ func AddOrgInvite(c *m.ReqContext, inviteDto dtos.AddInviteForm) Response {
return inviteExistingUserToOrg(c, userQuery.Result, &inviteDto)
}
if setting.DisableLoginForm {
return Error(400, "Cannot invite when login is disabled.", nil)
}
cmd := m.CreateTempUserCommand{}
cmd.OrgId = c.OrgId
cmd.Email = inviteDto.LoginOrEmail

@ -6,7 +6,7 @@ export const initialState: UsersState = {
invitees: [] as Invitee[],
users: [] as OrgUser[],
searchQuery: '',
canInvite: !config.disableLoginForm && !config.externalUserMngLinkName,
canInvite: !config.externalUserMngLinkName,
externalUserMngInfo: config.externalUserMngInfo,
externalUserMngLinkName: config.externalUserMngLinkName,
externalUserMngLinkUrl: config.externalUserMngLinkUrl,

Loading…
Cancel
Save