From 3fedcb1e4beca613b70cb19b50e5411ae29d07e6 Mon Sep 17 00:00:00 2001 From: Dan Cech Date: Tue, 17 Apr 2018 17:48:56 -0400 Subject: [PATCH] cleanup, make sure users are always synced with ldap --- pkg/login/ext_user.go | 7 +------ pkg/middleware/auth_proxy.go | 2 ++ 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/pkg/login/ext_user.go b/pkg/login/ext_user.go index 17630357350..253bbec514c 100644 --- a/pkg/login/ext_user.go +++ b/pkg/login/ext_user.go @@ -68,12 +68,7 @@ func UpsertUser(cmd *m.UpsertUserCommand) error { } } - err = syncOrgRoles(cmd.Result, extUser) - if err != nil { - return err - } - - return nil + return syncOrgRoles(cmd.Result, extUser) } func createUser(extUser *m.ExternalUserInfo) (*m.User, error) { diff --git a/pkg/middleware/auth_proxy.go b/pkg/middleware/auth_proxy.go index c4e28252964..36b059e4ae7 100644 --- a/pkg/middleware/auth_proxy.go +++ b/pkg/middleware/auth_proxy.go @@ -65,6 +65,8 @@ func initContextWithAuthProxy(ctx *m.ReqContext, orgID int64) bool { query.UserId = getRequestUserId(ctx) // if we're using ldap, pass authproxy login name to ldap user sync } else if setting.LdapEnabled { + ctx.Session.Delete(session.SESS_KEY_LASTLDAPSYNC) + syncQuery := &m.LoginUserQuery{ ReqContext: ctx, Username: proxyHeaderValue,