Silverfish/proton-bridge
1
0
Fork 1
mirror of https://github.com/ProtonMail/proton-bridge.git synced 2026-02-04 08:18:34 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix: better error messages for 422

Browse Source
This commit is contained in:
James Houlahan
2020-04-21 13:13:02 +02:00
parent 68d1442a8f
commit 76b480298a
3 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
internal/store/event_loop.go
View File

@ -431,7 +431,7 @@ func (loop *eventLoop) processMessages(eventLog *logrus.Entry, messages []*pmapi
msgLog.WithError(err).Warning("Message was not present in DB. Trying fetch...") msgLog.WithError(err).Warning("Message was not present in DB. Trying fetch...")
if msg, err = loop.apiClient.GetMessage(message.ID); err != nil { if msg, err = loop.apiClient.GetMessage(message.ID); err != nil {
if err == pmapi.ErrNoSuchAPIID { if _, ok := err.(*pmapi.ErrUnprocessableEntity); ok {
msgLog.WithError(err).Warn("Skipping message update because message exists neither in local DB nor on API") msgLog.WithError(err).Warn("Skipping message update because message exists neither in local DB nor on API")
err = nil err = nil
continue continue

10
pkg/pmapi/client.go
View File

@ -56,10 +56,16 @@ var (
ErrInvalidToken = errors.New("refresh token invalid") ErrInvalidToken = errors.New("refresh token invalid")
ErrAPINotReachable = errors.New("cannot reach the server") ErrAPINotReachable = errors.New("cannot reach the server")
ErrUpgradeApplication = errors.New("application upgrade required") ErrUpgradeApplication = errors.New("application upgrade required")
ErrNoSuchAPIID = errors.New("no such API ID")
) )
type ErrUnprocessableEntity struct {
error
}
func (err *ErrUnprocessableEntity) Error() string {
return err.error.Error()
}
type ErrUnauthorized struct { type ErrUnauthorized struct {
error error
} }

8
pkg/pmapi/res.go
View File

@ -17,7 +17,11 @@
package pmapi package pmapi
import "net/http" import (
"net/http"
"github.com/pkg/errors"
)
// Common response codes. // Common response codes.
const ( const (
@ -38,7 +42,7 @@ type Res struct {
// Err returns error if the response is an error. Otherwise, returns nil. // Err returns error if the response is an error. Otherwise, returns nil.
func (res Res) Err() error { func (res Res) Err() error {
if res.StatusCode == http.StatusUnprocessableEntity { if res.StatusCode == http.StatusUnprocessableEntity {
return ErrNoSuchAPIID return &ErrUnprocessableEntity{errors.New(res.Error)}
} }
if res.ResError == nil { if res.ResError == nil {