[pull] master from botpress:master

integrations/linear/definitions/states.ts

@@ -6,6 +6,10 @@ export const states = {
     type: 'integration',
     schema: z.object({
       accessToken: z.string().title('Access Token').describe('The access token for Linear'),
+      refreshToken: z
+        .string()
+        .title('Refresh Token')
+        .describe('The refresh token needed when the access token expires'),
       expiresAt: z.string().title('Expires At').describe('The time when the access token expires'),
     }),
   },

integrations/linear/integration.definition.ts

@@ -7,7 +7,7 @@ import listable from './bp_modules/listable'
 import { actions, channels, events, configuration, configurations, user, states, entities } from './definitions'
 
 export const INTEGRATION_NAME = 'linear'
-export const INTEGRATION_VERSION = '1.3.0'
+export const INTEGRATION_VERSION = '2.0.0'
 
 export default new IntegrationDefinition({
   name: INTEGRATION_NAME,

integrations/linear/src/actions/create-issue.ts

@@ -10,7 +10,7 @@ export const createIssue: bp.IntegrationProps['actions']['createIssue'] = async
     input: { title, description, priority, teamName, labels, project },
   } = args
 
-  const linearClient = await getLinearClient(args, ctx.integrationId)
+  const linearClient = await getLinearClient(args)
 
   const team = await getTeam(linearClient, undefined, teamName)
 

integrations/linear/src/actions/delete-issue.ts

@@ -4,10 +4,10 @@ import * as bp from '.botpress'
 
 export const deleteIssue: bp.IntegrationProps['actions']['deleteIssue'] = async (args) => {
   const {
-    ctx,
     input: { id: issueId },
   } = args
-  const linearClient = await getLinearClient(args, ctx.integrationId)
+
+  const linearClient = await getLinearClient(args)
 
   const existingIssue = await linearClient.issue(issueId).catch((thrown) => {
     if (thrown instanceof LinearError && thrown.type === LinearErrorType.InvalidInput) {

integrations/linear/src/actions/find-target.ts

@@ -23,8 +23,9 @@ const findIssues = async (issues: IssueConnection, targets: Target[]) => {
 export const findTarget: bp.IntegrationProps['actions']['findTarget'] = async (args) => {
   const targets: Target[] = []
 
-  const { input, ctx } = args
-  const linearClient = await getLinearClient(args, ctx.integrationId)
+  const { input } = args
+
+  const linearClient = await getLinearClient(args)
   const issues = await linearClient.issues({
     filter: {
       or: [

integrations/linear/src/actions/get-issue.ts

@@ -20,10 +20,9 @@ export const getIssueFields = (issue: Issue): z.infer<typeof issueSchema> => ({
 
 export const getIssue: bp.IntegrationProps['actions']['getIssue'] = async (args) => {
   const {
-    ctx,
     input: { issueId },
   } = args
-  const linearClient = await getLinearClient(args, ctx.integrationId)
+  const linearClient = await getLinearClient(args)
   const issue = await linearClient.issue(issueId)
 
   return getIssueFields(issue)

integrations/linear/src/actions/get-user.ts

@@ -6,10 +6,9 @@ import * as bp from '.botpress'
 
 export const getUser: bp.IntegrationProps['actions']['getUser'] = async (args) => {
   const {
-    ctx,
     input: { linearUserId },
   } = args
-  const linearClient = await getLinearClient(args, ctx.integrationId)
+  const linearClient = await getLinearClient(args)
   const user = linearUserId ? await linearClient.user(linearUserId) : await linearClient.viewer
 
   return userProfileSchema.parse({

integrations/linear/src/actions/list-issues.ts

@@ -6,10 +6,9 @@ import * as bp from '.botpress'
 
 export const listIssues: bp.IntegrationProps['actions']['listIssues'] = async (args) => {
   const {
-    ctx,
     input: { count, startCursor, startDate, teamId },
   } = args
-  const linearClient = await getLinearClient(args, ctx.integrationId)
+  const linearClient = await getLinearClient(args)
 
   const query = await linearClient.issues({
     orderBy: LinearDocument.PaginationOrderBy.UpdatedAt,

integrations/linear/src/actions/list-states.ts

@@ -4,11 +4,10 @@ import * as bp from '.botpress'
 
 export const listStates: bp.IntegrationProps['actions']['listStates'] = async (args) => {
   const {
-    ctx,
     input: { count, startCursor },
   } = args
 
-  const linearClient = await getLinearClient(args, ctx.integrationId)
+  const linearClient = await getLinearClient(args)
 
   try {
     const states = await linearClient.workflowStates({ after: startCursor, first: count })

integrations/linear/src/actions/list-teams.ts

@@ -3,10 +3,9 @@ import * as bp from '.botpress'
 
 export const listTeams: bp.IntegrationProps['actions']['listTeams'] = async (args) => {
   const {
-    ctx,
     input: {},
   } = args
-  const linearClient = await getLinearClient(args, ctx.integrationId)
+  const linearClient = await getLinearClient(args)
   const teams = await linearClient.teams()
 
   return {

integrations/linear/src/actions/list-users.ts

@@ -5,10 +5,9 @@ import * as bp from '.botpress'
 
 export const listUsers: bp.IntegrationProps['actions']['listUsers'] = async (args) => {
   const {
-    ctx,
     input: { count, startCursor },
   } = args
-  const linearClient = await getLinearClient(args, ctx.integrationId)
+  const linearClient = await getLinearClient(args)
 
   const query = await linearClient.users({
     orderBy: LinearDocument.PaginationOrderBy.UpdatedAt,

integrations/linear/src/actions/mark-as-duplicate.ts

@@ -4,10 +4,9 @@ import * as bp from '.botpress'
 
 export const markAsDuplicate: bp.IntegrationProps['actions']['markAsDuplicate'] = async (args) => {
   const {
-    ctx,
     input: { issueId, relatedIssueId },
   } = args
-  const linearClient = await getLinearClient(args, ctx.integrationId)
+  const linearClient = await getLinearClient(args)
   await linearClient.createIssueRelation({
     issueId,
     relatedIssueId,

integrations/linear/src/actions/proactive-conversation.ts

@@ -5,8 +5,8 @@ import * as bp from '.botpress'
 export const getOrCreateIssueConversation: bp.IntegrationProps['actions']['getOrCreateIssueConversation'] = async (
   args
 ) => {
-  const { client, input, ctx } = args
-  const linearClient = await getLinearClient(args, ctx.integrationId)
+  const { client, input } = args
+  const linearClient = await getLinearClient(args)
   const issue = await linearClient.issue(input.conversation.id).catch((thrown) => {
     const message = thrown instanceof Error ? thrown.message : new Error(thrown).message
     throw new RuntimeError(`Failed to get issue with ID ${input.conversation.id}: ${message}`)

integrations/linear/src/actions/resolve-comment.ts

@@ -3,11 +3,10 @@ import * as bp from '.botpress'
 
 export const resolveComment: bp.IntegrationProps['actions']['resolveComment'] = async (args) => {
   const {
-    ctx,
     input: { id },
   } = args
 
-  const linearClient = await getLinearClient(args, ctx.integrationId)
+  const linearClient = await getLinearClient(args)
 
   try {
     const { success } = await linearClient.commentResolve(id)

integrations/linear/src/actions/send-raw-graphql-query.ts

@@ -4,7 +4,6 @@ import * as bp from '.botpress'
 
 export const sendRawGraphqlQuery: bp.IntegrationProps['actions']['sendRawGraphqlQuery'] = async (args) => {
   const {
-    ctx,
     input: { query, parameters },
   } = args
 
@@ -16,7 +15,7 @@ export const sendRawGraphqlQuery: bp.IntegrationProps['actions']['sendRawGraphql
     {} as Record<string, unknown>
   )
   try {
-    const linearClient = await getLinearClient(args, ctx.integrationId)
+    const linearClient = await getLinearClient(args)
     const result = await linearClient.client.rawRequest(query, mappedParams)
     return { result: result.data }
   } catch (thrown) {

integrations/linear/src/actions/update-issue.ts

@@ -4,10 +4,9 @@ import * as bp from '.botpress'
 
 export const updateIssue: bp.IntegrationProps['actions']['updateIssue'] = async (args) => {
   const {
-    ctx,
     input: { issueId, teamName, labels, project, priority },
   } = args
-  const linearClient = await getLinearClient(args, ctx.integrationId)
+  const linearClient = await getLinearClient(args)
 
   const existingIssue = await linearClient.issue(issueId)
   const team = await getTeam(linearClient, await existingIssue.team, teamName)

integrations/linear/src/handler.ts

@@ -12,9 +12,10 @@ import * as bp from '.botpress'
 const LINEAR_WEBHOOK_SIGNATURE_HEADER = 'linear-signature'
 const LINEAR_WEBHOOK_TS_FIELD = 'webhookTimestamp'
 
-export const handler: bp.IntegrationProps['handler'] = async ({ req, ctx, client, logger }) => {
+export const handler: bp.IntegrationProps['handler'] = async (props) => {
+  const { req, ctx, client, logger } = props
   if (req.path === '/oauth') {
-    return handleOauth(req, client, ctx).catch((err) => {
+    return await handleOauth(props).catch((err) => {
       logger.forBot().error('Error while processing OAuth', err.response?.data || err.message)
       throw err
     })
@@ -130,7 +131,7 @@ const _getWebhookSigningSecret = ({ ctx }: { ctx: bp.Context }) =>
   ctx.configurationType === 'apiKey' ? ctx.configuration.webhookSigningSecret : bp.secrets.WEBHOOK_SIGNING_SECRET
 
 const _getLinearBotId = async ({ client, ctx }: { client: bp.Client; ctx: bp.Context }) => {
-  const linearClient = await getLinearClient({ client, ctx }, ctx.integrationId)
+  const linearClient = await getLinearClient({ client, ctx })
   const me = await linearClient.viewer
   return me.id
 }