Merge branch 'master' into spaces-crud

.drone.env

@@ -1,5 +1,5 @@
 # The test runner source for API tests
-CORE_COMMITID=34cb22625097d49043b27699657c830c0f2a2bb5
+CORE_COMMITID=370fd807e464dcc5cb9619a8890107424254dfa6
 CORE_BRANCH=master
 
 # The test runner source for UI tests

CHANGELOG.md

@@ -6,6 +6,8 @@ The following sections list the changes for unreleased.
 
 ## Summary
 
+* Bugfix - Remove non working proxy route and fix cs3 users example: [#2474](https://github.com/owncloud/ocis/pull/2474)
+* Bugfix - Set English as default language in the dropdown in the settings page: [#2465](https://github.com/owncloud/ocis/pull/2465)
 * Change - Remove OnlyOffice extension: [#2433](https://github.com/owncloud/ocis/pull/2433)
 * Enhancement - Add app provider and app provider registry: [#2204](https://github.com/owncloud/ocis/pull/2204)
 * Enhancement - Add the create space permission: [#2461](https://github.com/owncloud/ocis/pull/2461)
@@ -15,6 +17,21 @@ The following sections list the changes for unreleased.
 
 ## Details
 
+* Bugfix - Remove non working proxy route and fix cs3 users example: [#2474](https://github.com/owncloud/ocis/pull/2474)
+
+   We removed a non working route from the proxy default configuration and fixed the cs3 users
+   deployment example since it still used the accounts service. It now only uses the configured
+   LDAP.
+
+   https://github.com/owncloud/ocis/pull/2474
+
+* Bugfix - Set English as default language in the dropdown in the settings page: [#2465](https://github.com/owncloud/ocis/pull/2465)
+
+   The language dropdown didn't have a default language selected, and it was showing an empty
+   value. Now it shows English instead.
+
+   https://github.com/owncloud/ocis/pull/2465
+
 * Change - Remove OnlyOffice extension: [#2433](https://github.com/owncloud/ocis/pull/2433)
 
    Tags: OnlyOffice

changelog/unreleased/remove-proxy-route-fix-cs3-example.md

@@ -0,0 +1,5 @@
+Bugfix: Remove non working proxy route and fix cs3 users example
+
+We removed a non working route from the proxy default configuration and fixed the cs3 users deployment example since it still used the accounts service. It now only uses the configured LDAP.
+
+https://github.com/owncloud/ocis/pull/2474

changelog/unreleased/set-english-default-dropdown.md

@@ -0,0 +1,5 @@
+Bugfix: Set English as default language in the dropdown in the settings page
+
+The language dropdown didn't have a default language selected, and it was showing an empty value. Now it shows English instead.
+
+https://github.com/owncloud/ocis/pull/2465

deployments/examples/cs3_users_ocis/config/ocis/entrypoint-override.sh

@@ -0,0 +1,22 @@
+#!/bin/sh
+
+set -e
+
+mkdir -p /var/tmp/ocis/.config/
+cp /config/proxy-config.json /var/tmp/ocis/.config/proxy-config.json
+cp /config/web-config.dist.json /var/tmp/ocis/.config/web-config.json
+sed -i 's/ocis.owncloud.test/'${OCIS_DOMAIN:-ocis.owncloud.test}'/g' /var/tmp/ocis/.config/web-config.json
+
+ocis server&
+sleep 10
+
+# stop builtin accounts since we use LDAP only
+ocis kill accounts
+# stop builtin LDAP server since we use external LDAP only
+ocis kill glauth
+
+ocis kill proxy
+sleep 10
+ocis proxy server # workaround for loading proxy configuration
+
+wait # wait for oCIS to exit

deployments/examples/cs3_users_ocis/config/ocis/proxy-config.json

@@ -29,7 +29,7 @@
         },
         {
           "type": "regex",
-          "endpoint": "/ocs/v[12].php/cloud/(users?|groups)",
+          "endpoint": "/ocs/v[12].php/cloud/user/signing-key",
           "backend": "http://localhost:9110"
         },
         {
@@ -73,14 +73,6 @@
           "endpoint": "/graph-explorer/",
           "backend": "http://localhost:9135"
         },
-        {
-          "endpoint": "/api/v0/accounts",
-          "backend": "http://localhost:9181"
-        },
-        {
-          "endpoint": "/accounts.js",
-          "backend": "http://localhost:9181"
-        },
         {
           "endpoint": "/api/v0/settings",
           "backend": "http://localhost:9190"

deployments/examples/cs3_users_ocis/config/ocis/web-config.dist.json

@@ -0,0 +1,22 @@
+{
+  "server": "https://ocis.owncloud.test",
+  "theme": "owncloud",
+  "version": "0.1.0",
+  "openIdConnect": {
+    "metadata_url": "https://ocis.owncloud.test/.well-known/openid-configuration",
+    "authority": "https://ocis.owncloud.test",
+    "client_id": "web",
+    "response_type": "code",
+    "scope": "openid profile email"
+  },
+  "apps": ["files"],
+  "external_apps": [
+    {
+      "id": "settings",
+      "path": "/settings.js"
+    }
+  ],
+  "options": {
+    "hideSearchBar": true
+  }
+}

deployments/examples/cs3_users_ocis/docker-compose.yml

@@ -48,9 +48,11 @@ services:
       ocis-net:
     depends_on:
       - ldap-server
+    entrypoint:
+      - /bin/sh
+      - /entrypoint-override.sh
     environment:
       # CS3 users from ldap specific configuration
-      PROXY_CONFIG_FILE: "/config/proxy-config.json"
       IDP_LDAP_FILTER: "(&(objectclass=inetOrgPerson)(objectClass=owncloud))"
       IDP_LDAP_URI: ldap://ldap-server:389
       IDP_LDAP_BIND_DN: "cn=admin,dc=owncloud,dc=com"
@@ -70,6 +72,10 @@ services:
       STORAGE_LDAP_ATTRIBUTEFILTER: '(&(objectclass=owncloud)({{attr}}={{value}}))'
       STORAGE_LDAP_FINDFILTER: '(&(objectclass=owncloud)(|(uid={{query}}*)(cn={{query}}*)(displayname={{query}}*)(mail={{query}}*)(description={{query}}*)))'
       STORAGE_LDAP_GROUPFILTER: '(&(objectclass=groupOfUniqueNames)(objectclass=owncloud)(ownclouduuid={{.OpaqueId}}*))'
+      # web ui
+      WEB_UI_CONFIG: "/var/tmp/ocis/.config/web-config.json"
+      # proxy
+      PROXY_CONFIG_FILE: "/var/tmp/ocis/.config/proxy-config.json"
       # General oCIS config
       OCIS_URL: https://${OCIS_DOMAIN:-ocis.owncloud.test}
       OCIS_LOG_LEVEL: ${OCIS_LOG_LEVEL:-error} # make oCIS less verbose
@@ -79,6 +85,8 @@ services:
       OCIS_JWT_SECRET: ${OCIS_JWT_SECRET:-Pive-Fumkiu4}
       OCIS_TRANSFER_SECRET: ${STORAGE_TRANSFER_SECRET:-replace-me-with-a-transfer-secret}
     volumes:
+      - ./config/ocis/entrypoint-override.sh:/entrypoint-override.sh
+      - ./config/ocis/web-config.dist.json:/config/web-config.dist.json
       - ./config/ocis/proxy-config.json:/config/proxy-config.json
       - ocis-data:/var/tmp/ocis
     labels:

deployments/examples/ocis_wopi/docker-compose.yml

@@ -69,6 +69,7 @@ services:
       # app provider
       APP_PROVIDER_DRIVER: wopi
       APP_PROVIDER_WOPI_DRIVER_APP_NAME: Collabora
+      APP_PROVIDER_WOPI_DRIVER_APP_ICON_URI: https://www.collaboraoffice.com/wp-content/uploads/2019/01/CP-icon.png
       APP_PROVIDER_WOPI_DRIVER_APP_URL: https://${COLLABORA_DOMAIN:-collabora.owncloud.test}
       APP_PROVIDER_WOPI_DRIVER_INSECURE: "${INSECURE:-false}"
       APP_PROVIDER_WOPI_DRIVER_IOP_SECRET: ${WOPI_IOP_SECRET:-LoremIpsum123}

proxy/pkg/proxy/proxy.go

@@ -303,10 +303,6 @@ func defaultPolicies() []config.Policy {
 					Endpoint: "/ocs/",
 					Backend:  "http://localhost:9140",
 				},
-				{
-					Endpoint: "/ocs/v[12].php/cloud/users/signing-key",
-					Backend:  "http://localhost:9110",
-				},
 				{
 					Type:     config.QueryRoute,
 					Endpoint: "/remote.php/?preview=1",

settings/pkg/service/v0/settings.go

@@ -128,6 +128,7 @@ var languageSetting = settings.Setting_SingleChoiceValue{
 					},
 				},
 				DisplayValue: "English",
+				Default:      true,
 			},
 			{
 				Value: &settings.ListOptionValue{

settings/ui/tests/acceptance/features/settings.feature

@@ -13,7 +13,7 @@ Feature: Set user specific settings
 	Scenario: Check the default settings
 		Given user "user1" has logged in using the webUI
 		And the user browses to the settings page
-		Then the setting "Language" should not have any value
+		Then the setting "Language" should have value "English"
 		When the user browses to the files page
 		Then the files menu should be listed in language "English"