sorb/ThreadNet-Web
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 4 Wiki Activity

expires_in -> expires_in_sec + docstring

Browse Source
This commit is contained in:
Andrew Morgan
2026-01-23 14:55:17 +00:00
parent e0304c627b
commit a4173bb1dd
2 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/restricted-guests/synapse/synapse_guest_module/guest_registration_servlet.py
+2 -2
View File
@@ -110,7 +110,7 @@ class GuestRegistrationServlet(DirectServeJsonResource):
# #
# If a user reaper is enabled, just have the token expire after # If a user reaper is enabled, just have the token expire after
# the configured period. # the configured period.
expires_in = ( expires_in_sec = (
self._config.user_expiration_seconds self._config.user_expiration_seconds
if self._config.enable_user_reaper if self._config.enable_user_reaper
else 0 else 0
@@ -119,7 +119,7 @@ class GuestRegistrationServlet(DirectServeJsonResource):
device_id, device_id,
access_token, access_token,
) = await self._mas_admin_client.create_personal_session( ) = await self._mas_admin_client.create_personal_session(
mas_user_id, expires_in mas_user_id, expires_in_sec
) )
logger.debug("Registered user '%s'", user_id) logger.debug("Registered user '%s'", user_id)
modules/restricted-guests/synapse/synapse_guest_module/mas_admin_client.py
+11 -4
View File
@@ -50,15 +50,24 @@ class MasAdminClient:
return mas_user_id return mas_user_id
async def create_personal_session( async def create_personal_session(
self, mas_user_id: str, expires_in: int self, mas_user_id: str, expires_in_sec: int
) -> tuple[str, str]: ) -> tuple[str, str]:
"""Creates a new personal session for the given MAS user.
Args:
mas_user_id: The MAS user ID.
expires_in_sec: The session expiration time in seconds.
Returns:
A tuple of (device_id, access_token).
"""
token = await self.request_admin_token() token = await self.request_admin_token()
url = self._build_admin_url("/api/admin/v1/personal-sessions") url = self._build_admin_url("/api/admin/v1/personal-sessions")
device_id = self._generate_device_id() device_id = self._generate_device_id()
request_body = { request_body = {
"actor_user_id": mas_user_id, "actor_user_id": mas_user_id,
"expires_in": expires_in, "expires_in": expires_in_sec,
"scope": f"openid urn:matrix:client:api:* urn:matrix:client:device:{device_id}", "scope": f"openid urn:matrix:client:api:* urn:matrix:client:device:{device_id}",
"human_name": "guest session", "human_name": "guest session",
} }
@@ -73,8 +82,6 @@ class MasAdminClient:
attributes = data.get("attributes", {}) if isinstance(data, dict) else {} attributes = data.get("attributes", {}) if isinstance(data, dict) else {}
access_token = attributes.get("access_token") access_token = attributes.get("access_token")
print(response)
if not isinstance(access_token, str) or len(access_token) == 0: if not isinstance(access_token, str) or len(access_token) == 0:
raise ValueError("MAS session response missing `access_token` field") raise ValueError("MAS session response missing `access_token` field")