aboutsummaryrefslogtreecommitdiff
path: root/syncapi/sync
diff options
context:
space:
mode:
authorkegsay <kegan@matrix.org>2022-01-20 15:26:45 +0000
committerGitHub <noreply@github.com>2022-01-20 15:26:45 +0000
commitdb7d9cba8ad28c300dd66c01b9b0ce2414e8cbe0 (patch)
treead91c627b4ce44490bd484c53a23f343ee49041e /syncapi/sync
parent16035b97373849d74961e15616f3f1449f0a5abd (diff)
BREAKING: Remove Partitioned Stream Positions (#2096)
* go mod tidy * Break complement to check it fails CI * Remove partitioned stream positions This was used by the device list stream position. The device list position now corresponds to the `Offset`, and the partition is always 0, in prep for removing reliance on Kafka topics for device list changes. * Linting * Migrate old style tokens to new style because element-web doesn't soft-logoout on 4xx errors on /sync
Diffstat (limited to 'syncapi/sync')
-rw-r--r--syncapi/sync/requestpool.go6
1 files changed, 6 insertions, 0 deletions
diff --git a/syncapi/sync/requestpool.go b/syncapi/sync/requestpool.go
index a4573610..ca35951a 100644
--- a/syncapi/sync/requestpool.go
+++ b/syncapi/sync/requestpool.go
@@ -140,6 +140,12 @@ func (rp *RequestPool) OnIncomingSyncRequest(req *http.Request, device *userapi.
// Extract values from request
syncReq, err := newSyncRequest(req, *device, rp.db)
if err != nil {
+ if err == types.ErrMalformedSyncToken {
+ return util.JSONResponse{
+ Code: http.StatusBadRequest,
+ JSON: jsonerror.InvalidArgumentValue(err.Error()),
+ }
+ }
return util.JSONResponse{
Code: http.StatusBadRequest,
JSON: jsonerror.Unknown(err.Error()),