Update group sync to work with AD - SAML ids (#17108)
Co-authored-by: Mattermod <mattermod@users.noreply.github.com>
Этот коммит содержится в:
коммит произвёл
GitHub
родитель
fa16ecf98a
Коммит
e8b710f7fe
@@ -24,5 +24,6 @@ type LdapInterface interface {
|
|||||||
FirstLoginSync(user *model.User, userAuthService, userAuthData, email string) *model.AppError
|
FirstLoginSync(user *model.User, userAuthService, userAuthData, email string) *model.AppError
|
||||||
UpdateProfilePictureIfNecessary(model.User, model.Session)
|
UpdateProfilePictureIfNecessary(model.User, model.Session)
|
||||||
GetADLdapIdFromSAMLId(authData string) string
|
GetADLdapIdFromSAMLId(authData string) string
|
||||||
|
GetSAMLIdFromADLdapId(authData string) string
|
||||||
GetVendorNameAndVendorVersion() (string, string)
|
GetVendorNameAndVendorVersion() (string, string)
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -197,6 +197,20 @@ func (_m *LdapInterface) GetGroup(groupUID string) (*model.Group, *model.AppErro
|
|||||||
return r0, r1
|
return r0, r1
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// GetSAMLIdFromADLdapId provides a mock function with given fields: authData
|
||||||
|
func (_m *LdapInterface) GetSAMLIdFromADLdapId(authData string) string {
|
||||||
|
ret := _m.Called(authData)
|
||||||
|
|
||||||
|
var r0 string
|
||||||
|
if rf, ok := ret.Get(0).(func(string) string); ok {
|
||||||
|
r0 = rf(authData)
|
||||||
|
} else {
|
||||||
|
r0 = ret.Get(0).(string)
|
||||||
|
}
|
||||||
|
|
||||||
|
return r0
|
||||||
|
}
|
||||||
|
|
||||||
// GetUser provides a mock function with given fields: id
|
// GetUser provides a mock function with given fields: id
|
||||||
func (_m *LdapInterface) GetUser(id string) (*model.User, *model.AppError) {
|
func (_m *LdapInterface) GetUser(id string) (*model.User, *model.AppError) {
|
||||||
ret := _m.Called(id)
|
ret := _m.Called(id)
|
||||||
|
|||||||
Ссылка в новой задаче
Block a user