Mirrors/sftpgo
1
0
Fork 0
mirror of https://github.com/drakkan/sftpgo.git synced 2025-12-06 14:20:55 +03:00
Code Issues Packages Projects Releases Wiki Activity

WebAdmin: allow to simplify the user page

Browse Source 
Signed-off-by: Nicola Murino <nicola.murino@gmail.com>
This commit is contained in:
Nicola Murino
2022-09-21 19:36:08 +02:00
parent 7349598b19
commit bd294bb3cf
16 changed files with 337 additions and 124 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
internal/httpdtest/httpdtest.go
View File

@@ -1624,19 +1624,28 @@ func checkAdmin(expected, actual *dataprovider.Admin) error {
return errors.New("permissions content mismatch")
}
}
if expected.Filters.AllowAPIKeyAuth != actual.Filters.AllowAPIKeyAuth {
if err := compareAdminFilters(expected.Filters, actual.Filters); err != nil {
return err
}
return compareAdminGroups(expected, actual)
}
func compareAdminFilters(expected, actual dataprovider.AdminFilters) error {
if expected.AllowAPIKeyAuth != actual.AllowAPIKeyAuth {
return errors.New("allow_api_key_auth mismatch")
}
if len(expected.Filters.AllowList) != len(actual.Filters.AllowList) {
if len(expected.AllowList) != len(actual.AllowList) {
return errors.New("allow list mismatch")
}
for _, v := range expected.Filters.AllowList {
if !util.Contains(actual.Filters.AllowList, v) {
for _, v := range expected.AllowList {
if !util.Contains(actual.AllowList, v) {
return errors.New("allow list content mismatch")
}
}
return compareAdminGroups(expected, actual)
if expected.Preferences.HideUserPageSections != actual.Preferences.HideUserPageSections {
return errors.New("hide user page sections mismatch")
}
return nil
}
func compareAdminEqualFields(expected *dataprovider.Admin, actual *dataprovider.Admin) error {