LDAP: Fix LDAP users authenticated via auth proxy not being able to use LDAP active sync (#83715)
* fix LDAP users authenticated via auth proxy not being able to use ldap sync * simplify id resolution at the cost of no fallthrough * remove unused services * remove unused cache key
This commit is contained in:
@@ -13,7 +13,6 @@ import (
|
||||
|
||||
"github.com/grafana/grafana/pkg/services/authn"
|
||||
"github.com/grafana/grafana/pkg/services/authn/authntest"
|
||||
"github.com/grafana/grafana/pkg/services/user/usertest"
|
||||
"github.com/grafana/grafana/pkg/setting"
|
||||
)
|
||||
|
||||
@@ -113,7 +112,7 @@ func TestProxy_Authenticate(t *testing.T) {
|
||||
calledAdditional = additional
|
||||
return nil, nil
|
||||
}}
|
||||
c, err := ProvideProxy(cfg, &fakeCache{expectedErr: errors.New("")}, usertest.NewUserServiceFake(), proxyClient)
|
||||
c, err := ProvideProxy(cfg, &fakeCache{expectedErr: errors.New("")}, proxyClient)
|
||||
require.NoError(t, err)
|
||||
|
||||
_, err = c.Authenticate(context.Background(), tt.req)
|
||||
@@ -210,7 +209,7 @@ func TestProxy_Hook(t *testing.T) {
|
||||
withRole := func(role string) func(t *testing.T) {
|
||||
cacheKey := fmt.Sprintf("users:johndoe-%s", role)
|
||||
return func(t *testing.T) {
|
||||
c, err := ProvideProxy(cfg, cache, usertest.NewUserServiceFake(), authntest.MockProxyClient{})
|
||||
c, err := ProvideProxy(cfg, cache, authntest.MockProxyClient{})
|
||||
require.NoError(t, err)
|
||||
userIdentity := &authn.Identity{
|
||||
ID: userID,
|
||||
|
||||
Reference in New Issue
Block a user