yesBad/proton-bridge
1
0
Fork 0
forked from Silverfish/proton-bridge
Code Actions Activity

Update routes to API v4

Browse Source
This commit is contained in:
Michal Horejsek
2020-08-27 10:13:28 +02:00
parent af89931f05
commit 9218598140
19 changed files with 41 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
test/api_checks_test.go
View File

@ -43,11 +43,11 @@ func apiIsCalledWith(endpoint string, data *gherkin.DocString) error {
}
func messageIsSentWithAPICall(data *gherkin.DocString) error {
endpoint := "POST /messages"
endpoint := "POST /mail/v4/messages"
if err := apiIsCalledWith(endpoint, data); err != nil {
return err
}
for _, request := range ctx.GetPMAPIController().GetCalls("POST", "/messages") {
for _, request := range ctx.GetPMAPIController().GetCalls("POST", "/mail/v4/messages") {
if !checkAllRequiredFieldsForSendingMessage(request) {
return fmt.Errorf("%s was not called with all required fields: %s", endpoint, request)
}

6
test/fakeapi/attachments.go
View File

@ -27,7 +27,7 @@ import (
)
func (api *FakePMAPI) GetAttachment(attachmentID string) (io.ReadCloser, error) {
if err := api.checkAndRecordCall(GET, "/attachments/"+attachmentID, nil); err != nil {
if err := api.checkAndRecordCall(GET, "/mail/v4/attachments/"+attachmentID, nil); err != nil {
return nil, err
}
data := strings.NewReader("data")
@ -35,7 +35,7 @@ func (api *FakePMAPI) GetAttachment(attachmentID string) (io.ReadCloser, error)
}
func (api *FakePMAPI) CreateAttachment(attachment *pmapi.Attachment, data io.Reader, signature io.Reader) (*pmapi.Attachment, error) {
if err := api.checkAndRecordCall(POST, "/attachments", nil); err != nil {
if err := api.checkAndRecordCall(POST, "/mail/v4/attachments", nil); err != nil {
return nil, err
}
bytes, err := ioutil.ReadAll(data)
@ -47,7 +47,7 @@ func (api *FakePMAPI) CreateAttachment(attachment *pmapi.Attachment, data io.Rea
}
func (api *FakePMAPI) DeleteAttachment(attID string) error {
if err := api.checkAndRecordCall(DELETE, "/attachments/"+attID, nil); err != nil {
if err := api.checkAndRecordCall(DELETE, "/mail/v4/attachments/"+attID, nil); err != nil {
return err
}
return nil

2
test/fakeapi/counts.go
View File

@ -20,7 +20,7 @@ package fakeapi
import "github.com/ProtonMail/proton-bridge/pkg/pmapi"
func (api *FakePMAPI) CountMessages(addressID string) ([]*pmapi.MessagesCount, error) {
if err := api.checkAndRecordCall(GET, "/messages/count?AddressID="+addressID, nil); err != nil {
if err := api.checkAndRecordCall(GET, "/mail/v4/messages/count?AddressID="+addressID, nil); err != nil {
return nil, err
}
return api.getCounts(addressID), nil

20
test/fakeapi/messages.go
View File

@ -30,7 +30,7 @@ import (
var errWasNotUpdated = errors.New("message was not updated")
func (api *FakePMAPI) GetMessage(apiID string) (*pmapi.Message, error) {
if err := api.checkAndRecordCall(GET, "/messages/"+apiID, nil); err != nil {
if err := api.checkAndRecordCall(GET, "/mail/v4/messages/"+apiID, nil); err != nil {
return nil, err
}
for _, message := range api.messages {
@ -50,7 +50,7 @@ func (api *FakePMAPI) GetMessage(apiID string) (*pmapi.Message, error) {
// * Attachments
// * AutoWildcard
func (api *FakePMAPI) ListMessages(filter *pmapi.MessagesFilter) ([]*pmapi.Message, int, error) {
if err := api.checkAndRecordCall(GET, "/messages", filter); err != nil {
if err := api.checkAndRecordCall(GET, "/mail/v4/messages", filter); err != nil {
return nil, 0, err
}
pageSize := filter.PageSize
@ -151,7 +151,7 @@ func copyFilteredMessage(message *pmapi.Message) *pmapi.Message {
}
func (api *FakePMAPI) CreateDraft(message *pmapi.Message, parentID string, action int) (*pmapi.Message, error) {
if err := api.checkAndRecordCall(POST, "/messages", &pmapi.DraftReq{
if err := api.checkAndRecordCall(POST, "/mail/v4/messages", &pmapi.DraftReq{
Message: message,
ParentID: parentID,
Action: action,
@ -175,7 +175,7 @@ func (api *FakePMAPI) CreateDraft(message *pmapi.Message, parentID string, actio
}
func (api *FakePMAPI) SendMessage(messageID string, sendMessageRequest *pmapi.SendMessageReq) (sent, parent *pmapi.Message, err error) {
if err := api.checkAndRecordCall(POST, "/messages/"+messageID, sendMessageRequest); err != nil {
if err := api.checkAndRecordCall(POST, "/mail/v4/messages/"+messageID, sendMessageRequest); err != nil {
return nil, nil, err
}
message, err := api.GetMessage(messageID)
@ -225,7 +225,7 @@ func (api *FakePMAPI) addMessage(message *pmapi.Message) {
}
func (api *FakePMAPI) DeleteMessages(apiIDs []string) error {
err := api.deleteMessages(PUT, "/messages/delete", &pmapi.MessagesActionReq{
err := api.deleteMessages(PUT, "/mail/v4/messages/delete", &pmapi.MessagesActionReq{
IDs: apiIDs,
}, func(message *pmapi.Message) bool {
return hasItem(apiIDs, message.ID)
@ -242,7 +242,7 @@ func (api *FakePMAPI) DeleteMessages(apiIDs []string) error {
}
func (api *FakePMAPI) EmptyFolder(labelID string, addressID string) error {
err := api.deleteMessages(DELETE, "/messages/empty?LabelID="+labelID+"&AddressID="+addressID, nil, func(message *pmapi.Message) bool {
err := api.deleteMessages(DELETE, "/mail/v4/messages/empty?LabelID="+labelID+"&AddressID="+addressID, nil, func(message *pmapi.Message) bool {
return hasItem(message.LabelIDs, labelID) && message.AddressID == addressID
})
if err != nil {
@ -277,7 +277,7 @@ func (api *FakePMAPI) deleteMessages(method method, path string, request interfa
}
func (api *FakePMAPI) LabelMessages(apiIDs []string, labelID string) error {
return api.updateMessages(PUT, "/messages/label", &pmapi.LabelMessagesReq{
return api.updateMessages(PUT, "/mail/v4/messages/label", &pmapi.LabelMessagesReq{
IDs: apiIDs,
LabelID: labelID,
}, apiIDs, func(message *pmapi.Message) error {
@ -303,7 +303,7 @@ func (api *FakePMAPI) LabelMessages(apiIDs []string, labelID string) error {
}
func (api *FakePMAPI) UnlabelMessages(apiIDs []string, labelID string) error {
return api.updateMessages(PUT, "/messages/unlabel", &pmapi.LabelMessagesReq{
return api.updateMessages(PUT, "/mail/v4/messages/unlabel", &pmapi.LabelMessagesReq{
IDs: apiIDs,
LabelID: labelID,
}, apiIDs, func(message *pmapi.Message) error {
@ -321,7 +321,7 @@ func (api *FakePMAPI) UnlabelMessages(apiIDs []string, labelID string) error {
}
func (api *FakePMAPI) MarkMessagesRead(apiIDs []string) error {
return api.updateMessages(PUT, "/messages/read", &pmapi.MessagesActionReq{
return api.updateMessages(PUT, "/mail/v4/messages/read", &pmapi.MessagesActionReq{
IDs: apiIDs,
}, apiIDs, func(message *pmapi.Message) error {
if message.Unread == 0 {
@ -333,7 +333,7 @@ func (api *FakePMAPI) MarkMessagesRead(apiIDs []string) error {
}
func (api *FakePMAPI) MarkMessagesUnread(apiIDs []string) error {
err := api.updateMessages(PUT, "/messages/unread", &pmapi.MessagesActionReq{
err := api.updateMessages(PUT, "/mail/v4/messages/unread", &pmapi.MessagesActionReq{
IDs: apiIDs,
}, apiIDs, func(message *pmapi.Message) error {
if message.Unread == 1 {

2
test/fakeapi/user.go
View File

@ -23,7 +23,7 @@ import (
)
func (api *FakePMAPI) GetMailSettings() (pmapi.MailSettings, error) {
if err := api.checkAndRecordCall(GET, "/settings/mail", nil); err != nil {
if err := api.checkAndRecordCall(GET, "/mail/v4/settings", nil); err != nil {
return pmapi.MailSettings{}, err
}
return pmapi.MailSettings{}, nil