fix: after switch account first time download report error

Author: qinyuhang

cmd/common.go

@@ -52,11 +52,30 @@ func newLogger(format OutputFormat, verbose bool) log.Logger {
 	)
 }
 
+type persistentCookieJar struct {
+	*cookiejar.Jar
+	path string
+}
+
+func (j *persistentCookieJar) Reset() error {
+	if err := os.Remove(j.path); err != nil && !os.IsNotExist(err) {
+		return fmt.Errorf("failed to remove cookie jar file: %w", err)
+	}
+
+	jar, err := cookiejar.New(&cookiejar.Options{Filename: j.path})
+	if err != nil {
+		return fmt.Errorf("failed to create cookie jar: %w", err)
+	}
+
+	j.Jar = jar
+	return nil
+}
+
 // newCookieJar returns a new cookie jar instance.
 func newCookieJar(machine machine.Machine) http.CookieJar {
-	return util.Must(cookiejar.New(&cookiejar.Options{
-		Filename: filepath.Join(machine.HomeDirectory(), ConfigDirectoryName, CookieJarFileName),
-	}))
+	path := filepath.Join(machine.HomeDirectory(), ConfigDirectoryName, CookieJarFileName)
+	jar := util.Must(cookiejar.New(&cookiejar.Options{Filename: path}))
+	return &persistentCookieJar{Jar: jar, path: path}
 }
 
 // newKeychain returns a new keychain instance.

pkg/appstore/appstore.go

@@ -46,6 +46,7 @@ type appstore struct {
 	platformClient http.Client[platformVersionLookupResult]
 	bagClient      http.Client[bagResult]
 	httpClient     http.Client[interface{}]
+	cookieJar      http.CookieJar
 	machine        machine.Machine
 	os             operatingsystem.OperatingSystem
 }
@@ -71,6 +72,7 @@ func NewAppStore(args Args) AppStore {
 		platformClient: http.NewClient[platformVersionLookupResult](clientArgs),
 		bagClient:      http.NewClient[bagResult](clientArgs),
 		httpClient:     http.NewClient[interface{}](clientArgs),
+		cookieJar:      args.CookieJar,
 		machine:        args.Machine,
 		os:             args.OperatingSystem,
 	}

pkg/appstore/appstore_account_info.go

@@ -134,6 +134,12 @@ func (t *appstore) SwitchAccount(email string) (Account, error) {
 
 	accountStorage.Current = email
 
+	if t.cookieJar != nil {
+		if err := t.cookieJar.Reset(); err != nil {
+			return Account{}, fmt.Errorf("failed to reset account cookies: %w", err)
+		}
+	}
+
 	rootData, err := json.Marshal(accountStorage)
 	if err != nil {
 		return Account{}, fmt.Errorf("failed to marshal json: %w", err)

pkg/appstore/appstore_account_info_test.go

@@ -4,6 +4,7 @@ import (
 	"encoding/json"
 	"errors"
 
+	"github.com/majd/ipatool/v2/pkg/http"
 	"github.com/majd/ipatool/v2/pkg/keychain"
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
@@ -74,6 +75,44 @@ var _ = Describe("AppStore (AccountInfo)", func() {
 		})
 	})
 
+	When("switching accounts", func() {
+		var mockCookieJar *http.MockCookieJar
+
+		BeforeEach(func() {
+			mockCookieJar = http.NewMockCookieJar(ctrl)
+			appstore = NewAppStore(Args{
+				Keychain:  mockKeychain,
+				CookieJar: mockCookieJar,
+			})
+
+			accountStorage := AccountStorage{
+				Current: testEmail,
+				Accounts: []Account{
+					{Email: testEmail, Name: testName},
+					{Email: "other@example.com", Name: "Other"},
+				},
+			}
+			storageData, err := json.Marshal(accountStorage)
+			Expect(err).ToNot(HaveOccurred())
+
+			mockKeychain.EXPECT().
+				Get(AccountKey).
+				Return(storageData, nil).
+				AnyTimes()
+			mockKeychain.EXPECT().
+				Set(AccountKey, gomock.Any()).
+				Return(nil)
+			mockCookieJar.EXPECT().
+				Reset().
+				Return(nil)
+		})
+
+		It("resets session cookies before switching", func() {
+			_, err := appstore.SwitchAccount("other@example.com")
+			Expect(err).ToNot(HaveOccurred())
+		})
+	})
+
 	When("keychain returns error", func() {
 		BeforeEach(func() {
 			mockKeychain.EXPECT().

pkg/http/cookiejar.go

@@ -7,4 +7,5 @@ type CookieJar interface {
 	http.CookieJar
 
 	Save() error
+	Reset() error
 }