Merge pull request #8016 from owncloud/fix-idp-config-dev-setup

Fix idp config dev setup

.gitignore

@@ -60,3 +60,6 @@ tests/acceptance/report/cucumber_report.html
 
 # third party licenses
 /third-party-licenses
+
+# dev setup certificates
+/dev/docker/ocis-ca

dev/docker/ocis.idp.config.yaml

@@ -0,0 +1,14 @@
+clients:
+- id: web
+  name: ownCloud web app
+  application_type: web
+  insecure: yes
+  trusted: yes
+  redirect_uris:
+    - https://host.docker.internal:9100/
+    - https://host.docker.internal:9200/
+    - https://host.docker.internal:9100/oidc-callback.html
+    - https://host.docker.internal:9200/oidc-callback.html
+  origins:
+    - https://host.docker.internal:9100
+    - https://host.docker.internal:9200

docker-compose.yml

@@ -32,7 +32,6 @@ services:
 
       # IDP
       IDP_LDAP_BIND_PASSWORD: "${IDP_LDAP_BIND_PASSWORD:-some-ldap-idp-password}"
-      IDP_IDENTIFIER_REGISTRATION_CONF: ${IDP_IDENTIFIER_REGISTRATION_CONF:-/web/identifier-registration.yml}
 
       # STORAGE
       STORAGE_HOME_DRIVER: ${STORAGE_HOME_DRIVER:-ocis}
@@ -51,8 +50,9 @@ services:
       PROXY_ENABLE_BASIC_AUTH: "${PROXY_ENABLE_BASIC_AUTH:-true}"
     volumes:
       - ./dev/docker/ocis.entrypoint.sh:/usr/bin/entrypoint
+      - ./dev/docker/ocis.idp.config.yaml:/etc/ocis/idp.yaml
+      - ./dev/docker/ocis-ca:/var/lib/ocis/proxy
       - ./dist:/web/dist:ro
-      - ./tests/acceptance/mac-identifier-registration.yml:/web/identifier-registration.yml:ro
       - ${OCIS_WEB_CONFIG:-./dev/docker/ocis.web.config.json}:/web/config.json:ro
     extra_hosts:
       - host.docker.internal:${DOCKER_HOST:-host-gateway}

docs/testing/testing.md

@@ -1,5 +1,5 @@
 ---
-title: "Running acceptance tests"
+title: "Running tests"
 date: 2021-07-27T00:00:00+00:00
 weight: 60
 geekdocRepo: https://github.com/owncloud/web
@@ -135,8 +135,7 @@ to the nightwatch based e2e tests anymore.
 In other words: only continue reading about our nightwatch based acceptance tests below if you need to debug a failing test.
 {{< /hint >}}
 
-At ownCloud, we have decided to adopt Docker as the main environment for developing our application.
-This also applies for running our acceptance tests. To run the tests without Docker on your local machine, please refer to the [manual testing guide]({{< ref "acceptance-tests-all.md" >}})
+At ownCloud, we have decided to adopt Docker as the main environment for developing our application. This also applies for running our acceptance tests.
 
 #### Prerequisites
 

rollup.config.mjs

@@ -205,7 +205,11 @@ if (process.env.SERVER === 'true') {
     serve({
       host: '0.0.0.0',
       contentBase: ['dist'],
-      port: process.env.PORT || 9100
+      port: process.env.PORT || 9100,
+      https: {
+        key: fs.readFileSync('./dev/docker/ocis-ca/server.key'),
+        cert: fs.readFileSync('./dev/docker/ocis-ca/server.crt')
+      },
     })
   )
   plugins.push(