From d3ead7dc8535f8fa5b175686cc1f7669c8b1648b Mon Sep 17 00:00:00 2001 From: Balasankar C Date: Fri, 18 May 2018 19:27:30 +0530 Subject: MM-10640 Set EnableUserCreation to true by default (#8815) * Set EnableUserCreation to true by default * Fix argument type to FormatBool * Convert EnableUserCreation instances to pointer * Convert to boolean in tests also * Set value of pointer to be false * Convert remaining EnableUserCreation instances to pointer --- app/command_invite_people.go | 4 ++-- app/diagnostics.go | 2 +- app/user.go | 4 ++-- app/user_test.go | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) (limited to 'app') diff --git a/app/command_invite_people.go b/app/command_invite_people.go index e5ff5a316..c3dc4f469 100644 --- a/app/command_invite_people.go +++ b/app/command_invite_people.go @@ -28,7 +28,7 @@ func (me *InvitePeopleProvider) GetTrigger() string { func (me *InvitePeopleProvider) GetCommand(a *App, T goi18n.TranslateFunc) *model.Command { autoComplete := true - if !a.Config().EmailSettings.SendEmailNotifications || !a.Config().TeamSettings.EnableUserCreation { + if !a.Config().EmailSettings.SendEmailNotifications || !*a.Config().TeamSettings.EnableUserCreation { autoComplete = false } return &model.Command{ @@ -45,7 +45,7 @@ func (me *InvitePeopleProvider) DoCommand(a *App, args *model.CommandArgs, messa return &model.CommandResponse{ResponseType: model.COMMAND_RESPONSE_TYPE_EPHEMERAL, Text: args.T("api.command.invite_people.email_off")} } - if !a.Config().TeamSettings.EnableUserCreation { + if !*a.Config().TeamSettings.EnableUserCreation { return &model.CommandResponse{ResponseType: model.COMMAND_RESPONSE_TYPE_EPHEMERAL, Text: args.T("api.command.invite_people.invite_off")} } diff --git a/app/diagnostics.go b/app/diagnostics.go index fc8a2e886..6855731ce 100644 --- a/app/diagnostics.go +++ b/app/diagnostics.go @@ -244,7 +244,7 @@ func (a *App) trackConfig() { }) a.SendDiagnostic(TRACK_CONFIG_TEAM, map[string]interface{}{ - "enable_user_creation": cfg.TeamSettings.EnableUserCreation, + "enable_user_creation": *cfg.TeamSettings.EnableUserCreation, "enable_team_creation": *cfg.TeamSettings.EnableTeamCreation, "restrict_team_invite": *cfg.TeamSettings.RestrictTeamInvite, "restrict_public_channel_creation": *cfg.TeamSettings.RestrictPublicChannelCreation, diff --git a/app/user.go b/app/user.go index 2ee410684..2325c6338 100644 --- a/app/user.go +++ b/app/user.go @@ -162,7 +162,7 @@ func (a *App) CreateUserFromSignup(user *model.User) (*model.User, *model.AppErr } func (a *App) IsUserSignUpAllowed() *model.AppError { - if !a.Config().EmailSettings.EnableSignUpWithEmail || !a.Config().TeamSettings.EnableUserCreation { + if !a.Config().EmailSettings.EnableSignUpWithEmail || !*a.Config().TeamSettings.EnableUserCreation { err := model.NewAppError("IsUserSignUpAllowed", "api.user.create_user.signup_email_disabled.app_error", nil, "", http.StatusNotImplemented) return err } @@ -250,7 +250,7 @@ func (a *App) createUser(user *model.User) (*model.User, *model.AppError) { } func (a *App) CreateOAuthUser(service string, userData io.Reader, teamId string) (*model.User, *model.AppError) { - if !a.Config().TeamSettings.EnableUserCreation { + if !*a.Config().TeamSettings.EnableUserCreation { return nil, model.NewAppError("CreateOAuthUser", "api.user.create_user.disabled.app_error", nil, "", http.StatusNotImplemented) } diff --git a/app/user_test.go b/app/user_test.go index 20dafd826..f0e026fa9 100644 --- a/app/user_test.go +++ b/app/user_test.go @@ -88,7 +88,7 @@ func TestCreateOAuthUser(t *testing.T) { th.App.PermanentDeleteUser(user) - th.App.Config().TeamSettings.EnableUserCreation = false + *th.App.Config().TeamSettings.EnableUserCreation = false _, err = th.App.CreateOAuthUser(model.USER_AUTH_SERVICE_GITLAB, strings.NewReader(json), th.BasicTeam.Id) if err == nil { -- cgit v1.2.3-1-g7c22 From b2ad52376530c59bc40f443be2b2461f26935731 Mon Sep 17 00:00:00 2001 From: Christopher Speller Date: Fri, 18 May 2018 13:07:52 -0700 Subject: Fixing TE login. (#8826) --- app/login.go | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'app') diff --git a/app/login.go b/app/login.go index a07056c1e..3001e1f4d 100644 --- a/app/login.go +++ b/app/login.go @@ -67,9 +67,11 @@ func (a *App) GetUserForLogin(id, loginId string) (*model.User, *model.AppError) return result.Data.(*model.User), nil } - // Try to get the user with LDAP - if user, err := a.Ldap.GetUser(loginId); err == nil { - return user, nil + // Try to get the user with LDAP if enabled + if *a.Config().LdapSettings.Enable && a.Ldap != nil { + if user, err := a.Ldap.GetUser(loginId); err == nil { + return user, nil + } } return nil, model.NewAppError("GetUserForLogin", "store.sql_user.get_for_login.app_error", nil, "", http.StatusBadRequest) -- cgit v1.2.3-1-g7c22 From a9d083d119a190d733e1b8ed3a37996c5f601f90 Mon Sep 17 00:00:00 2001 From: Joram Wilander Date: Fri, 18 May 2018 18:02:40 -0400 Subject: Skip cluster send when getting non-cached statuses (#8824) --- app/status.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'app') diff --git a/app/status.go b/app/status.go index d8e93e2f1..9aab82328 100644 --- a/app/status.go +++ b/app/status.go @@ -87,7 +87,7 @@ func (a *App) GetStatusesByIds(userIds []string) (map[string]interface{}, *model statuses := result.Data.([]*model.Status) for _, s := range statuses { - a.AddStatusCache(s) + a.AddStatusCacheSkipClusterSend(s) statusMap[s.UserId] = s.Status } } @@ -134,7 +134,7 @@ func (a *App) GetUserStatusesByIds(userIds []string) ([]*model.Status, *model.Ap statuses := result.Data.([]*model.Status) for _, s := range statuses { - a.AddStatusCache(s) + a.AddStatusCacheSkipClusterSend(s) } statusMap = append(statusMap, statuses...) -- cgit v1.2.3-1-g7c22