Matrix-Mirrors/synapse-product
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse-product.git synced 2025-01-01 05:36:12 -05:00
Code Issues Packages Projects Releases Wiki Activity

Use stable MSC3069 is_guest flag on /whoami. (#12021)

Browse Source 
Keeping backwards compatibility with the unstable flag for now.
This commit is contained in:
Travis Ralston 2022-02-18 05:48:23 -07:00 committed by GitHub
parent 5a6911598a
commit 19bd9cff1a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
changelog.d/12021.feature Normal file
View File

@ -0,0 +1 @@
Support only the stable identifier for [MSC3069](https://github.com/matrix-org/matrix-doc/pull/3069)'s `is_guest` on `/_matrix/client/v3/account/whoami`.

2
synapse/rest/client/account.py
View File

@ -883,7 +883,9 @@ class WhoamiRestServlet(RestServlet):
response = { response = {
"user_id": requester.user.to_string(), "user_id": requester.user.to_string(),
# MSC: https://github.com/matrix-org/matrix-doc/pull/3069 # MSC: https://github.com/matrix-org/matrix-doc/pull/3069
# Entered spec in Matrix 1.2
"org.matrix.msc3069.is_guest": bool(requester.is_guest), "org.matrix.msc3069.is_guest": bool(requester.is_guest),
"is_guest": bool(requester.is_guest),
} }
# Appservices and similar accounts do not have device IDs # Appservices and similar accounts do not have device IDs

9
tests/rest/client/test_account.py
View File

@ -486,8 +486,9 @@ class WhoamiTestCase(unittest.HomeserverTestCase):
{ {
"user_id": user_id, "user_id": user_id,
"device_id": device_id, "device_id": device_id,
# Unstable until MSC3069 enters spec # MSC3069 entered spec in Matrix 1.2 but maintained compatibility
"org.matrix.msc3069.is_guest": False, "org.matrix.msc3069.is_guest": False,
"is_guest": False,
}, },
) )
@ -505,8 +506,9 @@ class WhoamiTestCase(unittest.HomeserverTestCase):
{ {
"user_id": user_id, "user_id": user_id,
"device_id": device_id, "device_id": device_id,
# Unstable until MSC3069 enters spec # MSC3069 entered spec in Matrix 1.2 but maintained compatibility
"org.matrix.msc3069.is_guest": True, "org.matrix.msc3069.is_guest": True,
"is_guest": True,
}, },
) )
@ -528,8 +530,9 @@ class WhoamiTestCase(unittest.HomeserverTestCase):
whoami, whoami,
{ {
"user_id": user_id, "user_id": user_id,
# Unstable until MSC3069 enters spec # MSC3069 entered spec in Matrix 1.2 but maintained compatibility
"org.matrix.msc3069.is_guest": False, "org.matrix.msc3069.is_guest": False,
"is_guest": False,
}, },
) )
self.assertFalse(hasattr(whoami, "device_id")) self.assertFalse(hasattr(whoami, "device_id"))