fix #125 - SATOSA_REQUESTED_ATTRIBUTES env splitted in SATOSA_REQUEST…

…ED_SPID_ATTRIBUTES and SATOSA_REQUESTED_CIE_ATTRIBUTES
italia · Feb 22, 2024 · 05c1f27 · 05c1f27
1 parent 138e9f5
commit 05c1f27
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 4 deletions.
diff --git a/Docker-compose/.env.example b/Docker-compose/.env.example
@@ -43,7 +43,8 @@ SATOSA_UI_LOGO_WIDTH="80"
 SATOSA_UI_LOGO_URL="https://example_organization.org/logo.png"
 SATOSA_UI_PRIVACY_URL_EN="https://example_organization.org/privacy"
 SATOSA_UI_PRIVACY_URL_IT="https://example_organization.org/it/privacy"
-SATOSA_REQUESTED_ATTRIBUTES=[]
+SATOSA_REQUESTED_SPID_ATTRIBUTES=[]
+SATOSA_REQUESTED_CIE_ATTRIBUTES=[]
 
 # If set to true, satosa downloads IDEM's keys and IDPs from registry.spid.gov.it
 GET_IDEM_MDQ_KEY=true
diff --git a/Docker-compose/docker-compose.yml b/Docker-compose/docker-compose.yml
@@ -107,7 +107,8 @@ services:
       - SATOSA_UI_PRIVACY_URL_EN=${SATOSA_UI_PRIVACY_URL_EN:-https://example_organization.org/privacy}
       - SATOSA_UI_PRIVACY_URL_IT=${SATOSA_UI_PRIVACY_URL_IT:-https://example_organization.org/it/privacy}
       - SATOSA_USER_ID_HASH_SALT=${SATOSA_USER_ID_HASH_SALT:-CHANGE_ME!}
-      - SATOSA_REQUESTED_ATTRIBUTES=${SATOSA_REQUESTED_ATTRIBUTES:-[]}
+      - SATOSA_REQUESTED_SPID_ATTRIBUTES=${SATOSA_REQUESTED_SPID_ATTRIBUTES:-[]}
+      - SATOSA_REQUESTED_CIE_ATTRIBUTES=${SATOSA_REQUESTED_CIE_ATTRIBUTES:-[]}
 
       - GET_IDEM_MDQ_KEY=${GET_IDEM_MDQ_KEY:-true}
     expose:

diff --git a/example/plugins/backends/ciesaml2_backend.yaml b/example/plugins/backends/ciesaml2_backend.yaml
@@ -124,7 +124,7 @@ config:
                               'dateOfBirth',
                               'fiscalNumber',
                               ]
-        requested_attributes: !ENV SATOSA_REQUESTED_ATTRIBUTES
+        requested_attributes: !ENV SATOSA_REQUESTED_CIE_ATTRIBUTES
         #optional_attributes: ['gender',
         #                      'companyName',
         #                      'registeredOffice',

diff --git a/example/plugins/backends/spidsaml2_backend.yaml b/example/plugins/backends/spidsaml2_backend.yaml
@@ -124,7 +124,7 @@ config:
 
         # this instantiate the attribute_consuming_service
         required_attributes: ['spidCode', 'name', 'familyName', 'fiscalNumber', 'email']
-        requested_attributes: !ENV SATOSA_REQUESTED_ATTRIBUTES
+        requested_attributes: !ENV SATOSA_REQUESTED_SPID_ATTRIBUTES
         #optional_attributes: ['gender',
         #                      'companyName',
         #                      'registeredOffice',