[MM-54434] Use job.Logger to capture ldap logs (#24493)

Этот коммит содержится в:
Ben Schumacher
2023-10-06 22:43:21 +02:00
коммит произвёл GitHub
родитель afaf41b587
Коммит aad25be4e1
50 изменённых файлов: 385 добавлений и 426 удалений

Просмотреть файл

@@ -9,6 +9,8 @@ import (
model "github.com/mattermost/mattermost/server/public/model"
mock "github.com/stretchr/testify/mock"
request "github.com/mattermost/mattermost/server/public/shared/request"
)
// OAuthProvider is an autogenerated mock type for the OAuthProvider type
@@ -16,25 +18,25 @@ type OAuthProvider struct {
mock.Mock
}
// GetSSOSettings provides a mock function with given fields: config, service
func (_m *OAuthProvider) GetSSOSettings(config *model.Config, service string) (*model.SSOSettings, error) {
ret := _m.Called(config, service)
// GetSSOSettings provides a mock function with given fields: c, config, service
func (_m *OAuthProvider) GetSSOSettings(c *request.Context, config *model.Config, service string) (*model.SSOSettings, error) {
ret := _m.Called(c, config, service)
var r0 *model.SSOSettings
var r1 error
if rf, ok := ret.Get(0).(func(*model.Config, string) (*model.SSOSettings, error)); ok {
return rf(config, service)
if rf, ok := ret.Get(0).(func(*request.Context, *model.Config, string) (*model.SSOSettings, error)); ok {
return rf(c, config, service)
}
if rf, ok := ret.Get(0).(func(*model.Config, string) *model.SSOSettings); ok {
r0 = rf(config, service)
if rf, ok := ret.Get(0).(func(*request.Context, *model.Config, string) *model.SSOSettings); ok {
r0 = rf(c, config, service)
} else {
if ret.Get(0) != nil {
r0 = ret.Get(0).(*model.SSOSettings)
}
}
if rf, ok := ret.Get(1).(func(*model.Config, string) error); ok {
r1 = rf(config, service)
if rf, ok := ret.Get(1).(func(*request.Context, *model.Config, string) error); ok {
r1 = rf(c, config, service)
} else {
r1 = ret.Error(1)
}
@@ -42,25 +44,25 @@ func (_m *OAuthProvider) GetSSOSettings(config *model.Config, service string) (*
return r0, r1
}
// GetUserFromIdToken provides a mock function with given fields: idToken
func (_m *OAuthProvider) GetUserFromIdToken(idToken string) (*model.User, error) {
ret := _m.Called(idToken)
// GetUserFromIdToken provides a mock function with given fields: c, idToken
func (_m *OAuthProvider) GetUserFromIdToken(c *request.Context, idToken string) (*model.User, error) {
ret := _m.Called(c, idToken)
var r0 *model.User
var r1 error
if rf, ok := ret.Get(0).(func(string) (*model.User, error)); ok {
return rf(idToken)
if rf, ok := ret.Get(0).(func(*request.Context, string) (*model.User, error)); ok {
return rf(c, idToken)
}
if rf, ok := ret.Get(0).(func(string) *model.User); ok {
r0 = rf(idToken)
if rf, ok := ret.Get(0).(func(*request.Context, string) *model.User); ok {
r0 = rf(c, idToken)
} else {
if ret.Get(0) != nil {
r0 = ret.Get(0).(*model.User)
}
}
if rf, ok := ret.Get(1).(func(string) error); ok {
r1 = rf(idToken)
if rf, ok := ret.Get(1).(func(*request.Context, string) error); ok {
r1 = rf(c, idToken)
} else {
r1 = ret.Error(1)
}
@@ -68,25 +70,25 @@ func (_m *OAuthProvider) GetUserFromIdToken(idToken string) (*model.User, error)
return r0, r1
}
// GetUserFromJSON provides a mock function with given fields: data, tokenUser
func (_m *OAuthProvider) GetUserFromJSON(data io.Reader, tokenUser *model.User) (*model.User, error) {
ret := _m.Called(data, tokenUser)
// GetUserFromJSON provides a mock function with given fields: c, data, tokenUser
func (_m *OAuthProvider) GetUserFromJSON(c *request.Context, data io.Reader, tokenUser *model.User) (*model.User, error) {
ret := _m.Called(c, data, tokenUser)
var r0 *model.User
var r1 error
if rf, ok := ret.Get(0).(func(io.Reader, *model.User) (*model.User, error)); ok {
return rf(data, tokenUser)
if rf, ok := ret.Get(0).(func(*request.Context, io.Reader, *model.User) (*model.User, error)); ok {
return rf(c, data, tokenUser)
}
if rf, ok := ret.Get(0).(func(io.Reader, *model.User) *model.User); ok {
r0 = rf(data, tokenUser)
if rf, ok := ret.Get(0).(func(*request.Context, io.Reader, *model.User) *model.User); ok {
r0 = rf(c, data, tokenUser)
} else {
if ret.Get(0) != nil {
r0 = ret.Get(0).(*model.User)
}
}
if rf, ok := ret.Get(1).(func(io.Reader, *model.User) error); ok {
r1 = rf(data, tokenUser)
if rf, ok := ret.Get(1).(func(*request.Context, io.Reader, *model.User) error); ok {
r1 = rf(c, data, tokenUser)
} else {
r1 = ret.Error(1)
}
@@ -94,13 +96,13 @@ func (_m *OAuthProvider) GetUserFromJSON(data io.Reader, tokenUser *model.User)
return r0, r1
}
// IsSameUser provides a mock function with given fields: dbUser, oAuthUser
func (_m *OAuthProvider) IsSameUser(dbUser *model.User, oAuthUser *model.User) bool {
ret := _m.Called(dbUser, oAuthUser)
// IsSameUser provides a mock function with given fields: c, dbUser, oAuthUser
func (_m *OAuthProvider) IsSameUser(c *request.Context, dbUser *model.User, oAuthUser *model.User) bool {
ret := _m.Called(c, dbUser, oAuthUser)
var r0 bool
if rf, ok := ret.Get(0).(func(*model.User, *model.User) bool); ok {
r0 = rf(dbUser, oAuthUser)
if rf, ok := ret.Get(0).(func(*request.Context, *model.User, *model.User) bool); ok {
r0 = rf(c, dbUser, oAuthUser)
} else {
r0 = ret.Get(0).(bool)
}