Skip to content
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

Missing logo crtx 49756 #28083

Merged
merged 5 commits into from Jul 16, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
11 changes: 6 additions & 5 deletions Packs/Gmail/Integrations/Gmail/Gmail.py
Expand Up @@ -1907,13 +1907,14 @@ def handle_html(htmlBody):
)
):
maintype, subtype = m.group(2).split('/', 1)
name = f"image{i}.{subtype}"
att = {
'maintype': maintype,
'subtype': subtype,
'data': base64.b64decode(m.group(3)),
'name': f"image{i}.{subtype}"
'name': name,
'cid': name
}
att['cid'] = f'{str(att.get("name"))}@{randomword(8)}.{randomword(8)}'
attachments.append(att)
cleanBody += htmlBody[lastIndex:m.start(1)] + 'cid:' + att['cid']
lastIndex = m.end() - 1
Expand Down Expand Up @@ -2102,7 +2103,7 @@ def send_mail(emailto, emailfrom, subject, body, entry_ids, cc, bcc, htmlBody, r
message.attach(alt)
attach_body_to = alt
else:
message = MIMEMultipart('alternative') if body and htmlBody else MIMEMultipart() # type: ignore
message = MIMEMultipart() # type: ignore

if not attach_body_to:
attach_body_to = message # type: ignore
Expand All @@ -2122,8 +2123,6 @@ def send_mail(emailto, emailfrom, subject, body, entry_ids, cc, bcc, htmlBody, r

# if there are any attachments to the mail or both body and htmlBody were given
if entry_ids or file_names or attach_cid or manualAttachObj or (body and htmlBody):
msg = MIMEText(body, 'plain', 'utf-8')
attach_body_to.attach(msg) # type: ignore
htmlAttachments = [] # type: list
inlineAttachments = [] # type: list

Expand All @@ -2137,6 +2136,8 @@ def send_mail(emailto, emailfrom, subject, body, entry_ids, cc, bcc, htmlBody, r
else:
# if not html body, cannot attach cids in message
transientFileCID = None
msg = MIMEText(body, 'plain', 'utf-8')
attach_body_to.attach(msg) # type: ignore

attachments = collect_attachments(entry_ids, file_names)
manual_attachments = collect_manual_attachments()
Expand Down
2 changes: 1 addition & 1 deletion Packs/Gmail/Integrations/Gmail/Gmail.yml
Expand Up @@ -1641,7 +1641,7 @@ script:
- contextPath: Gmail.ForwardingAddress.verificationStatus
description: Indicates whether this address has been verified and is usable for forwarding.
type: String
dockerimage: demisto/google-api-py3:1.0.0.64634
dockerimage: demisto/google-api-py3:1.0.0.64930
isfetch: true
runonce: false
script: '-'
Expand Down
6 changes: 6 additions & 0 deletions Packs/Gmail/ReleaseNotes/1_3_12.md
@@ -0,0 +1,6 @@

#### Integrations

##### Gmail
- Updated the Docker image to: *demisto/google-api-py3:1.0.0.64930*.
- Fixed an issue with missing logo in mails when using ***send-mail*** command.
2 changes: 1 addition & 1 deletion Packs/Gmail/pack_metadata.json
Expand Up @@ -2,7 +2,7 @@
"name": "Gmail",
"description": "Gmail API and user management (This integration replaces the Gmail functionality in the GoogleApps API and G Suite integration).",
"support": "xsoar",
"currentVersion": "1.3.11",
"currentVersion": "1.3.12",
"author": "Cortex XSOAR",
"url": "https://www.paloaltonetworks.com/cortex",
"email": "",
Expand Down