From 8b39175b76738c44ea4b0c765f738056b5cbc667 Mon Sep 17 00:00:00 2001 From: Tulir Asokan Date: Fri, 29 Apr 2022 22:04:28 +0300 Subject: [PATCH] Drop support for appservice login with unstable prefix --- crypto.go | 6 ++---- go.mod | 2 +- go.sum | 4 ++-- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/crypto.go b/crypto.go index 02bda51..b43231c 100644 --- a/crypto.go +++ b/crypto.go @@ -133,16 +133,14 @@ func (helper *CryptoHelper) loginBot() (*mautrix.Client, error) { flows, err := client.GetLoginFlows() if err != nil { return nil, fmt.Errorf("failed to get supported login flows: %w", err) - } - flow := flows.FirstFlowOfType(mautrix.AuthTypeAppservice, mautrix.AuthTypeHalfyAppservice) - if flow == nil { + } else if !flows.HasFlow(mautrix.AuthTypeAppservice) { return nil, fmt.Errorf("homeserver does not support appservice login") } // We set the API token to the AS token here to authenticate the appservice login // It'll get overridden after the login client.AccessToken = helper.bridge.AS.Registration.AppToken resp, err := client.Login(&mautrix.ReqLogin{ - Type: flow.Type, + Type: mautrix.AuthTypeAppservice, Identifier: mautrix.UserIdentifier{Type: mautrix.IdentifierTypeUser, User: string(helper.bridge.AS.BotMXID())}, DeviceID: deviceID, InitialDeviceDisplayName: "WhatsApp Bridge", diff --git a/go.mod b/go.mod index ec64e9d..4ac21d5 100644 --- a/go.mod +++ b/go.mod @@ -17,7 +17,7 @@ require ( gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b maunium.net/go/mauflag v1.0.0 maunium.net/go/maulogger/v2 v2.3.2 - maunium.net/go/mautrix v0.10.13-0.20220429121644-4db0cd5f4c09 + maunium.net/go/mautrix v0.10.13-0.20220429190332-58e10ec2ac33 ) require ( diff --git a/go.sum b/go.sum index 66e218c..ab6908c 100644 --- a/go.sum +++ b/go.sum @@ -197,5 +197,5 @@ maunium.net/go/mauflag v1.0.0 h1:YiaRc0tEI3toYtJMRIfjP+jklH45uDHtT80nUamyD4M= maunium.net/go/mauflag v1.0.0/go.mod h1:nLivPOpTpHnpzEh8jEdSL9UqO9+/KBJFmNRlwKfkPeA= maunium.net/go/maulogger/v2 v2.3.2 h1:1XmIYmMd3PoQfp9J+PaHhpt80zpfmMqaShzUTC7FwY0= maunium.net/go/maulogger/v2 v2.3.2/go.mod h1:TYWy7wKwz/tIXTpsx8G3mZseIRiC5DoMxSZazOHy68A= -maunium.net/go/mautrix v0.10.13-0.20220429121644-4db0cd5f4c09 h1:wZeeldiN1mf70SYeXVRPzXrVK3jfV9VGDUnT+lQulHY= -maunium.net/go/mautrix v0.10.13-0.20220429121644-4db0cd5f4c09/go.mod h1:lm1eZygpN3wlLyexPh+Z56DEvOuC4tY5/JacJWr+/AE= +maunium.net/go/mautrix v0.10.13-0.20220429190332-58e10ec2ac33 h1:5Xut2Xx/aqVGIhPAa6EtyLm9RVJLutwtp0rZO1KUuxI= +maunium.net/go/mautrix v0.10.13-0.20220429190332-58e10ec2ac33/go.mod h1:lm1eZygpN3wlLyexPh+Z56DEvOuC4tY5/JacJWr+/AE=