[pull] master from botpress:master

integrations/gmail/definitions/configuration.ts

@@ -40,12 +40,14 @@ export const configurations = {
         .string()
         .min(1)
         .title('Pub/Sub Webhook Shared Secret')
-        .describe('Must be set in GCC under Pub/Sub > Subscriptions'),
+        .describe(
+          'Must be set in GCC under Pub/Sub > Subscriptions > Details > Push endpoint (in the URL is the shared secret)'
+        ),
       pubsubWebhookServiceAccount: z
         .string()
         .min(1)
         .title('Pub/Sub Webhook Service Account')
-        .describe('Must be set in GCC under Pub/Sub > Subscriptions'),
+        .describe('Must be set in GCC under Pub/Sub > Subscriptions > Details > Service account'),
     }),
   },
 } as const satisfies sdk.IntegrationDefinitionProps['configurations']

integrations/gmail/integration.definition.ts

@@ -13,7 +13,7 @@ import {
 
 export default new sdk.IntegrationDefinition({
   name: 'gmail',
-  version: '0.6.2',
+  version: '0.6.3',
   title: 'Gmail',
   description: "Send, receive, and manage emails directly within your bot's workflow.",
   icon: 'icon.svg',

integrations/gmail/src/channels/channels.ts

@@ -144,20 +144,21 @@ export const channels = {
 
 const _sendEmailReply = async ({
   conversation,
+  logger,
   ack,
   textContent,
   htmlContent,
   inReplyTo,
   googleClient,
 }: bp.AnyMessageProps & {
+  logger: bp.Logger
   textContent: string
   htmlContent?: string
   inReplyTo: string
   googleClient: GoogleClient
 }) => {
-  const { threadId, email, subject, references, cc } = _getConversationInfo(conversation)
+  const { threadId, email, subject, references, cc } = _getConversationInfo(conversation, logger)
 
-  console.info('Creating mail')
   const raw = await composeRawEmail({
     to: email,
     subject,
@@ -168,20 +169,18 @@ const _sendEmailReply = async ({
     references: references ?? inReplyTo,
     cc,
   })
-  console.info('Sending mail', raw)
 
   const res = await googleClient.sendRawEmail(raw, threadId)
-  console.info('Response', res)
 
   await ack({ tags: { id: `${res.id}` } })
 }
 
-const _getConversationInfo = (conversation: bp.AnyMessageProps['conversation']) => {
+const _getConversationInfo = (conversation: bp.AnyMessageProps['conversation'], logger: bp.Logger) => {
   const { id, tags } = conversation
   const { id: threadId, subject, email, references, cc } = tags
 
   if (!(threadId && subject && email)) {
-    console.info(`No valid information found for conversation ${id}`)
+    logger.forBot().error(`No valid information found for conversation ${id}`)
     throw new Error(`No valid information found for conversation ${id}`)
   }
 

integrations/gmail/src/webhook-events/handler.ts

@@ -5,8 +5,6 @@ import { handleOAuthCallback } from './oauth-callback'
 import * as bp from '.botpress'
 
 export const handler = async (props: bp.HandlerProps) => {
-  console.info('handler received a request')
-
   if (props.req.path.startsWith('/oauth')) {
     return handleOAuthCallback(props)
   }

integrations/gmail/src/webhook-events/new-mail.ts

@@ -10,27 +10,23 @@ export const handleIncomingEmail = async (props: bp.HandlerProps) => {
   const bodyContent = JSON.parse(req.body || '{}')
 
   const data = bodyContent.message?.data
-  console.info('data', data)
 
   if (!data) {
     console.warn('Handler received an invalid body (no data)')
     return
   }
 
   const messageData = JSON.parse(decodeBase64URL(data))
-  console.info('messageData', messageData)
 
   const { historyId: historyIdNumber, emailAddress } = messageData
   const historyId = `${historyIdNumber}`
-  console.info('historyId', historyId)
 
   if (!historyId) {
     console.warn('Handler received an invalid body (no historyId)')
     return
   }
 
   // Only proceed if the incoming historyId is greater that the latest processed historyId
-  console.info('creating gmail client')
   const googleClient = await GoogleClient.create({ client, ctx })
 
   const {
@@ -57,8 +53,6 @@ export const handleIncomingEmail = async (props: bp.HandlerProps) => {
 
   const history = await googleClient.getMyHistory(lastHistoryId)
 
-  console.info(JSON.stringify(history, null, 2))
-
   const messageIds = history.history?.reduce((acc, h) => {
     h.messagesAdded?.forEach((m) => {
       if (m.message?.id) {
@@ -95,12 +89,8 @@ const _processMessage = async (
   googleClient: GoogleClient,
   emailAddress: string
 ) => {
-  console.info('getting history')
   const gmailMessage = await googleClient.getMessageById(messageId)
-
   const message = parseMessage(gmailMessage)
-  console.info('message', message)
-
   const threadId = message.threadId
 
   if (!threadId) {
@@ -112,23 +102,19 @@ const _processMessage = async (
   const inReplyTo = message.headers['message-id']
   const from = message.headers['from']
   const { name: senderName, email: userEmail } = _extractNameAndEmailFromSender(replyTo ?? from)
-  console.info('userEmail', userEmail)
 
   if (userEmail === emailAddress) {
     return
   }
 
-  console.info('threadId', threadId)
   const { conversation } = await client.getOrCreateConversation({
     channel: 'channel',
     tags: {
       id: `${threadId}`,
     },
   })
 
-  console.info('conversation', conversation)
-
-  const { conversation: updatedConversation } = await client.updateConversation({
+  await client.updateConversation({
     id: conversation.id,
     tags: {
       subject: message.headers['subject'],
@@ -138,13 +124,10 @@ const _processMessage = async (
     },
   })
 
-  console.info('updatedConversation', updatedConversation)
-
   if (!userEmail) {
     throw new Error('Handler received an empty from id')
   }
 
-  console.info('userEmail', userEmail)
   const { user } = await client.getOrCreateUser({
     tags: {
       id: `${userEmail}`,
@@ -171,7 +154,6 @@ const _processMessage = async (
     }
   }
 
-  console.info('getOrCreateMessage', { threadId, userEmail, content, inReplyTo })
   await client.getOrCreateMessage({
     tags: { id: messageId },
     type: 'text',

integrations/gmail/src/webhook-events/oauth-callback.ts

@@ -10,23 +10,19 @@ export const handleOAuthCallback = async ({ req, client, ctx }: bp.HandlerProps)
     return
   }
 
-  console.info('code', authorizationCode)
-
   const googleClient = await GoogleClient.createFromAuthorizationCode({
     client,
     ctx,
     authorizationCode,
   })
 
   const userEmail = await googleClient.getMyEmail()
-  console.info('userEmail', userEmail)
 
   if (!userEmail) {
     console.error('Error extracting email from profile')
     return
   }
 
-  console.info('configureIntegration')
   await client.configureIntegration({
     identifier: userEmail,
   })

integrations/whatsapp/integration.definition.ts

@@ -95,7 +95,7 @@ const defaultBotPhoneNumberId = {
 export const INTEGRATION_NAME = 'whatsapp'
 export default new IntegrationDefinition({
   name: INTEGRATION_NAME,
-  version: '4.5.16',
+  version: '4.5.17',
   title: 'WhatsApp',
   description: 'Send and receive messages through WhatsApp.',
   icon: 'icon.svg',
@@ -190,6 +190,11 @@ export default new IntegrationDefinition({
             filename: z.string().optional(),
           }),
         },
+        image: {
+          schema: messages.defaults.image.schema.extend({
+            caption: z.string().optional(),
+          }),
+        },
         bloc: {
           schema: z.object({
             items: z.array(

integrations/whatsapp/src/channels/message-types/image.ts

@@ -73,7 +73,8 @@ export async function generateOutgoingMessage({
 function _generateImage(payload: Image, logger: bp.Logger): WhatsappMessages.Image | undefined {
   logger.forBot().debug('Sending WhatsApp Image')
   const url = payload.imageUrl.trim()
-  return new WhatsappMessages.Image(url, false)
+  const caption = payload.caption
+  return new WhatsappMessages.Image(url, false, caption)
 }
 
 async function _generateSticker(payload: Image, logger: bp.Logger): Promise<WhatsappMessages.Sticker | undefined> {

integrations/whatsapp/src/webhook/handlers/messages.ts

@@ -134,7 +134,14 @@ async function _handleIncomingMessage(
     })
   } else if (type === 'image') {
     const imageUrl = await _getOrDownloadWhatsappMedia(message.image.id, client, ctx)
-    await createMessage({ type, payload: { imageUrl }, replyTo })
+    await createMessage({
+      type,
+      payload: {
+        imageUrl,
+        ...(message.image.caption && { caption: message.image.caption }),
+      },
+      replyTo,
+    })
   } else if (type === 'sticker') {
     const stickerUrl = await _getOrDownloadWhatsappMedia(message.sticker.id, client, ctx)
     await createMessage({ type: 'image', payload: { imageUrl: stickerUrl }, replyTo })