From d82ee4f1acad29e48c16f697e220b89021564a6d Mon Sep 17 00:00:00 2001
From: Nick Mills-Barrett <nick@beeper.com>
Date: Wed, 25 May 2022 09:20:47 +0100
Subject: [PATCH 1/2] Add the `/account/whoami` endpoint to generic workers

---
 docs/workers.md               | 1 +
 synapse/app/generic_worker.py | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/docs/workers.md b/docs/workers.md
index 779069b8177f..45e7939f44e2 100644
--- a/docs/workers.md
+++ b/docs/workers.md
@@ -208,6 +208,7 @@ information.
     ^/_matrix/client/(v1|unstable/org.matrix.msc2946)/rooms/.*/hierarchy$
     ^/_matrix/client/unstable/im.nheko.summary/rooms/.*/summary$
     ^/_matrix/client/(r0|v3|unstable)/account/3pid$
+    ^/_matrix/client/(r0|v3|unstable)/account/whoami$
     ^/_matrix/client/(r0|v3|unstable)/devices$
     ^/_matrix/client/versions$
     ^/_matrix/client/(api/v1|r0|v3|unstable)/voip/turnServer$
diff --git a/synapse/app/generic_worker.py b/synapse/app/generic_worker.py
index 2a9480a5c161..39d9db8d989a 100644
--- a/synapse/app/generic_worker.py
+++ b/synapse/app/generic_worker.py
@@ -87,7 +87,7 @@
     voip,
 )
 from synapse.rest.client._base import client_patterns
-from synapse.rest.client.account import ThreepidRestServlet
+from synapse.rest.client.account import ThreepidRestServlet, WhoamiRestServlet
 from synapse.rest.client.devices import DevicesRestServlet
 from synapse.rest.client.keys import (
     KeyChangesServlet,
@@ -289,6 +289,7 @@ def _listen_http(self, listener_config: ListenerConfig) -> None:
                     RegistrationTokenValidityRestServlet(self).register(resource)
                     login.register_servlets(self, resource)
                     ThreepidRestServlet(self).register(resource)
+                    WhoamiRestServlet(self).register(resource)
                     DevicesRestServlet(self).register(resource)
 
                     # Read-only

From c6937b2073c269f0229f034c8e01ffb377d31a7f Mon Sep 17 00:00:00 2001
From: Nick Mills-Barrett <nick@beeper.com>
Date: Wed, 25 May 2022 09:24:05 +0100
Subject: [PATCH 2/2] Add changelog file

---
 changelog.d/12866.misc | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 changelog.d/12866.misc

diff --git a/changelog.d/12866.misc b/changelog.d/12866.misc
new file mode 100644
index 000000000000..3f7ef5925319
--- /dev/null
+++ b/changelog.d/12866.misc
@@ -0,0 +1 @@
+Enable the `/account/whoami` endpoint on synapse worker processes. Contributed by Nick @ Beeper.