Silverfish/proton-bridge
1
0
Fork 1
mirror of https://github.com/ProtonMail/proton-bridge.git synced 2025-12-15 14:56:42 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

GODT-1515: Do not crash when bridge users got disconnected.

Browse Source
This commit is contained in:
Jakub
2022-02-22 16:41:32 +01:00
parent aa8cc3fc4b
commit 63379001e3
5 changed files with 50 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
internal/users/user.go
View File

@ -345,6 +345,10 @@ func (u *User) GetAddressID(address string) (id string, err error) {
return u.store.GetAddressID(address)
}
if u.client == nil {
return "", errors.New("bridge account is not fully connected to server")
}
addresses := u.client.Addresses()
pmapiAddress := addresses.ByEmail(address)
if pmapiAddress != nil {
@ -473,7 +477,9 @@ func (u *User) Logout() error {
return nil
}
if err := u.client.AuthDelete(context.Background()); err != nil {
if u.client == nil {
u.log.Warn("Failed to delete auth: no client")
} else if err := u.client.AuthDelete(context.Background()); err != nil {
u.log.WithError(err).Warn("Failed to delete auth")
}