-
Notifications
You must be signed in to change notification settings - Fork 663
feat(gmail): add --include-attachments to messages search #962
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
ronny-rentner
wants to merge
5
commits into
openclaw:main
Choose a base branch
from
ronny-rentner:feat/gmail-include-attachments
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
54c58df
feat(gmail): add --include-attachments to messages search
ronny-rentner d57234f
fix(gmail): render --include-attachments in text output and cover roo…
ronny-rentner 14ae959
fix(gmail): enumerate attachments over the full payload and expose mi…
ronny-rentner eb83a8b
fix(gmail): show the short attachment id (matching saved filenames) i…
ronny-rentner d92c681
fix(gmail): fetch --include-attachments via Format(full), drop the cu…
ronny-rentner File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
114 changes: 114 additions & 0 deletions
114
internal/cmd/execute_gmail_messages_include_attachments_test.go
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,114 @@ | ||
| package cmd | ||
|
|
||
| import ( | ||
| "encoding/json" | ||
| "net/http" | ||
| "net/http/httptest" | ||
| "strings" | ||
| "testing" | ||
| ) | ||
|
|
||
| func TestExecute_GmailMessagesSearch_IncludeAttachments(t *testing.T) { | ||
| var sawFormat, sawFields string | ||
| srv := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { | ||
| path := r.URL.Path | ||
| switch { | ||
| case strings.Contains(path, "/users/me/messages") && !strings.Contains(path, "/users/me/messages/"): | ||
| w.Header().Set("Content-Type", "application/json") | ||
| _ = json.NewEncoder(w).Encode(map[string]any{ | ||
| "messages": []map[string]any{{"id": "m1", "threadId": "t1"}}, | ||
| }) | ||
| case strings.Contains(path, "/users/me/messages/m1"): | ||
| sawFormat = r.URL.Query().Get("format") | ||
| sawFields = r.URL.Query().Get("fields") | ||
| w.Header().Set("Content-Type", "application/json") | ||
| // invoice.pdf sits three MIME levels down, to exercise deep nesting. | ||
| _ = json.NewEncoder(w).Encode(map[string]any{ | ||
| "id": "m1", "threadId": "t1", "labelIds": []string{"INBOX"}, | ||
| "payload": map[string]any{ | ||
| "mimeType": "multipart/mixed", | ||
| "headers": []map[string]any{ | ||
| {"name": "From", "value": "Example <no-reply@example.com>"}, | ||
| {"name": "Subject", "value": "Receipt"}, | ||
| }, | ||
| "parts": []map[string]any{ | ||
| { | ||
| "mimeType": "text/plain", | ||
| "body": map[string]any{"data": encodeBase64URL("secret body text")}, | ||
| }, | ||
| { | ||
| "mimeType": "multipart/related", | ||
| "parts": []map[string]any{{ | ||
| "mimeType": "multipart/alternative", | ||
| "parts": []map[string]any{{ | ||
| "filename": "invoice.pdf", | ||
| "mimeType": "application/pdf", | ||
| "body": map[string]any{"attachmentId": "att-pdf", "size": 4096}, | ||
| }}, | ||
| }}, | ||
| }, | ||
| }, | ||
| }, | ||
| }) | ||
| case strings.Contains(path, "/users/me/labels"): | ||
| w.Header().Set("Content-Type", "application/json") | ||
| _ = json.NewEncoder(w).Encode(map[string]any{ | ||
| "labels": []map[string]any{{"id": "INBOX", "name": "INBOX", "type": "system"}}, | ||
| }) | ||
| default: | ||
| http.NotFound(w, r) | ||
| } | ||
| })) | ||
| defer srv.Close() | ||
|
|
||
| svc := newGmailServiceFromServer(t, srv) | ||
|
|
||
| type searchOut struct { | ||
| Messages []struct { | ||
| Body string `json:"body"` | ||
| Attachments []struct { | ||
| Filename string `json:"filename"` | ||
| Size int64 `json:"size"` | ||
| MimeType string `json:"mimeType"` | ||
| } `json:"attachments"` | ||
| } `json:"messages"` | ||
| } | ||
|
|
||
| // --include-attachments lists the attachments but does not render the body. | ||
| res := executeWithGmailTestService(t, | ||
| []string{"--json", "--account", "a@b.com", "gmail", "messages", "search", "from:example.com", "--include-attachments"}, | ||
| svc) | ||
| if res.err != nil { | ||
| t.Fatalf("Execute: %v\nstderr=%q", res.err, res.stderr) | ||
| } | ||
| var parsed searchOut | ||
| if err := json.Unmarshal([]byte(res.stdout), &parsed); err != nil { | ||
| t.Fatalf("decode: %v\nout=%q", err, res.stdout) | ||
| } | ||
| if len(parsed.Messages) != 1 || len(parsed.Messages[0].Attachments) != 1 { | ||
| t.Fatalf("expected one attachment, got: %#v", parsed.Messages) | ||
| } | ||
| att := parsed.Messages[0].Attachments[0] | ||
| if att.Filename != "invoice.pdf" || att.MimeType != "application/pdf" || att.Size != 4096 { | ||
| t.Fatalf("unexpected attachment: %#v", att) | ||
| } | ||
| if parsed.Messages[0].Body != "" || strings.Contains(res.stdout, "secret body text") { | ||
| t.Fatalf("body must not be included with --include-attachments: %q", res.stdout) | ||
| } | ||
| // Fetched as a complete format=full with no capping parts mask, which is what | ||
| // lets the attachment nested three levels down be listed at all. | ||
| if sawFormat != "full" || strings.Contains(sawFields, "parts(") { | ||
| t.Fatalf("include-attachments must fetch format=full without a capping parts mask; format=%q fields=%q", sawFormat, sawFields) | ||
| } | ||
|
|
||
| // Default search lists neither body nor attachments. | ||
| plain := executeWithGmailTestService(t, | ||
| []string{"--json", "--account", "a@b.com", "gmail", "messages", "search", "from:example.com"}, | ||
| svc) | ||
| if plain.err != nil { | ||
| t.Fatalf("Execute plain: %v\nstderr=%q", plain.err, plain.stderr) | ||
| } | ||
| if strings.Contains(plain.stdout, "invoice.pdf") || strings.Contains(plain.stdout, "attachments") { | ||
| t.Fatalf("default search must not list attachments: %q", plain.stdout) | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
When
--include-attachmentsis used with the default table output or--plain, this path fetches and populatesmessageItem.Attachments, but the later call togmailMessageColumns(c.IncludeBody, c.Full)never reads that field. The flag therefore performs the additional full-format API requests while producing exactly the same stdout as a search without the flag. Pass the option into the presentation layer and render the metadata, or explicitly restrict and document the flag as JSON-only.Useful? React with 👍 / 👎.