feat: improve login flow

test/liveapi/controller.go

@@ -18,7 +18,9 @@
 package liveapi
 
 import (
+	"fmt"
 	"net/http"
+	"os"
 	"sync"
 
 	"github.com/ProtonMail/proton-bridge/pkg/pmapi"
@@ -30,31 +32,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(cm *pmapi.ClientManager) *Controller {
-	cntrl := &Controller{
+func NewController() *Controller {
+	return &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 {
-	return cntrl.clientManager.GetClient(userID)
+	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)
 }