tileradotorg/mautrix-whatsapp
1
0
Fork 0
forked from MirrorHub/mautrix-whatsapp
Code Pull requests Activity

Fix incorrect bridge state after logging out

Browse source
This commit is contained in:
Tulir Asokan 2021-10-29 22:03:00 +03:00
parent b9d918a1d1
commit 745dd1cd63
3 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
commands.go
View file

@ -626,6 +626,7 @@ func (handler *CommandHandler) CommandDisconnect(ce *CommandEvent) {
} }
ce.User.DeleteConnection() ce.User.DeleteConnection()
ce.Reply("Successfully disconnected. Use the `reconnect` command to reconnect.") ce.Reply("Successfully disconnected. Use the `reconnect` command to reconnect.")
ce.User.sendBridgeState(BridgeState{StateEvent: StateBadCredentials, Error: WANotConnected})
} }
const cmdPingHelp = `ping - Check your connection to WhatsApp.` const cmdPingHelp = `ping - Check your connection to WhatsApp.`

5
provisioning.go
View file

@ -134,6 +134,7 @@ func (prov *ProvisioningAPI) DeleteSession(w http.ResponseWriter, r *http.Reques
user.DeleteConnection() user.DeleteConnection()
user.DeleteSession() user.DeleteSession()
jsonResponse(w, http.StatusOK, Response{true, "Session information purged"}) jsonResponse(w, http.StatusOK, Response{true, "Session information purged"})
user.removeFromJIDMap(StateLoggedOut)
} }
func (prov *ProvisioningAPI) Disconnect(w http.ResponseWriter, r *http.Request) { func (prov *ProvisioningAPI) Disconnect(w http.ResponseWriter, r *http.Request) {
@ -147,6 +148,7 @@ func (prov *ProvisioningAPI) Disconnect(w http.ResponseWriter, r *http.Request)
} }
user.DeleteConnection() user.DeleteConnection()
jsonResponse(w, http.StatusOK, Response{true, "Disconnected from WhatsApp"}) jsonResponse(w, http.StatusOK, Response{true, "Disconnected from WhatsApp"})
user.sendBridgeState(BridgeState{StateEvent: StateBadCredentials, Error: WANotConnected})
} }
func (prov *ProvisioningAPI) Reconnect(w http.ResponseWriter, r *http.Request) { func (prov *ProvisioningAPI) Reconnect(w http.ResponseWriter, r *http.Request) {
@ -163,6 +165,7 @@ func (prov *ProvisioningAPI) Reconnect(w http.ResponseWriter, r *http.Request) {
} }
} else { } else {
user.DeleteConnection() user.DeleteConnection()
user.sendBridgeState(BridgeState{StateEvent: StateTransientDisconnect, Error: WANotConnected})
user.Connect() user.Connect()
jsonResponse(w, http.StatusAccepted, Response{true, "Restarted connection to WhatsApp"}) jsonResponse(w, http.StatusAccepted, Response{true, "Restarted connection to WhatsApp"})
} }
@ -230,6 +233,8 @@ func (prov *ProvisioningAPI) Logout(w http.ResponseWriter, r *http.Request) {
}) })
return return
} }
} else {
user.Session = nil
} }
user.DeleteConnection() user.DeleteConnection()
} }

1
user.go
View file

@ -273,7 +273,6 @@ func (user *User) DeleteConnection() {
user.connLock.Lock() user.connLock.Lock()
defer user.connLock.Unlock() defer user.connLock.Unlock()
user.unlockedDeleteConnection() user.unlockedDeleteConnection()
user.sendBridgeState(BridgeState{StateEvent: StateBadCredentials, Error: WANotConnected})
} }
func (user *User) HasSession() bool { func (user *User) HasSession() bool {