From a05113b48d68f845744eea133b651e3042e5e746 Mon Sep 17 00:00:00 2001 From: Michal Konecny Date: Wed, 19 Jul 2023 16:23:05 +0200 Subject: [PATCH] [Pagure] Fix the client_secrets.json The `env_suffix` variable doesn't work in case of pagure. So we need to do it different way. Signed-off-by: Michal Konecny --- roles/pagure/templates/client_secrets.json | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/roles/pagure/templates/client_secrets.json b/roles/pagure/templates/client_secrets.json index 30c265f4a0..f491759776 100644 --- a/roles/pagure/templates/client_secrets.json +++ b/roles/pagure/templates/client_secrets.json @@ -1,13 +1,25 @@ { "web": { - "auth_uri": "https://id{{env_suffix}}.fedoraproject.org/openidc/Authorization", +{% if env == 'pagure-staging' %} + "auth_uri": "https://id.stg.fedoraproject.org/openidc/Authorization", "client_id": "{{ pagure_oidc_client_id }}", "client_secret": "{{ pagure_stg_oidc_client_secret }}", - "issuer": "https://id{{env_suffix}}.fedoraproject.org/openidc/", + "issuer": "https://id.stg.fedoraproject.org/openidc/", "redirect_uris": [ - "https://{{env_suffix}}.pagure.io/login" + "https://stg.pagure.io/login" ], - "token_uri": "https://id{{env_suffix}}.fedoraproject.org/openidc/Token", - "userinfo_uri": "https://id{{env_suffix}}.fedoraproject.org/openidc/UserInfo" + "token_uri": "https://id.stg.fedoraproject.org/openidc/Token", + "userinfo_uri": "https://id.stg.fedoraproject.org/openidc/UserInfo" +{% else %} + "auth_uri": "https://id.fedoraproject.org/openidc/Authorization", + "client_id": "{{ pagure_oidc_client_id }}", + "client_secret": "{{ pagure_stg_oidc_client_secret }}", + "issuer": "https://id.fedoraproject.org/openidc/", + "redirect_uris": [ + "https://pagure.io/login" + ], + "token_uri": "https://id.fedoraproject.org/openidc/Token", + "userinfo_uri": "https://id.fedoraproject.org/openidc/UserInfo" +{% endif %} } }