Skip to content

Commit 0ed1c64

Browse files
authored
Fix /versions requests (#17410)
We need it to work on workers and allow guest access. Broke by #17392
1 parent 1353fb3 commit 0ed1c64

File tree

3 files changed

+11
-1
lines changed

3 files changed

+11
-1
lines changed

changelog.d/17410.misc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Finish up work to allow per-user feature flags.

synapse/app/generic_worker.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,9 @@
7474
EventPushActionsWorkerStore,
7575
)
7676
from synapse.storage.databases.main.events_worker import EventsWorkerStore
77+
from synapse.storage.databases.main.experimental_features import (
78+
ExperimentalFeaturesStore,
79+
)
7780
from synapse.storage.databases.main.filtering import FilteringWorkerStore
7881
from synapse.storage.databases.main.keys import KeyStore
7982
from synapse.storage.databases.main.lock import LockStore
@@ -155,6 +158,7 @@ class GenericWorkerStore(
155158
LockStore,
156159
SessionStore,
157160
TaskSchedulerWorkerStore,
161+
ExperimentalFeaturesStore,
158162
):
159163
# Properties that multiple storage classes define. Tell mypy what the
160164
# expected type is.

synapse/rest/client/versions.py

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,12 @@ async def on_GET(self, request: SynapseRequest) -> Tuple[int, JsonDict]:
6666
msc3881_enabled = self.config.experimental.msc3881_enabled
6767

6868
if self.auth.has_access_token(request):
69-
requester = await self.auth.get_user_by_req(request)
69+
requester = await self.auth.get_user_by_req(
70+
request,
71+
allow_guest=True,
72+
allow_locked=True,
73+
allow_expired=True,
74+
)
7075
user_id = requester.user.to_string()
7176

7277
msc3881_enabled = await self.store.is_feature_enabled(

0 commit comments

Comments
 (0)