diff --git a/bruno/collections/Shibboleth/Authorize (manual flow in browser).yml b/bruno/collections/Shibboleth/Authorize (manual flow in browser).yml index f156f45..1a6c4d6 100644 --- a/bruno/collections/Shibboleth/Authorize (manual flow in browser).yml +++ b/bruno/collections/Shibboleth/Authorize (manual flow in browser).yml @@ -5,13 +5,13 @@ info: http: method: GET - url: "{{serverUri}}/idp/profile/oidc/authorize?client_id={{clientId}}&redirect_uri={{redirectUri}}&response_type=code&scope=openid profile email" + url: "{{shibbolethServerUri}}/idp/profile/oidc/authorize?client_id={{clientId}}&redirect_uri={{clientRedirectUri}}&response_type=code&scope=openid profile email" params: - name: client_id value: "{{clientId}}" type: query - name: redirect_uri - value: "{{redirectUri}}" + value: "{{clientRedirectUri}}" type: query - name: response_type value: code diff --git a/bruno/collections/Shibboleth/Generate Access Token.yml b/bruno/collections/Shibboleth/Generate Access Token.yml index 55a9a2e..45de766 100644 --- a/bruno/collections/Shibboleth/Generate Access Token.yml +++ b/bruno/collections/Shibboleth/Generate Access Token.yml @@ -5,7 +5,7 @@ info: http: method: POST - url: "{{serverUri}}/idp/profile/oidc/token" + url: "{{shibbolethServerUri}}/idp/profile/oidc/token" headers: - name: Content-Type value: application/x-www-form-urlencoded @@ -15,11 +15,11 @@ http: - name: grant_type value: authorization_code - name: redirect_uri - value: "{{redirectUri}}" + value: "{{clientRedirectUri}}" - name: scope value: openid profile email - name: code - value: "" + value: AAdzZWNyZXQxcKlGLY3zJzZp-SXBg9tSJp2n8PxhgB5nnYFr1f50GfD69sLo_OZ3t73WEPW2BKhY5sGh6A-dEmu7nX_PCk0QU7UwZEkFTQPu28BPyE11r-aqAZEO88CN0bTZB5nzx8ecAcQMvE8X74rHpmiWDf2YKdQVPlb9N7ON_ALKWx1XmVueinmHiwXFow1hnhZMxZK_Jy0DSmT9QN4pbfyDD2UkRZo4BOgyxqlYiDWWGF39DkVdwJfrduq5HM3yT3bUdR2zB-u25ol6NrOpfkoaM5-QKWexCfmFLx_huZah4vXY0RnvdzE8v5fpLCYVDUwv3gSXpsOuS4Ynf84Wz8Nr6bdaCo8hfHdCvNDtNPEBy7DTQ-2rb3Lgqq_piqj3N9WpBFIqqRQfwHBnKGGr07TXoaEi_fSROZ99VIJaPVJZNTdCNiiR9Sql_78KJr1tapx9eQD2UnkRPlzpBvQU6W4uX4YHqgd0i9sLEBOFv4BkGc9AwpB5ew description: Paste code obtained by manual flow in browser auth: type: basic @@ -31,7 +31,7 @@ runtime: - type: after-response code: |- var jsonData = res.getBody(); - bru.setEnvVar("accessToken", jsonData.access_token); + bru.setVar("accessToken", jsonData.access_token); - type: tests code: |- test("Status code is 200", function () { diff --git a/bruno/collections/Shibboleth/Get OIDC well-known configuration.yml b/bruno/collections/Shibboleth/Get OIDC well-known configuration.yml index fe1ff74..9cb76bd 100644 --- a/bruno/collections/Shibboleth/Get OIDC well-known configuration.yml +++ b/bruno/collections/Shibboleth/Get OIDC well-known configuration.yml @@ -5,7 +5,7 @@ info: http: method: GET - url: "{{serverUri}}/.well-known/openid-configuration" + url: "{{shibbolethServerUri}}/.well-known/openid-configuration" auth: inherit settings: diff --git a/bruno/collections/Shibboleth/Get UserInfo.yml b/bruno/collections/Shibboleth/Get UserInfo.yml index 3299b4a..2d2c4f5 100644 --- a/bruno/collections/Shibboleth/Get UserInfo.yml +++ b/bruno/collections/Shibboleth/Get UserInfo.yml @@ -5,7 +5,7 @@ info: http: method: GET - url: "{{serverUri}}/idp/profile/oidc/userinfo?client_id={{clientId}}&client_secret={{clientSecret}}" + url: "{{shibbolethServerUri}}/idp/profile/oidc/userinfo?client_id={{clientId}}&client_secret={{clientSecret}}" headers: - name: Content-Type value: application/x-www-form-urlencoded diff --git a/bruno/collections/Shibboleth/environments/Shibboleth.yml b/bruno/collections/Shibboleth/environments/Shibboleth.yml index c20d53c..406aece 100644 --- a/bruno/collections/Shibboleth/environments/Shibboleth.yml +++ b/bruno/collections/Shibboleth/environments/Shibboleth.yml @@ -1,17 +1,14 @@ name: Shibboleth variables: - name: clientId - value: "{{process.env.client_id}}" + value: "{{process.env.clientId}}" description: "" - name: clientSecret - value: "{{process.env.client_secret}}" + value: "{{process.env.clientSecret}}" description: "" - - name: redirectUri + - name: clientRedirectUri value: https://gitea.unipr.it/user/oauth2/Shibboleth/callback description: "" - - name: accessToken - value: AAdzZWNyZXQx1CToBgEqA8mxMWGsLKf0V86PS2Oz-3bI5BlRuiitj3iXP_qfSJgNzYsMdsIQ9QRmoIOS6ISVvFSyJ5XeHYE_msw6VJELg9S6qsO4mrBBwCaUM9p3zMPwNBwZJVn6vqgGghpMS_xeW2EGthh9W0HBsh7WuPYK4HJVpTYIxgYR782xET0ZU3XxLBknOeMoye2IrH3sYpeCRQCmd1GUyTl1Ra4sGdqYcw3iiISA_FbPMXOLFQN8GcFtEcPxzc9CtH4PHKDYIj_QQx0IUgEH814pyC-Oc5-19Gfg4Ulps9ZHF9rb4csbi9mvWAuJESHcSp5NSAK9tEMFvBUCe_2nr7WyzaGTI1D6Nr1PenxbWIRAmXGF5LtzSrv-8_k8XSdufefACBVbZH6EQWm4smrqSlMab71F5s9wB3rFEK5IuANQblFljG_vfoCATpmk0MCYo47SApSrorMYN5K6yWf4P3PuyQrIdrw0PsRzBWoY8XpzQTGYN1I - description: "" - - name: serverUri + - name: shibbolethServerUri value: https://shibidp.unipr.it description: "" diff --git a/env.json.template b/env.json.template index 0aeb101..928a962 100644 --- a/env.json.template +++ b/env.json.template @@ -3,15 +3,19 @@ "ExcludeFromBruno": [ "elixFormsApiUrl", "elixFormsApiUrl_Default", + "elixFormsRootUrl", "esse3apiRootUrl", "IdemApiUrl", - "IrisApiUrl" + "IrisApiUrl", + "shibbolethServerUri", + "clientRedirectUri" ] }, "API": { "elixForms API v2": { - "elixFormsApiUrl": "https://procedure.unipr.it/eF/services/api", - "elixFormsApiUrl_Default": "https://procedure.unipr.it/eF/api", + "elixFormsApiUrl": "https://console-unipr.elixforms.it/eF/services/api", + "elixFormsApiUrl_Default": "https://console-unipr.elixforms.it/eF/api", + "elixFormsRootUrl": "https://console-unipr.elixforms.it", "elixFormsApiUsername": null, "elixFormsApiPassword": null, "elixFormsWsAuthenticationToken": null @@ -40,6 +44,12 @@ "Scopus": { "ScopusApiKey1": null, "ScopusApiKey2": null + }, + "Shibboleth": { + "shibbolethServerUri": "https://shibidp.unipr.it", + "clientId": null, + "clientSecret": null, + "clientRedirectUri": "https://gitea.unipr.it/user/oauth2/Shibboleth/callback" } } } \ No newline at end of file