feat: implement token expiration watcher

test/liveapi/controller.go

@@ -18,9 +18,7 @@
 package liveapi
 
 import (
-	"fmt"
 	"net/http"
-	"os"
 	"sync"
 
 	"github.com/ProtonMail/proton-bridge/pkg/pmapi"
@@ -32,31 +30,31 @@ type Controller struct {
 	calls                []*fakeCall
 	pmapiByUsername      map[string]*pmapi.Client
 	messageIDsByUsername map[string][]string
+	clientManager        *pmapi.ClientManager
 
 	// State controlled by test.
 	noInternetConnection bool
 }
 
-func NewController() *Controller {
-	return &Controller{
+func NewController(cm *pmapi.ClientManager) *Controller {
+	cntrl := &Controller{
 		lock:                 &sync.RWMutex{},
 		calls:                []*fakeCall{},
 		pmapiByUsername:      map[string]*pmapi.Client{},
 		messageIDsByUsername: map[string][]string{},
+		clientManager:        cm,
 
 		noInternetConnection: false,
 	}
+
+	cntrl.clientManager.SetClientRoundTripper(&fakeTransport{
+		cntrl:     cntrl,
+		transport: http.DefaultTransport,
+	})
+
+	return cntrl
 }
 
 func (cntrl *Controller) GetClient(userID string) *pmapi.Client {
-	cfg := &pmapi.ClientConfig{
-		AppVersion: fmt.Sprintf("Bridge_%s", os.Getenv("VERSION")),
-		ClientID:   "bridge-test",
-		Transport: &fakeTransport{
-			cntrl:     cntrl,
-			transport: http.DefaultTransport,
-		},
-		TokenManager: pmapi.NewTokenManager(),
-	}
-	return pmapi.NewClient(cfg, userID)
+	return cntrl.clientManager.GetClient(userID)
 }

test/liveapi/users.go

@@ -18,9 +18,6 @@
 package liveapi
 
 import (
-	"fmt"
-	"os"
-
 	"github.com/ProtonMail/proton-bridge/pkg/pmapi"
 	"github.com/cucumber/godog"
 	"github.com/pkg/errors"
@@ -31,11 +28,7 @@ func (cntrl *Controller) AddUser(user *pmapi.User, addresses *pmapi.AddressList,
 		return godog.ErrPending
 	}
 
-	client := pmapi.NewClient(&pmapi.ClientConfig{
-		AppVersion:   fmt.Sprintf("Bridge_%s", os.Getenv("VERSION")),
-		ClientID:     "bridge-cntrl",
-		TokenManager: pmapi.NewTokenManager(),
-	}, user.ID)
+	client := cntrl.GetClient(user.ID)
 
 	authInfo, err := client.AuthInfo(user.Name)
 	if err != nil {
@@ -62,5 +55,6 @@ func (cntrl *Controller) AddUser(user *pmapi.User, addresses *pmapi.AddressList,
 	}
 
 	cntrl.pmapiByUsername[user.Name] = client
+
 	return nil
 }