From f962d032805d99599abfe5ee98ed2f6e38c5b521 Mon Sep 17 00:00:00 2001 From: David Kirwan Date: Thu, 14 Jul 2022 11:58:53 +0100 Subject: [PATCH] Revert "flask-oidc-dev: Updating default scopes to include fedora groups" This reverts commit 81c4dd3a186702e1a569e1b6071abb8f90ee7bb2. Revert "flask-oidc-dev: Changing layout of client secrets configuration" This reverts commit 81d27e668b68d797e98d0b6b9dfad6d46d9ba39c. Signed-off-by: David Kirwan --- .../templates/client_secrets.json | 20 +++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/roles/openshift-apps/flask-oidc-dev/templates/client_secrets.json b/roles/openshift-apps/flask-oidc-dev/templates/client_secrets.json index 100d3f8bbe..134d427eb0 100644 --- a/roles/openshift-apps/flask-oidc-dev/templates/client_secrets.json +++ b/roles/openshift-apps/flask-oidc-dev/templates/client_secrets.json @@ -1,13 +1,17 @@ { - "OIDC_CLIENT_ID": "flask-oidc-dev", + "web": { + "auth_uri": "https://id{{env_suffix}}.fedoraproject.org/openidc/Authorization", + "client_id": "flask-oidc-dev", {% if env == 'staging' %} - "OIDC_CLIENT_SECRET": "{{ flask_oidc_dev_stg_oidc_client_secret }}", + "client_secret": "{{ flask_oidc_dev_stg_oidc_client_secret }}", {% else %} - "OIDC_CLIENT_SECRET": "{{ flask_oidc_dev_oidc_client_secret }}", + "client_secret": "{{ flask_oidc_dev_oidc_client_secret }}", {% endif %} - "OIDC_ISSUER": "https://id{{env_suffix}}.fedoraproject.org/openidc/", - "OIDC_USERINFO_URL": "https://id{{env_suffix}}.fedoraproject.org/openidc/UserInfo", - "OIDC_SCOPES":"openid profile email https://id.fedoraproject.org/scope/groups", - "OIDC_CLIENT_AUTH_METHOD":"client_secret_post", - "OIDC_OPENID_CALLBACK":"/oidc_callback" + "issuer": "https://id{{env_suffix}}.fedoraproject.org/openidc/", + "redirect_uris": [ + "https://app-flask-oidc-dev.apps.ocp{{env_suffix}}.fedoraproject.org/oidc/oidc_callback" + ], + "token_uri": "https://id{{env_suffix}}.fedoraproject.org/openidc/Token", + "userinfo_uri": "https://id{{env_suffix}}.fedoraproject.org/openidc/UserInfo" + } }