fixes

cs3org · Jan 20, 2023 · cf446c9 · cf446c9
1 parent 2b55772
commit cf446c9
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 6 deletions.
diff --git a/internal/http/services/loader/loader.go b/internal/http/services/loader/loader.go
@@ -29,7 +29,7 @@ import (
 	_ "github.com/cs3org/reva/internal/http/services/mentix"
 	_ "github.com/cs3org/reva/internal/http/services/meshdirectory"
 	_ "github.com/cs3org/reva/internal/http/services/metrics"
-	_ "github.com/cs3org/reva/internal/http/services/ocm"
+	_ "github.com/cs3org/reva/internal/http/services/ocmd"
 	_ "github.com/cs3org/reva/internal/http/services/owncloud/ocdav"
 	_ "github.com/cs3org/reva/internal/http/services/owncloud/ocs"
 	_ "github.com/cs3org/reva/internal/http/services/preferences"

diff --git a/internal/http/services/ocm/config.go → internal/http/services/ocmd/config.go b/internal/http/services/ocm/config.go → internal/http/services/ocmd/config.go
diff --git a/internal/http/services/ocm/invites.go → internal/http/services/ocmd/invites.go b/internal/http/services/ocm/invites.go → internal/http/services/ocmd/invites.go
diff --git a/internal/http/services/ocm/notifications.go → internal/http/services/ocmd/notifications.go b/internal/http/services/ocm/notifications.go → internal/http/services/ocmd/notifications.go
diff --git a/internal/http/services/ocm/ocm.go → internal/http/services/ocmd/ocm.go b/internal/http/services/ocm/ocm.go → internal/http/services/ocmd/ocm.go
@@ -31,7 +31,7 @@ import (
 )
 
 func init() {
-	global.Register("ocm", New)
+	global.Register("ocmd", New)
 }
 
 type config struct {

diff --git a/internal/http/services/ocm/shares.go → internal/http/services/ocmd/shares.go b/internal/http/services/ocm/shares.go → internal/http/services/ocmd/shares.go
diff --git a/tests/integration/grpc/fixtures/ocm-server-cernbox-http.toml b/tests/integration/grpc/fixtures/ocm-server-cernbox-http.toml
@@ -4,9 +4,14 @@ gatewaysvc = "{{cernboxgw_address}}"
 [http]
 address = "{{grpc_address}}"
 
-[http.services.ocm]
-prefix = "ocm"
+[http.services.ocmd]
 
 [http.services.sciencemesh]
 
 [http.middlewares.cors]
+
+[http.middlewares.providerauthorizer]
+driver = "json"
+
+[http.middlewares.providerauthorizer.drivers.json]
+providers = "fixtures/ocm-providers.demo.json"
diff --git a/tests/integration/grpc/fixtures/ocm-server-cesnet-http.toml b/tests/integration/grpc/fixtures/ocm-server-cesnet-http.toml
@@ -4,9 +4,14 @@ gatewaysvc = "{{cesnetgw_address}}"
 [http]
 address = "{{grpc_address}}"
 
-[http.services.ocm]
-prefix = "ocm"
+[http.services.ocmd]
 
 [http.services.sciencemesh]
 
 [http.middlewares.cors]
+
+[http.middlewares.providerauthorizer]
+driver = "json"
+
+[http.middlewares.providerauthorizer.drivers.json]
+providers = "fixtures/ocm-providers.demo.json"