mirror of
https://github.com/opencloud-eu/opencloud.git
synced 2026-02-21 13:09:10 -06:00
use correct structure when ocis init
Signed-off-by: jkoberg <jkoberg@owncloud.com>
This commit is contained in:
5
changelog/unreleased/service-account-roles.md
Normal file
5
changelog/unreleased/service-account-roles.md
Normal file
@@ -0,0 +1,5 @@
|
||||
Bugfix: Fix Service Account Roles on external IDP
|
||||
|
||||
Service Account Roles wouldn't work when using with external IDP
|
||||
|
||||
https://github.com/owncloud/ocis/pull/8074
|
||||
@@ -74,7 +74,7 @@ type IdmService struct {
|
||||
}
|
||||
|
||||
type SettingsService struct {
|
||||
ServiceAccountIDAdmin string `yaml:"service_account_id_admin"`
|
||||
ServiceAccountIDs []string `yaml:"service_account_ids"`
|
||||
}
|
||||
|
||||
type FrontendService struct {
|
||||
@@ -400,7 +400,7 @@ func CreateConfig(insecure, forceOverwrite bool, configPath, adminPassword strin
|
||||
ServiceAccount: serviceAccount,
|
||||
},
|
||||
Settings: SettingsService{
|
||||
ServiceAccountIDAdmin: serviceAccount.ServiceAccountID,
|
||||
ServiceAccountIDs: []string{serviceAccount.ServiceAccountID},
|
||||
},
|
||||
}
|
||||
|
||||
|
||||
@@ -34,6 +34,10 @@ func (s *Store) ListBundles(bundleType settingsmsg.Bundle_Type, bundleIDs []stri
|
||||
}
|
||||
var bundles []*settingsmsg.Bundle
|
||||
for _, id := range bundleIDs {
|
||||
if id == defaults.BundleUUIDServiceAccount {
|
||||
bundles = append(bundles, defaults.ServiceAccountBundle())
|
||||
continue
|
||||
}
|
||||
b, err := s.mdc.SimpleDownload(ctx, bundlePath(id))
|
||||
switch err.(type) {
|
||||
case nil:
|
||||
|
||||
Reference in New Issue
Block a user