Other: Bridge James 1.8.3

Changelog.md

@@ -2,6 +2,24 @@
 
 Changelog [format](http://keepachangelog.com/en/1.0.0/)
 
+## [Bridge 1.8.3] James
+
+### Fixed
+* GODT-1182: Use correct contact route.
+
+
+## [Bridge 1.8.2] James
+
+### Fixed
+* GODT-1175: Bug reporting.
+
+
+## [Bridge 1.8.1] James
+
+### Fixed
+* GODT-1165: Handle UID FETCH with sequence range of empty mailbox.
+
+
 ## [Bridge 1.8.0] James
 
 ### Added

Makefile

@@ -10,7 +10,7 @@ TARGET_OS?=${GOOS}
 .PHONY: build build-ie build-nogui build-ie-nogui build-launcher build-launcher-ie  versioner hasher
 
 # Keep version hardcoded so app build works also without Git repository.
-BRIDGE_APP_VERSION?=1.8.0+git
+BRIDGE_APP_VERSION?=1.8.3+git
 IE_APP_VERSION?=1.3.3+git
 APP_VERSION:=${BRIDGE_APP_VERSION}
 SRC_ICO:=logo.ico

pkg/pmapi/contacts.go

@@ -136,7 +136,7 @@ func (c *client) GetContactEmailByEmail(ctx context.Context, email string, page
 		if pageSize != 0 {
 			r.SetQueryParam("PageSize", strconv.Itoa(pageSize))
 		}
-		return r.SetResult(&res).Get("/contacts/v4")
+		return r.SetResult(&res).Get("/contacts/v4/emails")
 	}); err != nil {
 		return nil, err
 	}

pkg/pmapi/manager_report.go

@@ -27,17 +27,23 @@ func (m *manager) ReportBug(ctx context.Context, rep ReportBugReq) error {
 		rep.ClientType = EmailClientType
 	}
 
-	r := m.r(ctx)
-	if len(rep.Attachments) == 0 {
-		r = r.SetBody(rep)
-	} else {
-		r = r.SetMultipartFormData(rep.GetMultipartFormData())
-		for _, att := range rep.Attachments {
-			r = r.SetMultipartField(att.name, att.filename, "application/octet-stream", att.body)
-		}
+	if rep.Client == "" {
+		rep.Client = m.cfg.GetUserAgent()
 	}
+
+	if rep.ClientVersion == "" {
+		rep.ClientVersion = m.cfg.AppVersion
+	}
+
+	r := m.r(ctx).SetMultipartFormData(rep.GetMultipartFormData())
+
+	for _, att := range rep.Attachments {
+		r = r.SetMultipartField(att.name, att.filename, "application/octet-stream", att.body)
+	}
+
 	if _, err := wrapNoConnection(r.Post("/reports/bug")); err != nil {
 		return err
 	}
+
 	return nil
 }

pkg/pmapi/manager_report_test.go

@@ -19,7 +19,6 @@ package pmapi
 
 import (
 	"context"
-	"encoding/json"
 	"fmt"
 	"io/ioutil"
 	"net/http"
@@ -85,22 +84,3 @@ func TestClient_BugReportWithAttachment(t *testing.T) {
 	err := cm.ReportBug(context.Background(), rep)
 	r.NoError(t, err)
 }
-
-func TestClient_BugReport(t *testing.T) {
-	s := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, req *http.Request) {
-		r.NoError(t, checkMethodAndPath(req, "POST", "/reports/bug"))
-
-		var bugsReportReq ReportBugReq
-		r.NoError(t, json.NewDecoder(req.Body).Decode(&bugsReportReq))
-		r.Equal(t, testBugReportReq, bugsReportReq)
-
-		w.Header().Set("Content-Type", "application/json")
-		fmt.Fprint(w, testBugsBody)
-	}))
-	defer s.Close()
-
-	cm := newManager(newTestConfig(s.URL))
-
-	err := cm.ReportBug(context.Background(), testBugReportReq)
-	r.NoError(t, err)
-}

test/features/bridge/no_internet.feature

@@ -9,6 +9,7 @@ Feature: Servers are closed when no internet
     Then IMAP client "i1" is logged out
     And SMTP client "s1" is logged out
     Given the internet connection is restored
+    And 1 second pass
     And there is IMAP client "i2" logged in as "user"
     And there is SMTP client "s2" logged in as "user"
     When IMAP client "i2" gets info of "INBOX"
@@ -20,6 +21,7 @@ Feature: Servers are closed when no internet
     Then IMAP client "i2" is logged out
     And SMTP client "s2" is logged out
     Given the internet connection is restored
+    And 1 second pass
     And there is IMAP client "i3" logged in as "user"
     And there is SMTP client "s3" logged in as "user"
     When IMAP client "i3" gets info of "INBOX"