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.
matrix-org · Dec 29, 2022 · 044fa1a · 044fa1a
1 parent eb9ae47
commit 044fa1a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/changelog.d/14751.bugfix 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
@@ -1615,7 +1615,7 @@ def render_template_field(template: Optional[Template]) -> Optional[str]:
         if email:
             emails.append(email)
 
-        picture = userinfo.get("picture")
+        picture = userinfo.get(self._config.picture_claim)
 
         return UserAttributeDict(
             localpart=localpart,
Original file line number	Diff line number	Diff line change
		@@ -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).