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

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

Browse Source 
Allow api to accept inviting existing users when login form is disabled.
UI shows invite button when login form is disabled.
This commit is contained in:
548017
2019-09-12 18:45:50 +02:00
committed by Marcus Efraimsson
parent 9eafc693b2
commit 09b434bdd0
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
pkg/api/org_invite.go
View File

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

2
public/app/features/users/state/reducers.ts
View File

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