All required features and fixes for the OC/NC ScienceMesh apps (#4115)

cs3org · Sep 8, 2023 · 5bbd158 · 5bbd158
1 parent c4fa2e5
commit 5bbd158
Show file tree

Hide file tree

Showing 124 changed files with 3,638 additions and 1,191 deletions.
diff --git a/.hound.yml b/.hound.yml
@@ -1,2 +1,4 @@
 scss:
   enabled: false
+jshint:
+  ignore_file: .hound_js_ignore
diff --git a/.hound_js_ignore b/.hound_js_ignore
@@ -0,0 +1 @@
+tests/**/*,js
diff --git a/changelog/unreleased/sciencemesh-apps.md b/changelog/unreleased/sciencemesh-apps.md
@@ -0,0 +1,6 @@
+Enhancement: All required features and fixes for the OC/NC ScienceMesh apps
+
+This PR includes all necessary code in Reva
+to interface with the ScienceMesh apps in OC and NC 
+
+https://github.com/cs3org/reva/pull/4115
diff --git a/docs/content/en/docs/config/grpc/services/ocminvitemanager/_index.md b/docs/content/en/docs/config/grpc/services/ocminvitemanager/_index.md
@@ -9,7 +9,7 @@ description: >
 # _struct: config_
 
 {{% dir name="provider_domain" type="string" default="The same domain registered in the provider authorizer" %}}
- [[Ref]](https://github.com/cs3org/reva/tree/master/internal/grpc/services/ocminvitemanager/ocminvitemanager.go#L61)
+ [[Ref]](https://github.com/cs3org/reva/tree/master/internal/grpc/services/ocminvitemanager/ocminvitemanager.go#L62)
 {{< highlight toml >}}
 [grpc.services.ocminvitemanager]
 provider_domain = "The same domain registered in the provider authorizer"

diff --git a/docs/content/en/docs/config/http/services/ocmprovider/_index.md b/docs/content/en/docs/config/http/services/ocmprovider/_index.md
@@ -9,55 +9,55 @@ description: >
 # _struct: config_
 
 {{% dir name="ocm_prefix" type="string" default="ocm" %}}
-The prefix URL where the OCM API is served. [[Ref]](https://github.com/cs3org/reva/tree/master/internal/http/services/ocmprovider/ocmprovider.go#L37)
+The prefix URL where the OCM API is served. [[Ref]](https://github.com/cs3org/reva/tree/master/internal/http/services/ocmprovider/ocmprovider.go#L39)
 {{< highlight toml >}}
 [http.services.ocmprovider]
 ocm_prefix = "ocm"
 {{< /highlight >}}
 {{% /dir %}}
 
 {{% dir name="endpoint" type="string" default="This host's URL. If it's not configured, it is assumed OCM is not available." %}}
- [[Ref]](https://github.com/cs3org/reva/tree/master/internal/http/services/ocmprovider/ocmprovider.go#L38)
+ [[Ref]](https://github.com/cs3org/reva/tree/master/internal/http/services/ocmprovider/ocmprovider.go#L40)
 {{< highlight toml >}}
 [http.services.ocmprovider]
 endpoint = "This host's URL. If it's not configured, it is assumed OCM is not available."
 {{< /highlight >}}
 {{% /dir %}}
 
 {{% dir name="provider" type="string" default="reva" %}}
-A friendly name that defines this service. [[Ref]](https://github.com/cs3org/reva/tree/master/internal/http/services/ocmprovider/ocmprovider.go#L39)
+A friendly name that defines this service. [[Ref]](https://github.com/cs3org/reva/tree/master/internal/http/services/ocmprovider/ocmprovider.go#L41)
 {{< highlight toml >}}
 [http.services.ocmprovider]
 provider = "reva"
 {{< /highlight >}}
 {{% /dir %}}
 
 {{% dir name="webdav_root" type="string" default="/remote.php/dav/ocm" %}}
-The root URL of the WebDAV endpoint to serve OCM shares. [[Ref]](https://github.com/cs3org/reva/tree/master/internal/http/services/ocmprovider/ocmprovider.go#L40)
+The root URL of the WebDAV endpoint to serve OCM shares. [[Ref]](https://github.com/cs3org/reva/tree/master/internal/http/services/ocmprovider/ocmprovider.go#L42)
 {{< highlight toml >}}
 [http.services.ocmprovider]
 webdav_root = "/remote.php/dav/ocm"
 {{< /highlight >}}
 {{% /dir %}}
 
 {{% dir name="webapp_root" type="string" default="/external/sciencemesh" %}}
-The root URL to serve Web apps via OCM. [[Ref]](https://github.com/cs3org/reva/tree/master/internal/http/services/ocmprovider/ocmprovider.go#L41)
+The root URL to serve Web apps via OCM. [[Ref]](https://github.com/cs3org/reva/tree/master/internal/http/services/ocmprovider/ocmprovider.go#L43)
 {{< highlight toml >}}
 [http.services.ocmprovider]
 webapp_root = "/external/sciencemesh"
 {{< /highlight >}}
 {{% /dir %}}
 
 {{% dir name="enable_webapp" type="bool" default=false %}}
-Whether web apps are enabled in OCM shares. [[Ref]](https://github.com/cs3org/reva/tree/master/internal/http/services/ocmprovider/ocmprovider.go#L42)
+Whether web apps are enabled in OCM shares. [[Ref]](https://github.com/cs3org/reva/tree/master/internal/http/services/ocmprovider/ocmprovider.go#L44)
 {{< highlight toml >}}
 [http.services.ocmprovider]
 enable_webapp = false
 {{< /highlight >}}
 {{% /dir %}}
 
 {{% dir name="enable_datatx" type="bool" default=false %}}
-Whether data transfers are enabled in OCM shares. [[Ref]](https://github.com/cs3org/reva/tree/master/internal/http/services/ocmprovider/ocmprovider.go#L43)
+Whether data transfers are enabled in OCM shares. [[Ref]](https://github.com/cs3org/reva/tree/master/internal/http/services/ocmprovider/ocmprovider.go#L45)
 {{< highlight toml >}}
 [http.services.ocmprovider]
 enable_datatx = false

diff --git a/docs/content/en/docs/config/packages/auth/manager/nextcloud/_index.md b/docs/content/en/docs/config/packages/auth/manager/nextcloud/_index.md
@@ -9,7 +9,7 @@ description: >
 # _struct: AuthManagerConfig_
 
 {{% dir name="endpoint" type="string" default="" %}}
-The Nextcloud backend endpoint for user check [[Ref]](https://github.com/cs3org/reva/tree/master/pkg/auth/manager/nextcloud/nextcloud.go#L54)
+The Nextcloud backend endpoint for user check [[Ref]](https://github.com/cs3org/reva/tree/master/pkg/auth/manager/nextcloud/nextcloud.go#L55)
 {{< highlight toml >}}
 [auth.manager.nextcloud]
 endpoint = ""

diff --git a/docs/content/en/docs/config/packages/ocm/share/repository/nextcloud/_index.md b/docs/content/en/docs/config/packages/ocm/share/repository/nextcloud/_index.md
@@ -9,10 +9,18 @@ description: >
 # _struct: ShareManagerConfig_
 
 {{% dir name="endpoint" type="string" default="" %}}
-The Nextcloud backend endpoint for user check [[Ref]](https://github.com/cs3org/reva/tree/master/pkg/ocm/share/repository/nextcloud/nextcloud.go#L60)
+The Nextcloud backend endpoint for user check [[Ref]](https://github.com/cs3org/reva/tree/master/pkg/ocm/share/repository/nextcloud/nextcloud.go#L63)
 {{< highlight toml >}}
 [ocm.share.repository.nextcloud]
 endpoint = ""
 {{< /highlight >}}
 {{% /dir %}}
 
+{{% dir name="mount_id" type="string" default="" %}}
+The Reva mount id to identify the storage provider proxying the EFSS. Note that only one EFSS can be proxied by a given Reva process. [[Ref]](https://github.com/cs3org/reva/tree/master/pkg/ocm/share/repository/nextcloud/nextcloud.go#L67)
+{{< highlight toml >}}
+[ocm.share.repository.nextcloud]
+mount_id = ""
+{{< /highlight >}}
+{{% /dir %}}
+
diff --git a/examples/nextcloud-integration/custom-mime-types-demo.json b/examples/nextcloud-integration/custom-mime-types-demo.json
diff --git a/examples/nextcloud-integration/revad.toml b/examples/nextcloud-integration/revad.toml
diff --git a/examples/oc-phoenix/storage-home.toml b/examples/oc-phoenix/storage-home.toml
@@ -27,7 +27,7 @@ mount_path = "/home"
 mount_id = "123e4567-e89b-12d3-a456-426655440000"
 expose_data_server = true
 data_server_url = "http://localhost:12001/data"
-enable_home_creation = true
+enable_home_creation = false
 
 [grpc.services.storageprovider.drivers.owncloud]
 datadirectory = "/var/tmp/reva/data"

diff --git a/examples/ocmd/server-1.toml b/examples/ocmd/server-1.toml
@@ -90,7 +90,7 @@ mount_path = "/home"
 mount_id = "123e4567-e89b-12d3-a456-426655440000"
 expose_data_server = true
 data_server_url = "http://localhost:{{ http.services.dataprovider[0].address.port }}/data"
-enable_home_creation = true
+enable_home_creation = false
 
 [grpc.services.storageprovider.drivers.localhome]
 user_layout = "{{.Username}}"

diff --git a/examples/ocmd/server-2.toml b/examples/ocmd/server-2.toml
@@ -90,7 +90,7 @@ mount_path = "/home"
 mount_id = "123e4567-e89b-12d3-a456-426655440000"
 expose_data_server = true
 data_server_url = "http://localhost:{{ http.services.dataprovider[0].address.port }}/data"
-enable_home_creation = true
+enable_home_creation = false
 
 [grpc.services.storageprovider.drivers.localhome]
 user_layout = "{{.Username}}"

diff --git a/examples/oidc-mapping-tpc/server-1.toml b/examples/oidc-mapping-tpc/server-1.toml
@@ -35,7 +35,7 @@ mount_path = "/home"
 mount_id = "123e4567-e89b-12d3-a456-426655440000"
 expose_data_server = true
 data_server_url = "http://localhost:19001/data"
-enable_home_creation = true
+enable_home_creation = false
 
 [grpc.services.usershareprovider]
 [grpc.services.groupprovider]

diff --git a/examples/oidc-mapping-tpc/server-2.toml b/examples/oidc-mapping-tpc/server-2.toml
@@ -35,7 +35,7 @@ mount_path = "/home"
 mount_id = "123e4567-e89b-12d3-a456-426655440000"
 expose_data_server = true
 data_server_url = "http://localhost:17001/data"
-enable_home_creation = true
+enable_home_creation = false
 
 [grpc.services.usershareprovider]
 [grpc.services.groupprovider]

diff --git a/examples/sciencemesh/custom-mime-types-demo.json b/examples/sciencemesh/custom-mime-types-demo.json
@@ -0,0 +1,3 @@
+{
+  ".zmd": "application/compressed-markdown"
+}
diff --git a/examples/sciencemesh/pondersource-demo-providers.json b/examples/sciencemesh/pondersource-demo-providers.json
@@ -0,0 +1,74 @@
+[
+	{
+		"name": "reva1.pondersource.net",
+		"full_name": "reva1.pondersource.net",
+		"organization": "reva1.pondersource.net",
+		"domain": "reva1.pondersource.net",
+		"homepage": "https://reva1.pondersource.net",
+		"description": "reva1.pondersource.net",
+		"services": [
+			{
+				"endpoint": {
+					"type": {
+						"name": "OCM",
+						"description": "Open Cloud Mesh"
+					},
+					"name": "OCM API",
+					"path": "https://reva1.pondersource.net",
+					"is_monitored": true
+				},
+				"api_version": "0.0.1",
+				"host": "https://reva1.pondersource.net"
+			},
+			{
+				"endpoint": {
+					"type": {
+						"name": "Webdav",
+						"description": "Webdav"
+					},
+					"name": "Webdav API",
+					"path": "https://reva1.pondersource.net/webdav/",
+					"is_monitored": true
+				},
+				"api_version": "0.0.1",
+				"host": "https://reva1.pondersource.net"
+			}
+		]
+	},
+	{
+		"name": "reva2.pondersource.net",
+		"full_name": "reva2.pondersource.net",
+		"organization": "reva2.pondersource.net",
+		"domain": "reva2.pondersource.net",
+		"homepage": "https://reva2.pondersource.net",
+		"description": "reva2.pondersource.net",
+		"services": [
+			{
+				"endpoint": {
+					"type": {
+						"name": "OCM",
+						"description": "Open Cloud Mesh"
+					},
+					"name": "OCM API",
+					"path": "https://reva2.pondersource.net",
+					"is_monitored": true
+				},
+				"api_version": "0.0.1",
+				"host": "https://reva2.pondersource.net"
+			},
+			{
+				"endpoint": {
+					"type": {
+						"name": "Webdav",
+						"description": "Webdav"
+					},
+					"name": "Webdav API",
+					"path": "https://reva2.pondersource.net/webdav/",
+					"is_monitored": true
+				},
+				"api_version": "0.0.1",
+				"host": "https://reva2.pondersource.net"
+			}
+		]
+	}
+]