seang96/gmessages
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Improve handling of already-logged-in cases in provisioning API

Browse source
This commit is contained in:
Tulir Asokan 2024-03-28 14:14:31 +02:00
parent 205e6a9751
commit 825c8ff062
1 changed files with 17 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
provisioning.go
View file

@ -320,8 +320,23 @@ func (prov *ProvisioningAPI) GoogleLoginStart(w http.ResponseWriter, r *http.Req
log := hlog.FromRequest(r)
if user.IsLoggedIn() {
jsonResponse(w, http.StatusOK, LoginResponse{Status: "success", ErrCode: "already logged in"})
if user.IsLoggedIn() && user.switchedToGoogleLogin {
log.Info().Msg("Logging out before starting new Google login")
user.Logout(status.BridgeState{StateEvent: status.StateLoggedOut}, false)
} else if user.IsLoggedIn() {
log.Warn().Msg("User is already logged in, ignoring new login request")
if !user.phoneResponding {
jsonResponse(w, http.StatusConflict, LoginResponse{
Error: "You're already logged in, but the Google Messages app on your phone is not responding",
ErrCode: "already logged in",
})
} else {
jsonResponse(w, http.StatusConflict, LoginResponse{
Status: "success",
Error: "You're already logged in",
ErrCode: "already logged in",
})
}
return
}
var req ReqGoogleLoginStart