[v9.4.x] LDAP: Fix user disabling (#74318)
* [LDAP] Disable removed users on login (#74016) * manual backport of #74016 on legacy code * LDAP: Fix active sync with large quantities of users (#73834) * Fix authenticate user test
This commit is contained in:
@@ -67,7 +67,7 @@ func TestMiddlewareBasicAuth(t *testing.T) {
|
||||
|
||||
sc.userService.ExpectedUser = &user.User{Password: encoded, ID: id, Salt: salt}
|
||||
sc.userService.ExpectedSignedInUser = &user.SignedInUser{UserID: id}
|
||||
login.ProvideService(sc.mockSQLStore, &logintest.LoginServiceFake{}, nil, sc.userService)
|
||||
login.ProvideService(sc.mockSQLStore, &logintest.LoginServiceFake{}, nil, sc.userService, sc.authInfoService, sc.cfg)
|
||||
|
||||
authHeader := util.GetBasicAuthHeader("myUser", password)
|
||||
sc.fakeReq("GET", "/").withAuthorizationHeader(authHeader).exec()
|
||||
|
||||
@@ -18,6 +18,7 @@ import (
|
||||
"github.com/grafana/grafana/pkg/services/contexthandler/ctxkey"
|
||||
contextmodel "github.com/grafana/grafana/pkg/services/contexthandler/model"
|
||||
"github.com/grafana/grafana/pkg/services/login/loginservice"
|
||||
"github.com/grafana/grafana/pkg/services/login/logintest"
|
||||
"github.com/grafana/grafana/pkg/services/org/orgtest"
|
||||
"github.com/grafana/grafana/pkg/services/user/usertest"
|
||||
"github.com/grafana/grafana/pkg/setting"
|
||||
@@ -49,6 +50,7 @@ type scenarioContext struct {
|
||||
userService *usertest.FakeUserService
|
||||
oauthTokenService *authtest.FakeOAuthTokenService
|
||||
orgService *orgtest.FakeOrgService
|
||||
authInfoService *logintest.AuthInfoServiceFake
|
||||
|
||||
req *http.Request
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user