Skip to content

Dedicated MAS API #18520

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 20 commits into from
Jul 21, 2025
Merged

Dedicated MAS API #18520

Changes from 1 commit
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
d32c32b
Dedicated API for MAS -> Synapse communication
sandhose Jul 18, 2025
23e7b88
Tests for the dedicated MAS users APIs
sandhose Jul 18, 2025
9ba9989
Tests for the dedicated MAS devices APIs
sandhose Jul 18, 2025
25fade5
Newsfile
sandhose Jul 18, 2025
cfb1ff4
Add doc comments for all new endpoints
sandhose Jul 18, 2025
86e8435
Fix starting up & tests if authlib is not installed
sandhose Jul 21, 2025
ae7c6ff
Change test order for consistency
sandhose Jul 21, 2025
f1647b7
Fix test comment accuracy
sandhose Jul 21, 2025
eb5e7a6
Rename endpoint create_device -> upsert_device
sandhose Jul 21, 2025
f91a698
Put 'email' in a constant
sandhose Jul 21, 2025
47c0161
Rename variable for clarity
sandhose Jul 21, 2025
31b32b3
Expand on why we log early
sandhose Jul 21, 2025
c1f666e
Use RequestBodyModel instead of BaseModel
sandhose Jul 21, 2025
48d7d7b
Rename assert_mas_request -> assert_request_is_from_mas
sandhose Jul 21, 2025
2eb98c0
Fix typo in tests
sandhose Jul 21, 2025
cc6da94
Skip MAS API tests if authlib is not available
sandhose Jul 21, 2025
02bf776
Remove broken test case
sandhose Jul 21, 2025
1fa7898
Import the MemoryReactor from the right place to keep compatibility w…
sandhose Jul 21, 2025
7e8c19e
Use a TypedDict instead of a BaseModel for MasQueryUserResource.Response
sandhose Jul 21, 2025
f8b4656
Use keyword args with the `TypedDict`
sandhose Jul 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion synapse/rest/synapse/mas/_base.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@

from typing import TYPE_CHECKING, cast

from synapse.api.auth.msc3861_delegated import MSC3861DelegatedAuth
from synapse.api.errors import SynapseError
from synapse.http.server import DirectServeJsonResource

Expand All @@ -28,6 +27,10 @@

class MasBaseResource(DirectServeJsonResource):
def __init__(self, hs: "HomeServer"):
# Importing this module requires authlib, which is an optional
# dependency but required if msc3861 is enabled
from synapse.api.auth.msc3861_delegated import MSC3861DelegatedAuth
Comment on lines +30 to +32
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good. This is backed up by

synapse/synapse/config/experimental.py

Lines 116 to 122 in 875269e

# Only allow enabling MSC3861 if authlib is installed
if value and not HAS_AUTHLIB:
raise ConfigError(
"MSC3861 is enabled but authlib is not installed. "
"Please install authlib to use MSC3861.",
("experimental", "msc3861", "enabled"),
)


DirectServeJsonResource.__init__(self, extract_context=True)
auth = hs.get_auth()
assert isinstance(auth, MSC3861DelegatedAuth)
Expand Down
Loading