Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/develop' into release-v1.104
Browse files Browse the repository at this point in the history
  • Loading branch information
erikjohnston committed Mar 26, 2024
2 parents 03f0d74 + c900d18 commit 34878b6
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 0 deletions.
1 change: 1 addition & 0 deletions changelog.d/17031.feature
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
OIDC: try to JWT decode userinfo response if JSON parsing failed.
7 changes: 7 additions & 0 deletions synapse/http/client.py
Original file line number Diff line number Diff line change
Expand Up @@ -390,6 +390,13 @@ async def request(
cooperator=self._cooperator,
)

# Always make sure we add a user agent to the request
if headers is None:
headers = Headers()

if not headers.hasHeader("User-Agent"):
headers.addRawHeader("User-Agent", self.user_agent)

request_deferred: defer.Deferred = treq.request(
method,
uri,
Expand Down

0 comments on commit 34878b6

Please sign in to comment.