sevenhill/QSfera
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix settings and idm admin user id configuration

Browse Source
This commit is contained in:
Willy Kloucek
2022-05-16 08:30:16 +02:00
parent 7b95b40536
commit 382d91b22b
8 changed files with 23 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
extensions/settings/pkg/config/config.go
+2
View File
@@ -23,6 +23,8 @@ type Config struct {
DataPath string `yaml:"data_path" env:"SETTINGS_DATA_PATH"`
Metadata Metadata `yaml:"metadata_config"`
AdminUserID string `yaml:"admin_user_id" env:"OCIS_ADMIN_USER_ID;SETTINGS_ADMIN_USER_ID"`
Asset Asset `yaml:"asset"`
TokenManager *TokenManager `yaml:"token_manager"`
extensions/settings/pkg/config/defaults/defaultconfig.go
+4
View File
@@ -96,6 +96,10 @@ func EnsureDefaults(cfg *config.Config) {
if cfg.Metadata.SystemUserID == "" && cfg.Commons != nil && cfg.Commons.SystemUserID != "" {
cfg.Metadata.SystemUserID = cfg.Commons.SystemUserID
}
if cfg.AdminUserID == "" {
cfg.AdminUserID = cfg.Commons.AdminUserID
}
}
func Sanitize(cfg *config.Config) {
extensions/settings/pkg/service/v0/settings.go
+1 -1
View File
@@ -539,7 +539,7 @@ func (g Service) defaultRoleAssignments() []*settingsmsg.UserRoleAssignment {
AccountUuid: "058bff95-6708-4fe5-91e4-9ea3d377588b", // demo user "moss"
RoleId: BundleUUIDRoleAdmin,
}, {
AccountUuid: g.config.Commons.AdminUserID,
AccountUuid: g.config.AdminUserID,
RoleId: BundleUUIDRoleAdmin,
},
// default users with role "user"
extensions/settings/pkg/store/defaults/defaults.go
+1 -1
View File
@@ -504,7 +504,7 @@ func DefaultRoleAssignments(cfg *config.Config) []*settingsmsg.UserRoleAssignmen
AccountUuid: "058bff95-6708-4fe5-91e4-9ea3d377588b", // demo user "moss"
RoleId: BundleUUIDRoleAdmin,
}, {
AccountUuid: cfg.Commons.AdminUserID,
AccountUuid: cfg.AdminUserID,
RoleId: BundleUUIDRoleAdmin,
},
// default users with role "user"