mirror/go-proton-api
1
0
Fork 0
mirror of https://github.com/ProtonMail/go-proton-api.git synced 2025-12-23 23:57:50 -05:00
Code Issues Packages Projects Releases Wiki Activity

fix(GODT-3106): Fix broken import route

Browse Source 
The original fixes to parse the HV error message unfortunately caused
those corrected error routes to start failing when tested against live
proton servers.

Since HV error parsing was improved in a subsequent patch, we no longer
needs the original fix and can therefore revert the changes that are
causing issues.
This commit is contained in:
Leander Beernaert
2023-11-06 10:18:07 +01:00
committed by LBeernaertProton
parent 77833c9854
commit 5f248dfc82
8 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
contact_types.go
View File

@@ -278,8 +278,8 @@ type CreateContactsReq struct {
} }
type CreateContactResp struct { type CreateContactResp struct {
Response APIError APIError
Contact Contact Contact Contact
} }
type CreateContactsRes struct { type CreateContactsRes struct {

2
helper_test.go
View File

@@ -53,6 +53,6 @@ func createTestMessages(t *testing.T, c *proton.Client, pass string, count int)
require.NoError(t, err) require.NoError(t, err)
for _, res := range res { for _, res := range res {
require.Equal(t, proton.SuccessCode, res.Response.Code) require.Equal(t, proton.SuccessCode, res.Code)
} }
} }

4
manager_report_types.go
View File

@@ -57,8 +57,8 @@ type ReportBugAttachmentReq struct {
} }
type ReportBugRes struct { type ReportBugRes struct {
Response APIError APIError
Token *string Token *string
} }
func (req ReportBugReq) toFormData() map[string]string { func (req ReportBugReq) toFormData() map[string]string {

4
message_import.go
View File

@@ -58,8 +58,8 @@ func (c *Client) ImportMessages(ctx context.Context, addrKR *crypto.KeyRing, wor
} }
for _, res := range res { for _, res := range res {
if res.Response.Code != SuccessCode { if res.Code != SuccessCode {
return nil, fmt.Errorf("failed to import message: %w", res.Response) return nil, fmt.Errorf("failed to import message: %w", res)
} }
} }

2
message_import_types.go
View File

@@ -26,7 +26,7 @@ type ImportMetadata struct {
} }
type ImportRes struct { type ImportRes struct {
Response APIError APIError
MessageID string MessageID string
} }

8
server/contacts.go
View File

@@ -71,7 +71,7 @@ func (s *Server) handlePostContacts() gin.HandlerFunc {
proton.CreateContactsRes{ proton.CreateContactsRes{
Index: i, Index: i,
Response: proton.CreateContactResp{ Response: proton.CreateContactResp{
Response: proton.APIError{Code: proton.InvalidValue, Message: err.Error()}, APIError: proton.APIError{Code: proton.InvalidValue, Message: err.Error()},
}, },
}) })
continue continue
@@ -83,7 +83,7 @@ func (s *Server) handlePostContacts() gin.HandlerFunc {
proton.CreateContactsRes{ proton.CreateContactsRes{
Index: i, Index: i,
Response: proton.CreateContactResp{ Response: proton.CreateContactResp{
Response: proton.APIError{Code: proton.InvalidValue, Message: err.Error()}, APIError: proton.APIError{Code: proton.InvalidValue, Message: err.Error()},
}, },
}) })
continue continue
@@ -94,7 +94,7 @@ func (s *Server) handlePostContacts() gin.HandlerFunc {
proton.CreateContactsRes{ proton.CreateContactsRes{
Index: i, Index: i,
Response: proton.CreateContactResp{ Response: proton.CreateContactResp{
Response: proton.APIError{Code: proton.InvalidValue, Message: err.Error()}, APIError: proton.APIError{Code: proton.InvalidValue, Message: err.Error()},
}, },
}) })
continue continue
@@ -103,7 +103,7 @@ func (s *Server) handlePostContacts() gin.HandlerFunc {
proton.CreateContactsRes{ proton.CreateContactsRes{
Index: i, Index: i,
Response: proton.CreateContactResp{ Response: proton.CreateContactResp{
Response: proton.APIError{Code: proton.SuccessCode}, APIError: proton.APIError{Code: proton.SuccessCode},
Contact: contact, Contact: contact,
}, },
}) })

4
server/messages.go
View File

@@ -297,14 +297,14 @@ func (s *Server) handlePutMailMessagesImport() gin.HandlerFunc {
) )
if err != nil { if err != nil {
res.Response = proton.ImportRes{ res.Response = proton.ImportRes{
Response: proton.APIError{ APIError: proton.APIError{
Code: proton.InvalidValue, Code: proton.InvalidValue,
Message: fmt.Sprintf("failed to import: %v", err), Message: fmt.Sprintf("failed to import: %v", err),
}, },
} }
} else { } else {
res.Response = proton.ImportRes{ res.Response = proton.ImportRes{
Response: proton.APIError{Code: proton.SuccessCode}, APIError: proton.APIError{Code: proton.SuccessCode},
MessageID: messageID, MessageID: messageID,
} }
} }

8
server/server_test.go
View File

@@ -1002,7 +1002,7 @@ func TestServer_Import(t *testing.T) {
res := importMessages(ctx, t, c, addr[0].ID, addrKRs[addr[0].ID], []string{}, proton.MessageFlagReceived, 1) res := importMessages(ctx, t, c, addr[0].ID, addrKRs[addr[0].ID], []string{}, proton.MessageFlagReceived, 1)
require.NoError(t, err) require.NoError(t, err)
require.Len(t, res, 1) require.Len(t, res, 1)
require.Equal(t, proton.SuccessCode, res[0].Response.Code) require.Equal(t, proton.SuccessCode, res[0].Code)
message, err := c.GetMessage(ctx, res[0].MessageID) message, err := c.GetMessage(ctx, res[0].MessageID)
require.NoError(t, err) require.NoError(t, err)
@@ -1052,7 +1052,7 @@ func TestServer_Import_Dedup(t *testing.T) {
) )
require.NoError(t, err) require.NoError(t, err)
require.Len(t, res, 1) require.Len(t, res, 1)
require.Equal(t, proton.SuccessCode, res[0].Response.Code) require.Equal(t, proton.SuccessCode, res[0].Code)
message, err := c.GetMessage(ctx, res[0].MessageID) message, err := c.GetMessage(ctx, res[0].MessageID)
require.NoError(t, err) require.NoError(t, err)
@@ -1075,7 +1075,7 @@ func TestServer_Import_Dedup(t *testing.T) {
) )
require.NoError(t, err) require.NoError(t, err)
require.Len(t, resDedup, 1) require.Len(t, resDedup, 1)
require.Equal(t, proton.SuccessCode, resDedup[0].Response.Code) require.Equal(t, proton.SuccessCode, resDedup[0].Code)
require.Equal(t, res[0].MessageID, resDedup[0].MessageID) require.Equal(t, res[0].MessageID, resDedup[0].MessageID)
}) })
}, WithMessageDedup()) }, WithMessageDedup())
@@ -1444,7 +1444,7 @@ func TestServer_Import_FlagsAndLabels(t *testing.T) {
require.Error(t, err) require.Error(t, err)
} else { } else {
require.NoError(t, err) require.NoError(t, err)
require.Equal(t, proton.SuccessCode, res[0].Response.Code) require.Equal(t, proton.SuccessCode, res[0].Code)
message, err := c.GetMessage(ctx, res[0].MessageID) message, err := c.GetMessage(ctx, res[0].MessageID)
require.NoError(t, err) require.NoError(t, err)