mirrors/mostlymatter
1
0
Форкнуть 0
Код Задачи Запросы на слияние Действия Пакеты Проекты Релизы Вики Активность

[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 удалений
Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

2
server/einterfaces/account_migration.go
Просмотреть файл

@@ -10,5 +10,5 @@ import (
type AccountMigrationInterface interface {
MigrateToLdap(c *request.Context, fromAuthService string, foreignUserFieldNameToMatch string, force bool, dryRun bool) *model.AppError
MigrateToSaml(fromAuthService string, usersMap map[string]string, auto bool, dryRun bool) *model.AppError
MigrateToSaml(c *request.Context, fromAuthService string, usersMap map[string]string, auto bool, dryRun bool) *model.AppError
}

20
server/einterfaces/ldap.go
Просмотреть файл

@@ -10,21 +10,21 @@ import (
type LdapInterface interface {
DoLogin(c *request.Context, id string, password string) (*model.User, *model.AppError)
GetUser(id string) (*model.User, *model.AppError)
GetUser(c *request.Context, id string) (*model.User, *model.AppError)
GetUserAttributes(id string, attributes []string) (map[string]string, *model.AppError)
CheckPassword(id string, password string) *model.AppError
CheckPasswordAuthData(authData string, password string) *model.AppError
CheckProviderAttributes(LS *model.LdapSettings, ouser *model.User, patch *model.UserPatch) string
SwitchToLdap(userID, ldapID, ldapPassword string) *model.AppError
CheckPassword(c *request.Context, id string, password string) *model.AppError
CheckPasswordAuthData(c *request.Context, authData string, password string) *model.AppError
CheckProviderAttributes(c *request.Context, LS *model.LdapSettings, ouser *model.User, patch *model.UserPatch) string
SwitchToLdap(c *request.Context, userID, ldapID, ldapPassword string) *model.AppError
StartSynchronizeJob(c *request.Context, waitForJobToFinish bool, includeRemovedMembers bool) (*model.Job, *model.AppError)
RunTest() *model.AppError
GetAllLdapUsers() ([]*model.User, *model.AppError)
MigrateIDAttribute(toAttribute string) error
GetAllLdapUsers(c *request.Context) ([]*model.User, *model.AppError)
MigrateIDAttribute(c *request.Context, toAttribute string) error
GetGroup(groupUID string) (*model.Group, *model.AppError)
GetAllGroupsPage(page int, perPage int, opts model.LdapGroupSearchOpts) ([]*model.Group, int, *model.AppError)
FirstLoginSync(c *request.Context, user *model.User, userAuthService, userAuthData, email string) *model.AppError
UpdateProfilePictureIfNecessary(request.CTX, model.User, model.Session)
GetADLdapIdFromSAMLId(authData string) string
GetSAMLIdFromADLdapId(authData string) string
UpdateProfilePictureIfNecessary(*request.Context, model.User, model.Session)
GetADLdapIdFromSAMLId(c *request.Context, authData string) string
GetSAMLIdFromADLdapId(c *request.Context, authData string) string
GetVendorNameAndVendorVersion() (string, string)
}

10
server/einterfaces/mocks/AccountMigrationInterface.go
Просмотреть файл

@@ -31,13 +31,13 @@ func (_m *AccountMigrationInterface) MigrateToLdap(c *request.Context, fromAuthS
return r0
}
// MigrateToSaml provides a mock function with given fields: fromAuthService, usersMap, auto, dryRun
func (_m *AccountMigrationInterface) MigrateToSaml(fromAuthService string, usersMap map[string]string, auto bool, dryRun bool) *model.AppError {
ret := _m.Called(fromAuthService, usersMap, auto, dryRun)
// MigrateToSaml provides a mock function with given fields: c, fromAuthService, usersMap, auto, dryRun
func (_m *AccountMigrationInterface) MigrateToSaml(c *request.Context, fromAuthService string, usersMap map[string]string, auto bool, dryRun bool) *model.AppError {
ret := _m.Called(c, fromAuthService, usersMap, auto, dryRun)
var r0 *model.AppError
if rf, ok := ret.Get(0).(func(string, map[string]string, bool, bool) *model.AppError); ok {
r0 = rf(fromAuthService, usersMap, auto, dryRun)
if rf, ok := ret.Get(0).(func(*request.Context, string, map[string]string, bool, bool) *model.AppError); ok {
r0 = rf(c, fromAuthService, usersMap, auto, dryRun)
} else {
if ret.Get(0) != nil {
r0 = ret.Get(0).(*model.AppError)

108
server/einterfaces/mocks/LdapInterface.go
Просмотреть файл

@@ -15,13 +15,13 @@ type LdapInterface struct {
mock.Mock
}
// CheckPassword provides a mock function with given fields: id, password
func (_m *LdapInterface) CheckPassword(id string, password string) *model.AppError {
ret := _m.Called(id, password)
// CheckPassword provides a mock function with given fields: c, id, password
func (_m *LdapInterface) CheckPassword(c *request.Context, id string, password string) *model.AppError {
ret := _m.Called(c, id, password)
var r0 *model.AppError
if rf, ok := ret.Get(0).(func(string, string) *model.AppError); ok {
r0 = rf(id, password)
if rf, ok := ret.Get(0).(func(*request.Context, string, string) *model.AppError); ok {
r0 = rf(c, id, password)
} else {
if ret.Get(0) != nil {
r0 = ret.Get(0).(*model.AppError)
@@ -31,13 +31,13 @@ func (_m *LdapInterface) CheckPassword(id string, password string) *model.AppErr
return r0
}
// CheckPasswordAuthData provides a mock function with given fields: authData, password
func (_m *LdapInterface) CheckPasswordAuthData(authData string, password string) *model.AppError {
ret := _m.Called(authData, password)
// CheckPasswordAuthData provides a mock function with given fields: c, authData, password
func (_m *LdapInterface) CheckPasswordAuthData(c *request.Context, authData string, password string) *model.AppError {
ret := _m.Called(c, authData, password)
var r0 *model.AppError
if rf, ok := ret.Get(0).(func(string, string) *model.AppError); ok {
r0 = rf(authData, password)
if rf, ok := ret.Get(0).(func(*request.Context, string, string) *model.AppError); ok {
r0 = rf(c, authData, password)
} else {
if ret.Get(0) != nil {
r0 = ret.Get(0).(*model.AppError)
@@ -47,13 +47,13 @@ func (_m *LdapInterface) CheckPasswordAuthData(authData string, password string)
return r0
}
// CheckProviderAttributes provides a mock function with given fields: LS, ouser, patch
func (_m *LdapInterface) CheckProviderAttributes(LS *model.LdapSettings, ouser *model.User, patch *model.UserPatch) string {
ret := _m.Called(LS, ouser, patch)
// CheckProviderAttributes provides a mock function with given fields: c, LS, ouser, patch
func (_m *LdapInterface) CheckProviderAttributes(c *request.Context, LS *model.LdapSettings, ouser *model.User, patch *model.UserPatch) string {
ret := _m.Called(c, LS, ouser, patch)
var r0 string
if rf, ok := ret.Get(0).(func(*model.LdapSettings, *model.User, *model.UserPatch) string); ok {
r0 = rf(LS, ouser, patch)
if rf, ok := ret.Get(0).(func(*request.Context, *model.LdapSettings, *model.User, *model.UserPatch) string); ok {
r0 = rf(c, LS, ouser, patch)
} else {
r0 = ret.Get(0).(string)
}
@@ -105,13 +105,13 @@ func (_m *LdapInterface) FirstLoginSync(c *request.Context, user *model.User, us
return r0
}
// GetADLdapIdFromSAMLId provides a mock function with given fields: authData
func (_m *LdapInterface) GetADLdapIdFromSAMLId(authData string) string {
ret := _m.Called(authData)
// GetADLdapIdFromSAMLId provides a mock function with given fields: c, authData
func (_m *LdapInterface) GetADLdapIdFromSAMLId(c *request.Context, authData string) string {
ret := _m.Called(c, authData)
var r0 string
if rf, ok := ret.Get(0).(func(string) string); ok {
r0 = rf(authData)
if rf, ok := ret.Get(0).(func(*request.Context, string) string); ok {
r0 = rf(c, authData)
} else {
r0 = ret.Get(0).(string)
}
@@ -154,25 +154,25 @@ func (_m *LdapInterface) GetAllGroupsPage(page int, perPage int, opts model.Ldap
return r0, r1, r2
}
// GetAllLdapUsers provides a mock function with given fields:
func (_m *LdapInterface) GetAllLdapUsers() ([]*model.User, *model.AppError) {
ret := _m.Called()
// GetAllLdapUsers provides a mock function with given fields: c
func (_m *LdapInterface) GetAllLdapUsers(c *request.Context) ([]*model.User, *model.AppError) {
ret := _m.Called(c)
var r0 []*model.User
var r1 *model.AppError
if rf, ok := ret.Get(0).(func() ([]*model.User, *model.AppError)); ok {
return rf()
if rf, ok := ret.Get(0).(func(*request.Context) ([]*model.User, *model.AppError)); ok {
return rf(c)
}
if rf, ok := ret.Get(0).(func() []*model.User); ok {
r0 = rf()
if rf, ok := ret.Get(0).(func(*request.Context) []*model.User); ok {
r0 = rf(c)
} else {
if ret.Get(0) != nil {
r0 = ret.Get(0).([]*model.User)
}
}
if rf, ok := ret.Get(1).(func() *model.AppError); ok {
r1 = rf()
if rf, ok := ret.Get(1).(func(*request.Context) *model.AppError); ok {
r1 = rf(c)
} else {
if ret.Get(1) != nil {
r1 = ret.Get(1).(*model.AppError)
@@ -210,13 +210,13 @@ func (_m *LdapInterface) GetGroup(groupUID string) (*model.Group, *model.AppErro
return r0, r1
}
// GetSAMLIdFromADLdapId provides a mock function with given fields: authData
func (_m *LdapInterface) GetSAMLIdFromADLdapId(authData string) string {
ret := _m.Called(authData)
// GetSAMLIdFromADLdapId provides a mock function with given fields: c, authData
func (_m *LdapInterface) GetSAMLIdFromADLdapId(c *request.Context, authData string) string {
ret := _m.Called(c, authData)
var r0 string
if rf, ok := ret.Get(0).(func(string) string); ok {
r0 = rf(authData)
if rf, ok := ret.Get(0).(func(*request.Context, string) string); ok {
r0 = rf(c, authData)
} else {
r0 = ret.Get(0).(string)
}
@@ -224,25 +224,25 @@ func (_m *LdapInterface) GetSAMLIdFromADLdapId(authData string) string {
return r0
}
// GetUser provides a mock function with given fields: id
func (_m *LdapInterface) GetUser(id string) (*model.User, *model.AppError) {
ret := _m.Called(id)
// GetUser provides a mock function with given fields: c, id
func (_m *LdapInterface) GetUser(c *request.Context, id string) (*model.User, *model.AppError) {
ret := _m.Called(c, id)
var r0 *model.User
var r1 *model.AppError
if rf, ok := ret.Get(0).(func(string) (*model.User, *model.AppError)); ok {
return rf(id)
if rf, ok := ret.Get(0).(func(*request.Context, string) (*model.User, *model.AppError)); ok {
return rf(c, id)
}
if rf, ok := ret.Get(0).(func(string) *model.User); ok {
r0 = rf(id)
if rf, ok := ret.Get(0).(func(*request.Context, string) *model.User); ok {
r0 = rf(c, id)
} else {
if ret.Get(0) != nil {
r0 = ret.Get(0).(*model.User)
}
}
if rf, ok := ret.Get(1).(func(string) *model.AppError); ok {
r1 = rf(id)
if rf, ok := ret.Get(1).(func(*request.Context, string) *model.AppError); ok {
r1 = rf(c, id)
} else {
if ret.Get(1) != nil {
r1 = ret.Get(1).(*model.AppError)
@@ -304,13 +304,13 @@ func (_m *LdapInterface) GetVendorNameAndVendorVersion() (string, string) {
return r0, r1
}
// MigrateIDAttribute provides a mock function with given fields: toAttribute
func (_m *LdapInterface) MigrateIDAttribute(toAttribute string) error {
ret := _m.Called(toAttribute)
// MigrateIDAttribute provides a mock function with given fields: c, toAttribute
func (_m *LdapInterface) MigrateIDAttribute(c *request.Context, toAttribute string) error {
ret := _m.Called(c, toAttribute)
var r0 error
if rf, ok := ret.Get(0).(func(string) error); ok {
r0 = rf(toAttribute)
if rf, ok := ret.Get(0).(func(*request.Context, string) error); ok {
r0 = rf(c, toAttribute)
} else {
r0 = ret.Error(0)
}
@@ -362,13 +362,13 @@ func (_m *LdapInterface) StartSynchronizeJob(c *request.Context, waitForJobToFin
return r0, r1
}
// SwitchToLdap provides a mock function with given fields: userID, ldapID, ldapPassword
func (_m *LdapInterface) SwitchToLdap(userID string, ldapID string, ldapPassword string) *model.AppError {
ret := _m.Called(userID, ldapID, ldapPassword)
// SwitchToLdap provides a mock function with given fields: c, userID, ldapID, ldapPassword
func (_m *LdapInterface) SwitchToLdap(c *request.Context, userID string, ldapID string, ldapPassword string) *model.AppError {
ret := _m.Called(c, userID, ldapID, ldapPassword)
var r0 *model.AppError
if rf, ok := ret.Get(0).(func(string, string, string) *model.AppError); ok {
r0 = rf(userID, ldapID, ldapPassword)
if rf, ok := ret.Get(0).(func(*request.Context, string, string, string) *model.AppError); ok {
r0 = rf(c, userID, ldapID, ldapPassword)
} else {
if ret.Get(0) != nil {
r0 = ret.Get(0).(*model.AppError)
@@ -379,7 +379,7 @@ func (_m *LdapInterface) SwitchToLdap(userID string, ldapID string, ldapPassword
}
// UpdateProfilePictureIfNecessary provides a mock function with given fields: _a0, _a1, _a2
func (_m *LdapInterface) UpdateProfilePictureIfNecessary(_a0 request.CTX, _a1 model.User, _a2 model.Session) {
func (_m *LdapInterface) UpdateProfilePictureIfNecessary(_a0 *request.Context, _a1 model.User, _a2 model.Session) {
_m.Called(_a0, _a1, _a2)
}

19
server/einterfaces/mocks/NotificationInterface.go
Просмотреть файл

@@ -6,6 +6,7 @@ package mocks
import (
model "github.com/mattermost/mattermost/server/public/model"
request "github.com/mattermost/mattermost/server/public/shared/request"
mock "github.com/stretchr/testify/mock"
)
@@ -30,25 +31,25 @@ func (_m *NotificationInterface) CheckLicense() *model.AppError {
return r0
}
// GetNotificationMessage provides a mock function with given fields: ack, userID
func (_m *NotificationInterface) GetNotificationMessage(ack *model.PushNotificationAck, userID string) (*model.PushNotification, *model.AppError) {
ret := _m.Called(ack, userID)
// GetNotificationMessage provides a mock function with given fields: c, ack, userID
func (_m *NotificationInterface) GetNotificationMessage(c *request.Context, ack *model.PushNotificationAck, userID string) (*model.PushNotification, *model.AppError) {
ret := _m.Called(c, ack, userID)
var r0 *model.PushNotification
var r1 *model.AppError
if rf, ok := ret.Get(0).(func(*model.PushNotificationAck, string) (*model.PushNotification, *model.AppError)); ok {
return rf(ack, userID)
if rf, ok := ret.Get(0).(func(*request.Context, *model.PushNotificationAck, string) (*model.PushNotification, *model.AppError)); ok {
return rf(c, ack, userID)
}
if rf, ok := ret.Get(0).(func(*model.PushNotificationAck, string) *model.PushNotification); ok {
r0 = rf(ack, userID)
if rf, ok := ret.Get(0).(func(*request.Context, *model.PushNotificationAck, string) *model.PushNotification); ok {
r0 = rf(c, ack, userID)
} else {
if ret.Get(0) != nil {
r0 = ret.Get(0).(*model.PushNotification)
}
}
if rf, ok := ret.Get(1).(func(*model.PushNotificationAck, string) *model.AppError); ok {
r1 = rf(ack, userID)
if rf, ok := ret.Get(1).(func(*request.Context, *model.PushNotificationAck, string) *model.AppError); ok {
r1 = rf(c, ack, userID)
} else {
if ret.Get(1) != nil {
r1 = ret.Get(1).(*model.AppError)

66
server/einterfaces/mocks/OAuthProvider.go
Просмотреть файл

@@ -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)
}

56
server/einterfaces/mocks/SamlInterface.go
Просмотреть файл

@@ -15,25 +15,25 @@ type SamlInterface struct {
mock.Mock
}
// BuildRequest provides a mock function with given fields: relayState
func (_m *SamlInterface) BuildRequest(relayState string) (*model.SamlAuthRequest, *model.AppError) {
ret := _m.Called(relayState)
// BuildRequest provides a mock function with given fields: c, relayState
func (_m *SamlInterface) BuildRequest(c *request.Context, relayState string) (*model.SamlAuthRequest, *model.AppError) {
ret := _m.Called(c, relayState)
var r0 *model.SamlAuthRequest
var r1 *model.AppError
if rf, ok := ret.Get(0).(func(string) (*model.SamlAuthRequest, *model.AppError)); ok {
return rf(relayState)
if rf, ok := ret.Get(0).(func(*request.Context, string) (*model.SamlAuthRequest, *model.AppError)); ok {
return rf(c, relayState)
}
if rf, ok := ret.Get(0).(func(string) *model.SamlAuthRequest); ok {
r0 = rf(relayState)
if rf, ok := ret.Get(0).(func(*request.Context, string) *model.SamlAuthRequest); ok {
r0 = rf(c, relayState)
} else {
if ret.Get(0) != nil {
r0 = ret.Get(0).(*model.SamlAuthRequest)
}
}
if rf, ok := ret.Get(1).(func(string) *model.AppError); ok {
r1 = rf(relayState)
if rf, ok := ret.Get(1).(func(*request.Context, string) *model.AppError); ok {
r1 = rf(c, relayState)
} else {
if ret.Get(1) != nil {
r1 = ret.Get(1).(*model.AppError)
@@ -43,13 +43,13 @@ func (_m *SamlInterface) BuildRequest(relayState string) (*model.SamlAuthRequest
return r0, r1
}
// CheckProviderAttributes provides a mock function with given fields: SS, ouser, patch
func (_m *SamlInterface) CheckProviderAttributes(SS *model.SamlSettings, ouser *model.User, patch *model.UserPatch) string {
ret := _m.Called(SS, ouser, patch)
// CheckProviderAttributes provides a mock function with given fields: c, SS, ouser, patch
func (_m *SamlInterface) CheckProviderAttributes(c *request.Context, SS *model.SamlSettings, ouser *model.User, patch *model.UserPatch) string {
ret := _m.Called(c, SS, ouser, patch)
var r0 string
if rf, ok := ret.Get(0).(func(*model.SamlSettings, *model.User, *model.UserPatch) string); ok {
r0 = rf(SS, ouser, patch)
if rf, ok := ret.Get(0).(func(*request.Context, *model.SamlSettings, *model.User, *model.UserPatch) string); ok {
r0 = rf(c, SS, ouser, patch)
} else {
r0 = ret.Get(0).(string)
}
@@ -57,13 +57,13 @@ func (_m *SamlInterface) CheckProviderAttributes(SS *model.SamlSettings, ouser *
return r0
}
// ConfigureSP provides a mock function with given fields:
func (_m *SamlInterface) ConfigureSP() error {
ret := _m.Called()
// ConfigureSP provides a mock function with given fields: c
func (_m *SamlInterface) ConfigureSP(c *request.Context) error {
ret := _m.Called(c)
var r0 error
if rf, ok := ret.Get(0).(func() error); ok {
r0 = rf()
if rf, ok := ret.Get(0).(func(*request.Context) error); ok {
r0 = rf(c)
} else {
r0 = ret.Error(0)
}
@@ -99,23 +99,23 @@ func (_m *SamlInterface) DoLogin(c *request.Context, encodedXML string, relaySta
return r0, r1
}
// GetMetadata provides a mock function with given fields:
func (_m *SamlInterface) GetMetadata() (string, *model.AppError) {
ret := _m.Called()
// GetMetadata provides a mock function with given fields: c
func (_m *SamlInterface) GetMetadata(c *request.Context) (string, *model.AppError) {
ret := _m.Called(c)
var r0 string
var r1 *model.AppError
if rf, ok := ret.Get(0).(func() (string, *model.AppError)); ok {
return rf()
if rf, ok := ret.Get(0).(func(*request.Context) (string, *model.AppError)); ok {
return rf(c)
}
if rf, ok := ret.Get(0).(func() string); ok {
r0 = rf()
if rf, ok := ret.Get(0).(func(*request.Context) string); ok {
r0 = rf(c)
} else {
r0 = ret.Get(0).(string)
}
if rf, ok := ret.Get(1).(func() *model.AppError); ok {
r1 = rf()
if rf, ok := ret.Get(1).(func(*request.Context) *model.AppError); ok {
r1 = rf(c)
} else {
if ret.Get(1) != nil {
r1 = ret.Get(1).(*model.AppError)

3
server/einterfaces/notification.go
Просмотреть файл

@@ -5,9 +5,10 @@ package einterfaces
import (
"github.com/mattermost/mattermost/server/public/model"
"github.com/mattermost/mattermost/server/public/shared/request"
)
type NotificationInterface interface {
GetNotificationMessage(ack *model.PushNotificationAck, userID string) (*model.PushNotification, *model.AppError)
GetNotificationMessage(c *request.Context, ack *model.PushNotificationAck, userID string) (*model.PushNotification, *model.AppError)
CheckLicense() *model.AppError
}

9
server/einterfaces/oauthproviders.go
Просмотреть файл

@@ -7,13 +7,14 @@ import (
"io"
"github.com/mattermost/mattermost/server/public/model"
"github.com/mattermost/mattermost/server/public/shared/request"
)
type OAuthProvider interface {
GetUserFromJSON(data io.Reader, tokenUser *model.User) (*model.User, error)
GetSSOSettings(config *model.Config, service string) (*model.SSOSettings, error)
GetUserFromIdToken(idToken string) (*model.User, error)
IsSameUser(dbUser, oAuthUser *model.User) bool
GetUserFromJSON(c *request.Context, data io.Reader, tokenUser *model.User) (*model.User, error)
GetSSOSettings(c *request.Context, config *model.Config, service string) (*model.SSOSettings, error)
GetUserFromIdToken(c *request.Context, idToken string) (*model.User, error)
IsSameUser(c *request.Context, dbUser, oAuthUser *model.User) bool
}
var oauthProviders = make(map[string]OAuthProvider)

8
server/einterfaces/saml.go
Просмотреть файл

@@ -9,9 +9,9 @@ import (
)
type SamlInterface interface {
ConfigureSP() error
BuildRequest(relayState string) (*model.SamlAuthRequest, *model.AppError)
ConfigureSP(c *request.Context) error
BuildRequest(c *request.Context, relayState string) (*model.SamlAuthRequest, *model.AppError)
DoLogin(c *request.Context, encodedXML string, relayState map[string]string) (*model.User, *model.AppError)
GetMetadata() (string, *model.AppError)
CheckProviderAttributes(SS *model.SamlSettings, ouser *model.User, patch *model.UserPatch) string
GetMetadata(c *request.Context) (string, *model.AppError)
CheckProviderAttributes(c *request.Context, SS *model.SamlSettings, ouser *model.User, patch *model.UserPatch) string
}