summary refs log tree commit diff
diff options
context:
space:
mode:
authorPatrick Cloke <clokep@users.noreply.github.com>2022-12-29 12:18:06 -0500
committerGitHub <noreply@github.com>2022-12-29 12:18:06 -0500
commit044fa1a1de3c954f247a98c0ce8f734c675a5efb (patch)
tree741bc7387cdd3c690f9159cea02791764805cc61
parentBump attrs from 22.1.0 to 22.2.0 (#14734) (diff)
downloadsynapse-044fa1a1de3c954f247a98c0ce8f734c675a5efb.tar.xz
Actually use the picture_claim as configured in OIDC config. (#14751)
Previously it was only using the default value ("picture") when
fetching the picture from the user info.
-rw-r--r--changelog.d/14751.bugfix1
-rw-r--r--synapse/handlers/oidc.py2
2 files changed, 2 insertions, 1 deletions
diff --git a/changelog.d/14751.bugfix b/changelog.d/14751.bugfix
new file mode 100644
index 0000000000..56ef852288
--- /dev/null
+++ b/changelog.d/14751.bugfix
@@ -0,0 +1 @@
+Fix a bug introduced in Synapse 1.73.0 where the `picture_claim` configured under `oidc_providers` was unused (the default value of `"picture"` was used instead).
diff --git a/synapse/handlers/oidc.py b/synapse/handlers/oidc.py
index 03de6a4ba6..23fb00c9c9 100644
--- a/synapse/handlers/oidc.py
+++ b/synapse/handlers/oidc.py
@@ -1615,7 +1615,7 @@ class JinjaOidcMappingProvider(OidcMappingProvider[JinjaOidcMappingConfig]):
         if email:
             emails.append(email)
 
-        picture = userinfo.get("picture")
+        picture = userinfo.get(self._config.picture_claim)
 
         return UserAttributeDict(
             localpart=localpart,