Skip to content
Snippets Groups Projects
Unverified Commit 0ed1c64c authored by Erik Johnston's avatar Erik Johnston Committed by GitHub
Browse files

Fix `/versions` requests (#17410)

We need it to work on workers and allow guest access.

Broke by #17392
parent 1353fb33
No related branches found
Tags v1.1.0rc1
No related merge requests found
Finish up work to allow per-user feature flags.
...@@ -74,6 +74,9 @@ from synapse.storage.databases.main.event_push_actions import ( ...@@ -74,6 +74,9 @@ from synapse.storage.databases.main.event_push_actions import (
EventPushActionsWorkerStore, EventPushActionsWorkerStore,
) )
from synapse.storage.databases.main.events_worker import EventsWorkerStore from synapse.storage.databases.main.events_worker import EventsWorkerStore
from synapse.storage.databases.main.experimental_features import (
ExperimentalFeaturesStore,
)
from synapse.storage.databases.main.filtering import FilteringWorkerStore from synapse.storage.databases.main.filtering import FilteringWorkerStore
from synapse.storage.databases.main.keys import KeyStore from synapse.storage.databases.main.keys import KeyStore
from synapse.storage.databases.main.lock import LockStore from synapse.storage.databases.main.lock import LockStore
...@@ -155,6 +158,7 @@ class GenericWorkerStore( ...@@ -155,6 +158,7 @@ class GenericWorkerStore(
LockStore, LockStore,
SessionStore, SessionStore,
TaskSchedulerWorkerStore, TaskSchedulerWorkerStore,
ExperimentalFeaturesStore,
): ):
# Properties that multiple storage classes define. Tell mypy what the # Properties that multiple storage classes define. Tell mypy what the
# expected type is. # expected type is.
......
...@@ -66,7 +66,12 @@ class VersionsRestServlet(RestServlet): ...@@ -66,7 +66,12 @@ class VersionsRestServlet(RestServlet):
msc3881_enabled = self.config.experimental.msc3881_enabled msc3881_enabled = self.config.experimental.msc3881_enabled
if self.auth.has_access_token(request): if self.auth.has_access_token(request):
requester = await self.auth.get_user_by_req(request) requester = await self.auth.get_user_by_req(
request,
allow_guest=True,
allow_locked=True,
allow_expired=True,
)
user_id = requester.user.to_string() user_id = requester.user.to_string()
msc3881_enabled = await self.store.is_feature_enabled( msc3881_enabled = await self.store.is_feature_enabled(
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment