From de96303cc2a9a16100f232841de3eff1d8b18d3e Mon Sep 17 00:00:00 2001 From: Benjamin Dauvergne Date: Tue, 23 Oct 2018 10:43:45 +0200 Subject: [PATCH] auth_oidc: keep previous value when building authorization_claims (#26565) --- src/authentic2_auth_oidc/models.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/authentic2_auth_oidc/models.py b/src/authentic2_auth_oidc/models.py index b04d0297..4c6a7af7 100644 --- a/src/authentic2_auth_oidc/models.py +++ b/src/authentic2_auth_oidc/models.py @@ -152,11 +152,10 @@ class OIDCProvider(models.Model): userinfo_claims = {} for claim_mapping in self.claim_mappings.all(): d = idtoken_claims if claim_mapping.idtoken_claim else userinfo_claims - value = {} + value = d.set_default(claim_mapping.claim, {}) if claim_mapping.required: value['essential'] = True - value = value or None - d[claim_mapping.claim] = value + d[claim_mapping.claim] = value or None return { 'id_token': idtoken_claims, 'userinfo': userinfo_claims, -- 2.18.0