From 2ef33dc608e539bd6fe0f477758a2369014c0970 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Juan=20Pablo=20Villafa=C3=B1ez?= Date: Mon, 6 Sep 2021 16:20:13 +0200 Subject: [PATCH 1/7] Set english as default language (#2465) * Set english as default language * Add changelog entry * Adjust acceptance test --- changelog/unreleased/set-english-default-dropdown.md | 5 +++++ settings/pkg/service/v0/settings.go | 1 + settings/ui/tests/acceptance/features/settings.feature | 2 +- 3 files changed, 7 insertions(+), 1 deletion(-) create mode 100644 changelog/unreleased/set-english-default-dropdown.md diff --git a/changelog/unreleased/set-english-default-dropdown.md b/changelog/unreleased/set-english-default-dropdown.md new file mode 100644 index 0000000000..d2dadd412e --- /dev/null +++ b/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 diff --git a/settings/pkg/service/v0/settings.go b/settings/pkg/service/v0/settings.go index f858395f67..b96819f000 100644 --- a/settings/pkg/service/v0/settings.go +++ b/settings/pkg/service/v0/settings.go @@ -128,6 +128,7 @@ var languageSetting = settings.Setting_SingleChoiceValue{ }, }, DisplayValue: "English", + Default: true, }, { Value: &settings.ListOptionValue{ diff --git a/settings/ui/tests/acceptance/features/settings.feature b/settings/ui/tests/acceptance/features/settings.feature index b59894357f..9b61ca5a8b 100644 --- a/settings/ui/tests/acceptance/features/settings.feature +++ b/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" From 35c27afcb6a086ab0e393f356cfd4b005840b146 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Juan=20Pablo=20Villafa=C3=B1ez?= Date: Mon, 6 Sep 2021 14:20:58 +0000 Subject: [PATCH 2/7] Automated changelog update [skip ci] --- CHANGELOG.md | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 359f685722..2383b103fc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,7 @@ The following sections list the changes for unreleased. ## Summary +* 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 +16,13 @@ The following sections list the changes for unreleased. ## Details +* 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 From 16d1846c628fbef2e0f31e3c91d675860df27f4a Mon Sep 17 00:00:00 2001 From: Swikriti Tripathi Date: Tue, 7 Sep 2021 14:41:29 +0545 Subject: [PATCH 3/7] Bump core commit id --- .drone.env | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.env b/.drone.env index cd04af54b3..80197a00bd 100644 --- a/.drone.env +++ b/.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 From 3aa519c9def420c002946e14bc1c9909186249f5 Mon Sep 17 00:00:00 2001 From: Willy Kloucek Date: Tue, 7 Sep 2021 13:06:37 +0200 Subject: [PATCH 4/7] remove non working proxy route and fix cs3 users example --- .../config/ocis/entrypoint-override.sh | 22 +++++++++++++++++++ .../config/ocis/proxy-config.json | 10 +-------- .../config/ocis/web-config.dist.json | 22 +++++++++++++++++++ .../cs3_users_ocis/docker-compose.yml | 10 ++++++++- proxy/pkg/proxy/proxy.go | 4 ---- 5 files changed, 54 insertions(+), 14 deletions(-) create mode 100644 deployments/examples/cs3_users_ocis/config/ocis/entrypoint-override.sh create mode 100644 deployments/examples/cs3_users_ocis/config/ocis/web-config.dist.json diff --git a/deployments/examples/cs3_users_ocis/config/ocis/entrypoint-override.sh b/deployments/examples/cs3_users_ocis/config/ocis/entrypoint-override.sh new file mode 100644 index 0000000000..ac598cb60f --- /dev/null +++ b/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 diff --git a/deployments/examples/cs3_users_ocis/config/ocis/proxy-config.json b/deployments/examples/cs3_users_ocis/config/ocis/proxy-config.json index 99a4b5862f..b50c1c4d8a 100644 --- a/deployments/examples/cs3_users_ocis/config/ocis/proxy-config.json +++ b/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" diff --git a/deployments/examples/cs3_users_ocis/config/ocis/web-config.dist.json b/deployments/examples/cs3_users_ocis/config/ocis/web-config.dist.json new file mode 100644 index 0000000000..b4bd58fc16 --- /dev/null +++ b/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 + } +} diff --git a/deployments/examples/cs3_users_ocis/docker-compose.yml b/deployments/examples/cs3_users_ocis/docker-compose.yml index 09432ef071..d2a80a77cd 100644 --- a/deployments/examples/cs3_users_ocis/docker-compose.yml +++ b/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: diff --git a/proxy/pkg/proxy/proxy.go b/proxy/pkg/proxy/proxy.go index 0bd61b7615..0d8aea603c 100644 --- a/proxy/pkg/proxy/proxy.go +++ b/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", From 41ced6621a9588c462fad8a007fe26533b3ef2b5 Mon Sep 17 00:00:00 2001 From: Willy Kloucek Date: Tue, 7 Sep 2021 13:10:16 +0200 Subject: [PATCH 5/7] add changelog --- changelog/unreleased/remove-proxy-route-fix-cs3-example.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 changelog/unreleased/remove-proxy-route-fix-cs3-example.md diff --git a/changelog/unreleased/remove-proxy-route-fix-cs3-example.md b/changelog/unreleased/remove-proxy-route-fix-cs3-example.md new file mode 100644 index 0000000000..d7115fb378 --- /dev/null +++ b/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 From d07f1752d8986d96c88e3979fd69523cc6c9c0c5 Mon Sep 17 00:00:00 2001 From: Willy Kloucek <34452982+wkloucek@users.noreply.github.com> Date: Tue, 7 Sep 2021 13:11:41 +0000 Subject: [PATCH 6/7] Automated changelog update [skip ci] --- CHANGELOG.md | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2383b103fc..105ed702ac 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,7 @@ 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) @@ -16,6 +17,14 @@ 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 From 379262ec8e2aac279f3e624981dde01a44198e34 Mon Sep 17 00:00:00 2001 From: Willy Kloucek Date: Tue, 7 Sep 2021 17:12:17 +0200 Subject: [PATCH 7/7] add icon to collabora app provider in deployment example --- deployments/examples/ocis_wopi/docker-compose.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/deployments/examples/ocis_wopi/docker-compose.yml b/deployments/examples/ocis_wopi/docker-compose.yml index a0f5488b4e..74a5f2b5fd 100644 --- a/deployments/examples/ocis_wopi/docker-compose.yml +++ b/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}