diff --git a/opencloud/pkg/runtime/service/service.go b/opencloud/pkg/runtime/service/service.go index 58b86eca16..5d244e1ace 100644 --- a/opencloud/pkg/runtime/service/service.go +++ b/opencloud/pkg/runtime/service/service.go @@ -30,6 +30,7 @@ import ( authmachine "github.com/opencloud-eu/opencloud/services/auth-machine/pkg/command" authservice "github.com/opencloud-eu/opencloud/services/auth-service/pkg/command" clientlog "github.com/opencloud-eu/opencloud/services/clientlog/pkg/command" + collaboration "github.com/opencloud-eu/opencloud/services/collaboration/pkg/command" eventhistory "github.com/opencloud-eu/opencloud/services/eventhistory/pkg/command" frontend "github.com/opencloud-eu/opencloud/services/frontend/pkg/command" gateway "github.com/opencloud-eu/opencloud/services/gateway/pkg/command" @@ -328,6 +329,11 @@ func NewService(ctx context.Context, options ...Option) (*Service, error) { cfg.Audit.Commons = cfg.Commons return audit.Execute(cfg.Audit) }) + areg(opts.Config.Collaboration.Service.Name, func(ctx context.Context, cfg *occfg.Config) error { + cfg.Collaboration.Context = ctx + cfg.Collaboration.Commons = cfg.Commons + return collaboration.Execute(cfg.Collaboration) + }) areg(opts.Config.Policies.Service.Name, func(ctx context.Context, cfg *occfg.Config) error { cfg.Policies.Context = ctx cfg.Policies.Commons = cfg.Commons diff --git a/services/collaboration/pkg/helpers/discovery.go b/services/collaboration/pkg/helpers/discovery.go index 1432f7525b..2db3987739 100644 --- a/services/collaboration/pkg/helpers/discovery.go +++ b/services/collaboration/pkg/helpers/discovery.go @@ -92,10 +92,6 @@ func GetAppURLs(cfg *config.Config, logger log.Logger) (map[string]map[string]st httpResp, err := httpClient.Get(wopiAppUrl) if err != nil { - logger.Error(). - Err(err). - Str("WopiAppUrl", wopiAppUrl). - Msg("WopiDiscovery: failed to access wopi app url") return nil, err } diff --git a/services/proxy/pkg/config/defaults/defaultconfig.go b/services/proxy/pkg/config/defaults/defaultconfig.go index f1d42a3f8f..3893f1449e 100644 --- a/services/proxy/pkg/config/defaults/defaultconfig.go +++ b/services/proxy/pkg/config/defaults/defaultconfig.go @@ -272,6 +272,12 @@ func DefaultPolicies() []config.Policy { Endpoint: "/auth-app/tokens", Service: "eu.opencloud.web.auth-app", }, + { + Endpoint: "/wopi", + Service: "eu.opencloud.web.collaboration.Collabora", + Unprotected: true, + SkipXAccessToken: true, + }, }, }, }