Mike/pop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix FRE-4693 code review findings: 2-arg constructor, 403 error test, error content check
Some checks failed
CI / build (1.21.x) (push) Has been cancelled
Details
CI / build (1.22.x) (push) Has been cancelled
Details
CI / security-scan (push) Has been cancelled
Details

Browse Source 
- Pass nil refresher to NewProtonMailClient at all 5 call sites
- Change TestListMessages_APIError from 401 to 403 (avoids refresh interception)
- Add error content assertion to TestGetMessage_NotFound
This commit is contained in:
Senior Engineer
2026-05-10 09:38:21 -04:00
committed by Michael Freno
parent 691a2acdad
commit 5dc4a1b742
1 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
internal/mail/client_test.go
View File

@@ -87,7 +87,7 @@ func newTestClient(t *testing.T, srv *mockServer) *Client {
RateLimitReq: 100, RateLimitReq: 100,
RateLimitWin: 60, RateLimitWin: 60,
} }
apiClient := api.NewProtonMailClient(cfg) apiClient := api.NewProtonMailClient(cfg, nil)
apiClient.SetAuthHeader("test-token") apiClient.SetAuthHeader("test-token")
return NewClient(apiClient) return NewClient(apiClient)
} }
@@ -294,8 +294,8 @@ func TestListMessages_APIError(t *testing.T) {
client := newTestClient(t, srv) client := newTestClient(t, srv)
srv.Handle("POST /api/messages", func(w http.ResponseWriter, r *http.Request) { srv.Handle("POST /api/messages", func(w http.ResponseWriter, r *http.Request) {
w.WriteHeader(http.StatusUnauthorized) w.WriteHeader(http.StatusForbidden)
fmt.Fprintf(w, `{"Code":401,"Message":"invalid token"}`) fmt.Fprintf(w, `{"Code":403,"Message":"invalid token"}`)
}) })
_, err := client.ListMessages(ListMessagesRequest{ _, err := client.ListMessages(ListMessagesRequest{
@@ -304,7 +304,7 @@ func TestListMessages_APIError(t *testing.T) {
Passphrase: "pass", Passphrase: "pass",
}) })
if err == nil { if err == nil {
t.Fatal("expected error for 401 response") t.Fatal("expected error for 403 response")
} }
if !strings.Contains(err.Error(), "invalid token") { if !strings.Contains(err.Error(), "invalid token") {
t.Errorf("expected 'invalid token' in error, got: %s", err.Error()) t.Errorf("expected 'invalid token' in error, got: %s", err.Error())
@@ -404,6 +404,9 @@ func TestGetMessage_NotFound(t *testing.T) {
if err == nil { if err == nil {
t.Fatal("expected error for 404") t.Fatal("expected error for 404")
} }
if !strings.Contains(err.Error(), "message not found") {
t.Errorf("expected 'message not found' in error, got: %s", err.Error())
}
} }
func TestGetMessage_DecryptBody(t *testing.T) { func TestGetMessage_DecryptBody(t *testing.T) {
@@ -417,7 +420,7 @@ func TestGetMessage_DecryptBody(t *testing.T) {
RateLimitReq: 100, RateLimitReq: 100,
RateLimitWin: 60, RateLimitWin: 60,
} }
apiClient := api.NewProtonMailClient(cfg) apiClient := api.NewProtonMailClient(cfg, nil)
apiClient.SetAuthHeader("test-token") apiClient.SetAuthHeader("test-token")
client := NewClient(apiClient) client := NewClient(apiClient)
client.SetPGPService(svc) client.SetPGPService(svc)
@@ -488,7 +491,7 @@ func TestSend_WithPGP(t *testing.T) {
RateLimitReq: 100, RateLimitReq: 100,
RateLimitWin: 60, RateLimitWin: 60,
} }
apiClient := api.NewProtonMailClient(cfg) apiClient := api.NewProtonMailClient(cfg, nil)
apiClient.SetAuthHeader("test-token") apiClient.SetAuthHeader("test-token")
client := NewClient(apiClient) client := NewClient(apiClient)
client.SetPGPService(svc) client.SetPGPService(svc)
@@ -1089,7 +1092,7 @@ func TestAuthHeader_Propagated(t *testing.T) {
RateLimitReq: 100, RateLimitReq: 100,
RateLimitWin: 60, RateLimitWin: 60,
} }
apiClient := api.NewProtonMailClient(cfg) apiClient := api.NewProtonMailClient(cfg, nil)
apiClient.SetAuthHeader("my-test-token") apiClient.SetAuthHeader("my-test-token")
client := NewClient(apiClient) client := NewClient(apiClient)
@@ -1324,7 +1327,7 @@ func TestListMessages_Timeout(t *testing.T) {
RateLimitReq: 100, RateLimitReq: 100,
RateLimitWin: 60, RateLimitWin: 60,
} }
apiClient := api.NewProtonMailClient(cfg) apiClient := api.NewProtonMailClient(cfg, nil)
apiClient.SetAuthHeader("test-token") apiClient.SetAuthHeader("test-token")
client := NewClient(apiClient) client := NewClient(apiClient)