feat: make store use ClientManager

test/fakeapi/attachments.go

@@ -45,3 +45,11 @@ func (api *FakePMAPI) CreateAttachment(attachment *pmapi.Attachment, data io.Rea
 	attachment.KeyPackets = base64.StdEncoding.EncodeToString(bytes)
 	return attachment, nil
 }
+
+func (api *FakePMAPI) DeleteAttachment(attachmentID string) error {
+	if err := api.checkAndRecordCall(GET, "/attachments/"+attachmentID, nil); err != nil {
+		return err
+	}
+
+	return nil
+}

test/fakeapi/auth.go

@@ -141,13 +141,23 @@ func (api *FakePMAPI) AuthRefresh(token string) (*pmapi.Auth, error) {
 	return auth, nil
 }
 
-func (api *FakePMAPI) Logout() error {
+func (api *FakePMAPI) Logout() {
+	_ = api.DeleteAuth()
+	api.ClearData()
+}
+
+func (api *FakePMAPI) DeleteAuth() error {
 	if err := api.checkAndRecordCall(DELETE, "/auth", nil); err != nil {
 		return err
 	}
+
 	// Logout will also emit change to auth channel
 	api.sendAuth(nil)
-	api.controller.deleteSession(api.uid)
-	api.unsetUser()
+
 	return nil
 }
+
+func (api *FakePMAPI) ClearData() {
+	api.controller.deleteSession(api.uid)
+	api.unsetUser()
+}

test/fakeapi/controller.go

@@ -44,8 +44,8 @@ type Controller struct {
 	log *logrus.Entry
 }
 
-func NewController() *Controller {
-	return &Controller{
+func NewController(cm *pmapi.ClientManager) (cntrl *Controller) {
+	cntrl = &Controller{
 		lock:               &sync.RWMutex{},
 		fakeAPIs:           []*FakePMAPI{},
 		calls:              []*fakeCall{},
@@ -62,10 +62,12 @@ func NewController() *Controller {
 
 		log: logrus.WithField("pkg", "fakeapi-controller"),
 	}
-}
 
-func (cntrl *Controller) GetClient(userID string) *FakePMAPI {
-	fakeAPI := New(cntrl)
-	cntrl.fakeAPIs = append(cntrl.fakeAPIs, fakeAPI)
-	return fakeAPI
+	cm.SetClientConstructor(func(userID string) pmapi.Client {
+		fakeAPI := New(cntrl)
+		cntrl.fakeAPIs = append(cntrl.fakeAPIs, fakeAPI)
+		return fakeAPI
+	})
+
+	return
 }

test/fakeapi/reports.go

@@ -42,3 +42,7 @@ func (api *FakePMAPI) SendSimpleMetric(category, action, label string) error {
 	v.Set("Label", label)
 	return api.checkInternetAndRecordCall(GET, "/metrics?"+v.Encode(), nil)
 }
+
+func (api *FakePMAPI) ReportSentryCrash(reportErr error) (err error) {
+	return nil
+}

test/fakeapi/user.go

@@ -50,6 +50,10 @@ func (api *FakePMAPI) UpdateUser() (*pmapi.User, error) {
 	return api.user, nil
 }
 
+func (api *FakePMAPI) GetAddresses() (pmapi.AddressList, error) {
+	return *api.addresses, nil
+}
+
 func (api *FakePMAPI) Addresses() pmapi.AddressList {
 	return *api.addresses
 }