From 3be69e45bd0da885e2bf0c398c65a699e2a808c8 Mon Sep 17 00:00:00 2001 From: Pascal Wengerter Date: Mon, 22 Mar 2021 14:40:57 +0000 Subject: [PATCH 1/2] Fix typo and update http->https, port numbers --- docs/ocis/deployment/basic-remote-setup.md | 2 +- docs/ocis/development/extensions.md | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/docs/ocis/deployment/basic-remote-setup.md b/docs/ocis/deployment/basic-remote-setup.md index 48a828206a..bcbd48c02f 100644 --- a/docs/ocis/deployment/basic-remote-setup.md +++ b/docs/ocis/deployment/basic-remote-setup.md @@ -18,7 +18,7 @@ If you need to access oCIS running in a docker container, on a VM or a remote ma Upon first start of the oCIS fullstack server with `./bin/ocis server` it will generate a file `identifier-registration.yml` in the config folder in your current working directory. This file is used to configure the built-in identity provider and therefore contains the OpenID Connect issuer and also information about relying parties, for example ownCloud Web and our desktop and mobile applications. {{< hint warning >}} -The `identifier-registration.yml` file will only be generated if does not exist. If you want to change certain environment variables like `OCIS_URL`, please delete this file first before doing so. Otherwise your changes will not be applied correctly and you will run into errors. +The `identifier-registration.yml` file will only be generated if it does not exist yet. If you want to change certain environment variables like `OCIS_URL`, please delete this file first before doing so. Otherwise your changes will not be applied correctly and you will run into errors. {{< /hint >}} {{< hint warning >}} diff --git a/docs/ocis/development/extensions.md b/docs/ocis/development/extensions.md index bb03be4977..5163c4cd61 100644 --- a/docs/ocis/development/extensions.md +++ b/docs/ocis/development/extensions.md @@ -34,7 +34,7 @@ TAGS=simple make generate build Open the browser at http://localhost:9100 1. You land on the login screen. click login -2. You are redirected to an idp at http://localhost:9140/oauth2/auth with a login mask. Use `einstein:relativity`to login (one of the three demo users) +2. You are redirected to an idp at https://localhost:9200/oauth2/auth with a login mask. Use `einstein:relativity`to login (one of the three demo users) 3. You are redirected to http://localhost:9100/#/hello the ocis-hello app 4. Replace `World` with something else and submit. You should see `Hello %something else%` @@ -132,12 +132,12 @@ This is what hello is: copy and extend! ```json { - "server": "http://localhost:9140", + "server": "https://localhost:9200", "theme": "owncloud", "version": "0.1.0", "openIdConnect": { - "metadata_url": "http://localhost:9140/.well-known/openid-configuration", - "authority": "http://localhost:9140", + "metadata_url": "https://localhost:9200/.well-known/openid-configuration", + "authority": "https://localhost:9200", "client_id": "web", "response_type": "code", "scope": "openid profile email" From 356aa6b52331f5e5b5fea9745e2276e2dcf615fe Mon Sep 17 00:00:00 2001 From: Pascal Wengerter Date: Mon, 22 Mar 2021 16:10:29 +0000 Subject: [PATCH 2/2] Fix further URL and small wording improvements --- docs/ocis/development/extensions.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/ocis/development/extensions.md b/docs/ocis/development/extensions.md index 5163c4cd61..7f8815e3d8 100644 --- a/docs/ocis/development/extensions.md +++ b/docs/ocis/development/extensions.md @@ -31,10 +31,10 @@ TAGS=simple make generate build `bin/ocis server` -Open the browser at http://localhost:9100 +Open the browser at https://localhost:9200 1. You land on the login screen. click login -2. You are redirected to an idp at https://localhost:9200/oauth2/auth with a login mask. Use `einstein:relativity`to login (one of the three demo users) +2. You are redirected to an idp at https://localhost:9200/signin/v1/identifier with a login mask. Use `einstein:relativity` (one of the three demo users) to log in 3. You are redirected to http://localhost:9100/#/hello the ocis-hello app 4. Replace `World` with something else and submit. You should see `Hello %something else%`