diff options
| author | Quentin Gliech <quenting@element.io> | 2023-03-24 16:09:39 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-03-24 11:09:39 -0400 |
| commit | 5b70f240cf70b390db7e74ab614ace108fc08d70 (patch) | |
| tree | ba3ec1ea343ef3957ffd2ee646b94e34573c4de0 /synapse/rest | |
| parent | Reject mentions on the C-S API which are invalid. (#15311) (diff) | |
| download | synapse-5b70f240cf70b390db7e74ab614ace108fc08d70.tar.xz | |
Make cleaning up pushers depend on the device_id instead of the token_id (#15280)
This makes it so that we rely on the `device_id` to delete pushers on logout, instead of relying on the `access_token_id`. This ensures we're not removing pushers on token refresh, and prepares for a world without access token IDs (also known as the OIDC). This actually runs the `set_device_id_for_pushers` background update, which was forgotten in #13831. Note that for backwards compatibility it still deletes pushers based on the `access_token` until the background update finishes.
Diffstat (limited to 'synapse/rest')
| -rw-r--r-- | synapse/rest/admin/users.py | 1 | ||||
| -rw-r--r-- | synapse/rest/client/pusher.py | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/synapse/rest/admin/users.py b/synapse/rest/admin/users.py index 281e8fd0ad..331f225116 100644 --- a/synapse/rest/admin/users.py +++ b/synapse/rest/admin/users.py @@ -425,7 +425,6 @@ class UserRestServletV2(RestServlet): ): await self.pusher_pool.add_or_update_pusher( user_id=user_id, - access_token=None, kind="email", app_id="m.email", app_display_name="Email Notifications", diff --git a/synapse/rest/client/pusher.py b/synapse/rest/client/pusher.py index 975eef2144..1a8f5292ac 100644 --- a/synapse/rest/client/pusher.py +++ b/synapse/rest/client/pusher.py @@ -126,7 +126,6 @@ class PushersSetRestServlet(RestServlet): try: await self.pusher_pool.add_or_update_pusher( user_id=user.to_string(), - access_token=requester.access_token_id, kind=content["kind"], app_id=content["app_id"], app_display_name=content["app_display_name"], |