From 81ef6b2c5aba83148df9cd237e7011302654914c Mon Sep 17 00:00:00 2001
From: Georg Bremer <github@dschoordsch.de>
Date: Wed, 13 Oct 2021 09:31:31 +0200
Subject: [PATCH 01/11] Allow moving integration tasks between teams

If a task with the same hash exists in the destination, it is deleted
first.

This currently only touches `changeTaskTeam`, but moving teams is also
possible via `updateTask`.
---
 .../OutcomeCardFooter/TaskFooter.tsx          | 11 +++++---
 .../graphql/mutations/changeTaskTeam.ts       | 27 ++++++++++++++++++-
 2 files changed, 34 insertions(+), 4 deletions(-)

diff --git a/packages/client/modules/outcomeCard/components/OutcomeCardFooter/TaskFooter.tsx b/packages/client/modules/outcomeCard/components/OutcomeCardFooter/TaskFooter.tsx
index 378a096cb86..43b1a75ec1d 100644
--- a/packages/client/modules/outcomeCard/components/OutcomeCardFooter/TaskFooter.tsx
+++ b/packages/client/modules/outcomeCard/components/OutcomeCardFooter/TaskFooter.tsx
@@ -84,17 +84,22 @@ const TaskFooter = (props: Props) => {
   const showTeam = area === USER_DASH
   const {content, id: taskId, error, integration, tags, userId} = task
   const isArchived = isTaskArchived(tags)
-  const canAssign = !integration && !isArchived
+  const canAssignUser = !integration && !isArchived
+  const canAssignTeam = !isArchived
   return (
     <React.Fragment>
       <Footer>
         <AvatarBlock>
           {showTeam ? (
-            <TaskFooterTeamAssignee canAssign={canAssign} task={task} useTaskChild={useTaskChild} />
+            <TaskFooterTeamAssignee
+              canAssign={canAssignTeam}
+              task={task}
+              useTaskChild={useTaskChild}
+            />
           ) : (
             <TaskFooterUserAssignee
               area={area}
-              canAssign={canAssign}
+              canAssign={canAssignUser}
               cardIsActive={cardIsActive}
               task={task}
               useTaskChild={useTaskChild}
diff --git a/packages/server/graphql/mutations/changeTaskTeam.ts b/packages/server/graphql/mutations/changeTaskTeam.ts
index 717fa53b2f7..266d3d700bf 100644
--- a/packages/server/graphql/mutations/changeTaskTeam.ts
+++ b/packages/server/graphql/mutations/changeTaskTeam.ts
@@ -50,6 +50,7 @@ export default {
     }
 
     // RESOLUTION
+    // filter mentions of old team members from task content
     const [oldTeamMembers, newTeamMembers] = await dataLoader
       .get('teamMembersByTeamId')
       .loadMany([oldTeamId, teamId])
@@ -69,7 +70,18 @@ export default {
       updatedAt: now,
       teamId
     }
-    await r({
+
+    // If there is a task with the same integration hash in the new team, then delete it first.
+    // This is done so there are no duplicates and also solves the issue of the conflicting task being
+    // private or archived.
+    const {deletedConflictingIntegrationTask} = await r({
+      deletedConflictingIntegrationTask:
+        task.integrationHash &&
+        r
+          .table('Task')
+          .getAll(task.integrationHash, {index: 'integrationHash'})
+          .filter({teamId})
+          .delete({returnChanges: true}),
       newTask: r
         .table('Task')
         .get(taskId)
@@ -92,6 +104,19 @@ export default {
         })
     }).run()
 
+    const deletedTasks = (deletedConflictingIntegrationTask as any)?.changes?.map(
+      ({old_val}) => old_val
+    )
+    deletedTasks?.forEach((task) => {
+      const isPrivate = task.tags.includes('private')
+      const data = {task}
+      newTeamMembers.forEach(({userId}) => {
+        if (!isPrivate || userId === task.userId) {
+          publish(SubscriptionChannel.TASK, userId, 'DeleteTaskPayload', data, subOptions)
+        }
+      })
+    })
+
     const isPrivate = tags.includes('private')
     const data = {taskId}
     const teamMembers = oldTeamMembers.concat(newTeamMembers)

From 0847523b276b96731bb10e38c29b0a8864d06775 Mon Sep 17 00:00:00 2001
From: Georg Bremer <github@dschoordsch.de>
Date: Wed, 13 Oct 2021 15:10:34 +0200
Subject: [PATCH 02/11] Remove teamId from updateTask mutation

This removes the ability of moving tasks between teams via `updateTask`
and requires `changeTaskTeam` to be called. Having only one simpler
mutation to do this is less error prone and reduces maintenance.
---
 .../client/mutations/UpdateTaskMutation.ts     |  6 +-----
 packages/client/types/graphql.ts               |  1 -
 .../server/graphql/mutations/updateTask.ts     | 18 ++++--------------
 .../server/graphql/types/UpdateTaskInput.ts    |  1 -
 4 files changed, 5 insertions(+), 21 deletions(-)

diff --git a/packages/client/mutations/UpdateTaskMutation.ts b/packages/client/mutations/UpdateTaskMutation.ts
index 11271b8d20b..814afc33d59 100644
--- a/packages/client/mutations/UpdateTaskMutation.ts
+++ b/packages/client/mutations/UpdateTaskMutation.ts
@@ -104,7 +104,7 @@ const UpdateTaskMutation: StandardMutation<TUpdateTaskMutation, OptionalHandlers
       updateTaskTaskUpdater(payload, {atmosphere, store: store as any})
     },
     optimisticUpdater: (store) => {
-      const {id, content, teamId, userId} = updatedTask
+      const {id, content, userId} = updatedTask
       const task = store.get(id)
       if (!task) return
       const now = new Date()
@@ -113,10 +113,6 @@ const UpdateTaskMutation: StandardMutation<TUpdateTaskMutation, OptionalHandlers
         updatedAt: now.toJSON()
       }
       updateProxyRecord(task, optimisticTask)
-      if (teamId) {
-        task.setValue(teamId, 'teamId')
-        task.setLinkedRecord(store.get(teamId)!, 'team')
-      }
       if (userId) {
         task.setValue(userId, 'userId')
         task.setLinkedRecord(store.get(userId)!, 'user')
diff --git a/packages/client/types/graphql.ts b/packages/client/types/graphql.ts
index 3c143b16499..f37336c4675 100644
--- a/packages/client/types/graphql.ts
+++ b/packages/client/types/graphql.ts
@@ -58942,7 +58942,6 @@ export interface IUpdateTaskInput {
   content?: string | null;
   sortOrder?: number | null;
   status?: TaskStatusEnum | null;
-  teamId?: string | null;
 
   /**
    * userId, the owner of the task. This can be null if the task is not assigned to anyone.
diff --git a/packages/server/graphql/mutations/updateTask.ts b/packages/server/graphql/mutations/updateTask.ts
index 6bb090a4253..b07717e78db 100644
--- a/packages/server/graphql/mutations/updateTask.ts
+++ b/packages/server/graphql/mutations/updateTask.ts
@@ -25,7 +25,6 @@ type UpdateTaskInput = {
   content?: string | null
   sortOrder?: number | null
   status?: TaskStatusEnum | null
-  teamId?: string | null
   userId?: string | null
 }
 type UpdateTaskMutationVariables = {
@@ -57,14 +56,7 @@ export default {
     const viewerId = getUserId(authToken)
 
     // VALIDATION
-    const {
-      id: taskId,
-      teamId: inputTeamId,
-      userId: inputUserId,
-      status,
-      sortOrder,
-      content
-    } = updatedTask
+    const {id: taskId, userId: inputUserId, status, sortOrder, content} = updatedTask
     const validContent = normalizeRawDraftJS(content)
     const task = await r
       .table('Task')
@@ -75,12 +67,11 @@ export default {
     }
     const {teamId, userId} = task
     const nextUserId = inputUserId === undefined ? userId : inputUserId
-    const nextTeamId = inputTeamId || teamId
-    if (!isTeamMember(authToken, teamId) || !isTeamMember(authToken, nextTeamId)) {
+    if (!isTeamMember(authToken, teamId)) {
       return standardError(new Error('Team not found'), {userId: viewerId})
     }
-    if (inputTeamId || inputUserId) {
-      const error = await validateTaskUserIsTeamMember(nextUserId, nextTeamId, dataLoader)
+    if (teamId || inputUserId) {
+      const error = await validateTaskUserIsTeamMember(nextUserId, teamId, dataLoader)
       if (error) {
         return standardError(new Error('Invalid user ID'), {userId: viewerId})
       }
@@ -90,7 +81,6 @@ export default {
       updatedTask.sortOrder !== undefined && Object.keys(updatedTask).length === 2
     const nextTask = new Task({
       ...task,
-      teamId: nextTeamId,
       userId: nextUserId,
       status: status || task.status,
       sortOrder: sortOrder || task.sortOrder,
diff --git a/packages/server/graphql/types/UpdateTaskInput.ts b/packages/server/graphql/types/UpdateTaskInput.ts
index 9e4d8784fe9..de6b3229b84 100644
--- a/packages/server/graphql/types/UpdateTaskInput.ts
+++ b/packages/server/graphql/types/UpdateTaskInput.ts
@@ -17,7 +17,6 @@ const UpdateTaskInput = new GraphQLInputObjectType({
     content: {type: GraphQLString},
     sortOrder: {type: GraphQLFloat},
     status: {type: TaskStatusEnum},
-    teamId: {type: GraphQLID},
     userId: {
       type: GraphQLID,
       description:

From e5f7267c58f23c6011f0f07b3c6908beb225531c Mon Sep 17 00:00:00 2001
From: Georg Bremer <github@dschoordsch.de>
Date: Mon, 1 Nov 2021 23:07:40 +0100
Subject: [PATCH 03/11] Before moving a task to another team check if an
 integration is needed

If the task has an integration, then the target team user must have the
right integration set up to ensure the task can be displayed in the
target team.
---
 .../TaskFooterTeamAssigneeMenu.tsx            | 52 +++++++++++++++++--
 1 file changed, 49 insertions(+), 3 deletions(-)

diff --git a/packages/client/modules/outcomeCard/components/OutcomeCardAssignMenu/TaskFooterTeamAssigneeMenu.tsx b/packages/client/modules/outcomeCard/components/OutcomeCardAssignMenu/TaskFooterTeamAssigneeMenu.tsx
index 2661f3f65a6..9f355d99563 100644
--- a/packages/client/modules/outcomeCard/components/OutcomeCardAssignMenu/TaskFooterTeamAssigneeMenu.tsx
+++ b/packages/client/modules/outcomeCard/components/OutcomeCardAssignMenu/TaskFooterTeamAssigneeMenu.tsx
@@ -11,6 +11,29 @@ import {MenuProps} from '../../../../hooks/useMenu'
 import ChangeTaskTeamMutation from '../../../../mutations/ChangeTaskTeamMutation'
 import useMutationProps from '../../../../hooks/useMutationProps'
 import {useUserTaskFilters} from '~/utils/useUserTaskFilters'
+import {TaskFooterTeamAssigneeMenu_viewerIntegrationsQuery} from '~/__generated__/TaskFooterTeamAssigneeMenu_viewerIntegrationsQuery.graphql'
+import GitHubClientManager from '~/utils/GitHubClientManager'
+import AtlassianClientManager from '~/utils/AtlassianClientManager'
+
+const query = graphql`
+  query TaskFooterTeamAssigneeMenu_viewerIntegrationsQuery($teamId: ID!) {
+    viewer {
+      id
+      teamMember(teamId: $teamId) {
+        id
+        integrations {
+          id
+          atlassian {
+            isActive
+          }
+          github {
+            isActive
+          }
+        }
+      }
+    }
+  }
+`
 
 interface Props {
   menuProps: MenuProps
@@ -21,7 +44,10 @@ interface Props {
 const TaskFooterTeamAssigneeMenu = (props: Props) => {
   const {menuProps, task, viewer} = props
   const {userIds, teamIds} = useUserTaskFilters(viewer.id)
-  const {team, id: taskId} = task
+  const {team, id: taskId, integration} = task
+  const isGitHubTask = integration?.__typename === '_xGitHubIssue'
+  const isJiraTask = integration?.__typename === 'JiraIssue'
+
   const {id: teamId} = team
   const {teams} = viewer
   const assignableTeams = useMemo(() => {
@@ -32,15 +58,35 @@ const TaskFooterTeamAssigneeMenu = (props: Props) => {
       : teams
     return filteredTeams
   }, [teamIds, userIds])
-  const taskTeamIdx = useMemo(() => assignableTeams.map(({id}) => id).indexOf(teamId) + 1, [
+  const taskTeamIdx = useMemo(() => assignableTeams.findIndex(({id}) => id === teamId) + 1, [
     teamId,
     assignableTeams
   ])
 
   const atmosphere = useAtmosphere()
   const {submitting, submitMutation, onError, onCompleted} = useMutationProps()
-  const handleTaskUpdate = (newTeam) => () => {
+  const oauthMutationProps = useMutationProps()
+  const handleTaskUpdate = (newTeam) => async () => {
     if (!submitting && teamId !== newTeam.id) {
+      if (isGitHubTask || isJiraTask) {
+        const result = await atmosphere.fetchQuery<
+          TaskFooterTeamAssigneeMenu_viewerIntegrationsQuery
+        >(query, {
+          teamId: newTeam.id
+        })
+        const {github, atlassian} = result?.viewer?.teamMember?.integrations ?? {}
+
+        if (isGitHubTask && !github?.isActive) {
+          // TODO show dialog explaining
+          GitHubClientManager.openOAuth(atmosphere, newTeam.id, oauthMutationProps)
+          return
+        }
+        if (isJiraTask && !atlassian?.isActive) {
+          // TODO show dialog explaining
+          AtlassianClientManager.openOAuth(atmosphere, newTeam.id, oauthMutationProps)
+          return
+        }
+      }
       submitMutation()
       ChangeTaskTeamMutation(atmosphere, {taskId, teamId: newTeam.id}, {onError, onCompleted})
     }

From 952ee951c09cae28e70eb8d34fecf6688fe95f0e Mon Sep 17 00:00:00 2001
From: Georg Bremer <github@dschoordsch.de>
Date: Mon, 1 Nov 2021 23:19:38 +0100
Subject: [PATCH 04/11] Fix TaskFooterTeamAssigneeMenu_task fragment

---
 .../OutcomeCardAssignMenu/TaskFooterTeamAssigneeMenu.tsx       | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/packages/client/modules/outcomeCard/components/OutcomeCardAssignMenu/TaskFooterTeamAssigneeMenu.tsx b/packages/client/modules/outcomeCard/components/OutcomeCardAssignMenu/TaskFooterTeamAssigneeMenu.tsx
index 9f355d99563..1ee651e66d4 100644
--- a/packages/client/modules/outcomeCard/components/OutcomeCardAssignMenu/TaskFooterTeamAssigneeMenu.tsx
+++ b/packages/client/modules/outcomeCard/components/OutcomeCardAssignMenu/TaskFooterTeamAssigneeMenu.tsx
@@ -126,6 +126,9 @@ export default createFragmentContainer(TaskFooterTeamAssigneeMenu, {
       team {
         id
       }
+      integration {
+        __typename
+      }
     }
   `
 })

From 10b24cf279dd6fe91cc386c768e9b16d87b28060 Mon Sep 17 00:00:00 2001
From: Georg Bremer <github@dschoordsch.de>
Date: Wed, 3 Nov 2021 13:40:52 +0100
Subject: [PATCH 05/11] Show add integration dialog when moving task to team
 w/o integration

Before trying to move an integrated task to another team, the client
side checks if the user has set up the correct integration for the
target team. If not a dialog is presented to the user to add it on the
spot.
---
 packages/client/hooks/useMenu.ts              |   3 +
 packages/client/hooks/useMenuPortal.tsx       |   3 +
 packages/client/hooks/useModal.ts             |   3 +
 packages/client/hooks/usePortal.tsx           |   9 +-
 .../TaskFooterTeamAssigneeAddGitHubDialog.tsx | 117 ++++++++++++++++++
 .../TaskFooterTeamAssigneeAddJiraDialog.tsx   | 117 ++++++++++++++++++
 .../TaskFooterTeamAssigneeMenu.tsx            |  74 +++++++++--
 .../TaskFooterTeamAssignee.tsx                |   4 +-
 8 files changed, 314 insertions(+), 16 deletions(-)
 create mode 100644 packages/client/modules/outcomeCard/components/OutcomeCardAssignMenu/TaskFooterTeamAssigneeAddGitHubDialog.tsx
 create mode 100644 packages/client/modules/outcomeCard/components/OutcomeCardAssignMenu/TaskFooterTeamAssigneeAddJiraDialog.tsx

diff --git a/packages/client/hooks/useMenu.ts b/packages/client/hooks/useMenu.ts
index bde02b8b6f4..9102c6c724e 100644
--- a/packages/client/hooks/useMenu.ts
+++ b/packages/client/hooks/useMenu.ts
@@ -18,6 +18,9 @@ export interface MenuProps {
   isDropdown: boolean
 }
 
+/**
+ * Wrapper around {@link usePortal} to display menus
+ */
 const useMenu = <T extends HTMLElement = HTMLButtonElement>(
   preferredMenuPosition: MenuPosition,
   options: Options = {}
diff --git a/packages/client/hooks/useMenuPortal.tsx b/packages/client/hooks/useMenuPortal.tsx
index 14ee4e5a297..24bcf21335b 100644
--- a/packages/client/hooks/useMenuPortal.tsx
+++ b/packages/client/hooks/useMenuPortal.tsx
@@ -17,6 +17,9 @@ const MenuBlock = styled('div')({
   zIndex: ZIndex.MENU
 })
 
+/**
+ * Use a portal to display a menu, you usually want to use {@link useMenu} instead
+ */
 const useMenuPortal = (
   portal: (el: ReactElement) => ReactPortal | null,
   targetRef: RefObject<HTMLDivElement>,
diff --git a/packages/client/hooks/useModal.ts b/packages/client/hooks/useModal.ts
index d4e85ed36a8..2660c681489 100644
--- a/packages/client/hooks/useModal.ts
+++ b/packages/client/hooks/useModal.ts
@@ -9,6 +9,9 @@ interface Options extends UsePortalOptions {
   noClose?: boolean
 }
 
+/**
+ * Wrapper around {@link usePortal} for displaying dialogs
+ */
 const useModal = (options: Options = {}) => {
   const {background, onOpen, onClose, noClose, id, parentId} = options
   const targetRef = useRef<HTMLDivElement>(null)
diff --git a/packages/client/hooks/usePortal.tsx b/packages/client/hooks/usePortal.tsx
index 380fd0625bd..1319c223662 100644
--- a/packages/client/hooks/usePortal.tsx
+++ b/packages/client/hooks/usePortal.tsx
@@ -17,6 +17,7 @@ export interface UsePortalOptions {
   onOpen?: (el: HTMLElement) => void
   onClose?: () => void
   id?: string
+  // if you nest portals, this should be the id of the parent portal
   parentId?: string
   // allow body to scroll while modal is open
   allowScroll?: boolean
@@ -30,6 +31,10 @@ const getParent = (parentId: string | undefined) => {
   return parent
 }
 
+/**
+ * Create and manage a React.Portal to display nodes outside the DOM. Manages Keyboard presses etc.
+ * To nest multiple portals, the outer one should have id set and the inner one parentId
+ */
 const usePortal = (options: UsePortalOptions = {}) => {
   const portalRef = useRef<HTMLDivElement>()
   const originRef = useRef<HTMLElement>()
@@ -134,10 +139,10 @@ const usePortal = (options: UsePortalOptions = {}) => {
       portalRef.current = document.createElement('div')
       portalRef.current.id = options.id || 'portal'
       getParent(options.parentId).appendChild(portalRef.current)
-      if (e && e.currentTarget) {
+      if (e?.currentTarget) {
         originRef.current = e.currentTarget as HTMLElement
       }
-      options.onOpen && options.onOpen(portalRef.current)
+      options.onOpen?.(portalRef.current)
     }
   })
 
diff --git a/packages/client/modules/outcomeCard/components/OutcomeCardAssignMenu/TaskFooterTeamAssigneeAddGitHubDialog.tsx b/packages/client/modules/outcomeCard/components/OutcomeCardAssignMenu/TaskFooterTeamAssigneeAddGitHubDialog.tsx
new file mode 100644
index 00000000000..e5aaba7a8f3
--- /dev/null
+++ b/packages/client/modules/outcomeCard/components/OutcomeCardAssignMenu/TaskFooterTeamAssigneeAddGitHubDialog.tsx
@@ -0,0 +1,117 @@
+import React from 'react'
+import {PALETTE} from '~/styles/paletteV3'
+import {ICON_SIZE} from '~/styles/typographyV2'
+import styled from '@emotion/styled'
+import Icon from '~/components/Icon'
+import DialogContainer from '~/components/DialogContainer'
+import DialogTitle from '~/components/DialogTitle'
+import SecondaryButton from '~/components/SecondaryButton'
+import useAtmosphere from '~/hooks/useAtmosphere'
+import useMutationProps from '~/hooks/useMutationProps'
+import PrimaryButton from '~/components/PrimaryButton'
+import DialogContent from '~/components/DialogContent'
+import GitHubClientManager from '~/utils/GitHubClientManager'
+
+interface Props {
+  onClose: () => void
+  onIntegrationAdded: () => void
+  teamId: string
+  teamName: string
+}
+
+const StyledDialogContainer = styled(DialogContainer)({
+  width: 480
+})
+
+const ButtonGroup = styled('div')({
+  marginTop: '24px',
+  display: 'flex',
+  justifyContent: 'flex-end'
+})
+
+const StyledTip = styled('p')({
+  fontSize: 13,
+  lineHeight: '16px',
+  margin: 0,
+  padding: '0 0 16px'
+})
+
+const ErrorWrapper = styled('div')({
+  alignItems: 'center',
+  color: PALETTE.TOMATO_500,
+  display: 'flex',
+  padding: 8,
+  marginTop: 8,
+  width: '100%'
+})
+
+const StyledIcon = styled(Icon)({
+  color: PALETTE.TOMATO_500,
+  fontSize: ICON_SIZE.MD24,
+  marginRight: 8
+})
+
+const StyledPrimaryButton = styled(PrimaryButton)({
+  marginLeft: 16
+})
+
+const Label = styled('div')({
+  fontSize: 14,
+  fontWeight: 600
+})
+
+const TaskFooterTeamAssigneeAddGitHubDialog = (props: Props) => {
+  const {onClose, onIntegrationAdded, teamId, teamName} = props
+  const atmosphere = useAtmosphere()
+  const {submitting, onError, onCompleted, submitMutation, error} = useMutationProps()
+
+  const onAddIntegrationClicked = () => {
+    const onOAuthCompleted = () => {
+      onIntegrationAdded()
+      onCompleted()
+    }
+    GitHubClientManager.openOAuth(atmosphere, teamId, {
+      onCompleted: onOAuthCompleted,
+      onError,
+      submitMutation,
+      submitting
+    })
+  }
+
+  return (
+    <StyledDialogContainer>
+      <DialogTitle>GitHub integration for {teamName}</DialogTitle>
+      <DialogContent>
+        <div>
+          <StyledTip>
+            You do not have GitHub configured for {teamName}, do you want to add it now?
+          </StyledTip>
+
+          {error && (
+            <ErrorWrapper>
+              <StyledIcon>
+                <Icon>{'error'}</Icon>
+              </StyledIcon>
+              <Label>{error.message}</Label>
+            </ErrorWrapper>
+          )}
+          <ButtonGroup>
+            <SecondaryButton onClick={onClose} size='medium' disabled={submitting}>
+              Cancel
+            </SecondaryButton>
+            <StyledPrimaryButton
+              onClick={onAddIntegrationClicked}
+              size='medium'
+              waiting={submitting}
+              disabled={submitting}
+            >
+              Add it now
+            </StyledPrimaryButton>
+          </ButtonGroup>
+        </div>
+      </DialogContent>
+    </StyledDialogContainer>
+  )
+}
+
+export default TaskFooterTeamAssigneeAddGitHubDialog
diff --git a/packages/client/modules/outcomeCard/components/OutcomeCardAssignMenu/TaskFooterTeamAssigneeAddJiraDialog.tsx b/packages/client/modules/outcomeCard/components/OutcomeCardAssignMenu/TaskFooterTeamAssigneeAddJiraDialog.tsx
new file mode 100644
index 00000000000..61fbb30ab7d
--- /dev/null
+++ b/packages/client/modules/outcomeCard/components/OutcomeCardAssignMenu/TaskFooterTeamAssigneeAddJiraDialog.tsx
@@ -0,0 +1,117 @@
+import React from 'react'
+import {PALETTE} from '~/styles/paletteV3'
+import {ICON_SIZE} from '~/styles/typographyV2'
+import styled from '@emotion/styled'
+import Icon from '~/components/Icon'
+import DialogContainer from '~/components/DialogContainer'
+import DialogTitle from '~/components/DialogTitle'
+import SecondaryButton from '~/components/SecondaryButton'
+import useAtmosphere from '~/hooks/useAtmosphere'
+import useMutationProps from '~/hooks/useMutationProps'
+import PrimaryButton from '~/components/PrimaryButton'
+import DialogContent from '~/components/DialogContent'
+import AtlassianClientManager from '~/utils/AtlassianClientManager'
+
+interface Props {
+  onClose: () => void
+  onIntegrationAdded: () => void
+  teamId: string
+  teamName: string
+}
+
+const StyledDialogContainer = styled(DialogContainer)({
+  width: 480
+})
+
+const ButtonGroup = styled('div')({
+  marginTop: '24px',
+  display: 'flex',
+  justifyContent: 'flex-end'
+})
+
+const StyledTip = styled('p')({
+  fontSize: 13,
+  lineHeight: '16px',
+  margin: 0,
+  padding: '0 0 16px'
+})
+
+const ErrorWrapper = styled('div')({
+  alignItems: 'center',
+  color: PALETTE.TOMATO_500,
+  display: 'flex',
+  padding: 8,
+  marginTop: 8,
+  width: '100%'
+})
+
+const StyledIcon = styled(Icon)({
+  color: PALETTE.TOMATO_500,
+  fontSize: ICON_SIZE.MD24,
+  marginRight: 8
+})
+
+const StyledPrimaryButton = styled(PrimaryButton)({
+  marginLeft: 16
+})
+
+const Label = styled('div')({
+  fontSize: 14,
+  fontWeight: 600
+})
+
+const TaskFooterTeamAssigneeAddJiraDialog = (props: Props) => {
+  const {onClose, onIntegrationAdded, teamId, teamName} = props
+  const atmosphere = useAtmosphere()
+  const {submitting, onError, onCompleted, submitMutation, error} = useMutationProps()
+
+  const onAddIntegrationClicked = () => {
+    const onOAuthCompleted = () => {
+      onIntegrationAdded()
+      onCompleted()
+    }
+    AtlassianClientManager.openOAuth(atmosphere, teamId, {
+      onCompleted: onOAuthCompleted,
+      onError,
+      submitMutation,
+      submitting
+    })
+  }
+
+  return (
+    <StyledDialogContainer>
+      <DialogTitle>Jira integration for {teamName}</DialogTitle>
+      <DialogContent>
+        <div>
+          <StyledTip>
+            You do not have Jira configured for {teamName}, do you want to add it now?
+          </StyledTip>
+
+          {error && (
+            <ErrorWrapper>
+              <StyledIcon>
+                <Icon>{'error'}</Icon>
+              </StyledIcon>
+              <Label>{error.message}</Label>
+            </ErrorWrapper>
+          )}
+          <ButtonGroup>
+            <SecondaryButton onClick={onClose} size='medium' disabled={submitting}>
+              Cancel
+            </SecondaryButton>
+            <StyledPrimaryButton
+              onClick={onAddIntegrationClicked}
+              size='medium'
+              waiting={submitting}
+              disabled={submitting}
+            >
+              Add it now
+            </StyledPrimaryButton>
+          </ButtonGroup>
+        </div>
+      </DialogContent>
+    </StyledDialogContainer>
+  )
+}
+
+export default TaskFooterTeamAssigneeAddJiraDialog
diff --git a/packages/client/modules/outcomeCard/components/OutcomeCardAssignMenu/TaskFooterTeamAssigneeMenu.tsx b/packages/client/modules/outcomeCard/components/OutcomeCardAssignMenu/TaskFooterTeamAssigneeMenu.tsx
index 1ee651e66d4..95d0d85081e 100644
--- a/packages/client/modules/outcomeCard/components/OutcomeCardAssignMenu/TaskFooterTeamAssigneeMenu.tsx
+++ b/packages/client/modules/outcomeCard/components/OutcomeCardAssignMenu/TaskFooterTeamAssigneeMenu.tsx
@@ -1,6 +1,6 @@
 import {TaskFooterTeamAssigneeMenu_task} from '../../../../__generated__/TaskFooterTeamAssigneeMenu_task.graphql'
 import {TaskFooterTeamAssigneeMenu_viewer} from '../../../../__generated__/TaskFooterTeamAssigneeMenu_viewer.graphql'
-import React, {useMemo} from 'react'
+import React, {useMemo, useState} from 'react'
 import {createFragmentContainer} from 'react-relay'
 import graphql from 'babel-plugin-relay/macro'
 import DropdownMenuLabel from '../../../../components/DropdownMenuLabel'
@@ -12,8 +12,10 @@ import ChangeTaskTeamMutation from '../../../../mutations/ChangeTaskTeamMutation
 import useMutationProps from '../../../../hooks/useMutationProps'
 import {useUserTaskFilters} from '~/utils/useUserTaskFilters'
 import {TaskFooterTeamAssigneeMenu_viewerIntegrationsQuery} from '~/__generated__/TaskFooterTeamAssigneeMenu_viewerIntegrationsQuery.graphql'
-import GitHubClientManager from '~/utils/GitHubClientManager'
-import AtlassianClientManager from '~/utils/AtlassianClientManager'
+import useModal from '~/hooks/useModal'
+import TaskFooterTeamAssigneeAddGitHubDialog from './TaskFooterTeamAssigneeAddGitHubDialog'
+import TaskFooterTeamAssigneeAddJiraDialog from './TaskFooterTeamAssigneeAddJiraDialog'
+import useEventCallback from '~/hooks/useEventCallback'
 
 const query = graphql`
   query TaskFooterTeamAssigneeMenu_viewerIntegrationsQuery($teamId: ID!) {
@@ -65,9 +67,34 @@ const TaskFooterTeamAssigneeMenu = (props: Props) => {
 
   const atmosphere = useAtmosphere()
   const {submitting, submitMutation, onError, onCompleted} = useMutationProps()
-  const oauthMutationProps = useMutationProps()
+
+  const onDialogClose = useEventCallback(() => {
+    menuProps.closePortal()
+  })
+  const {modalPortal, openPortal, closePortal} = useModal({
+    onClose: onDialogClose,
+    id: 'taskFooterTeamAssigneeAddGitHub',
+    parentId: 'taskFooterTeamAssigneeMenu'
+  })
+  const [newTeam, setNewTeam] = useState({id: '', name: ''})
+
+  const handleIntegrationAdded = () => {
+    closePortal()
+    if (!newTeam.id) return
+
+    submitMutation()
+    ChangeTaskTeamMutation(atmosphere, {taskId, teamId: newTeam.id}, {onError, onCompleted})
+    setNewTeam({id: '', name: ''})
+    menuProps.closePortal()
+  }
+  const handleClose = () => {
+    closePortal()
+    menuProps.closePortal()
+  }
+
   const handleTaskUpdate = (newTeam) => async () => {
     if (!submitting && teamId !== newTeam.id) {
+      setNewTeam(newTeam)
       if (isGitHubTask || isJiraTask) {
         const result = await atmosphere.fetchQuery<
           TaskFooterTeamAssigneeMenu_viewerIntegrationsQuery
@@ -76,19 +103,14 @@ const TaskFooterTeamAssigneeMenu = (props: Props) => {
         })
         const {github, atlassian} = result?.viewer?.teamMember?.integrations ?? {}
 
-        if (isGitHubTask && !github?.isActive) {
-          // TODO show dialog explaining
-          GitHubClientManager.openOAuth(atmosphere, newTeam.id, oauthMutationProps)
-          return
-        }
-        if (isJiraTask && !atlassian?.isActive) {
-          // TODO show dialog explaining
-          AtlassianClientManager.openOAuth(atmosphere, newTeam.id, oauthMutationProps)
+        if ((isGitHubTask && !github?.isActive) || (isJiraTask && !atlassian?.isActive)) {
+          openPortal()
           return
         }
       }
       submitMutation()
       ChangeTaskTeamMutation(atmosphere, {taskId, teamId: newTeam.id}, {onError, onCompleted})
+      menuProps.closePortal()
     }
   }
 
@@ -100,8 +122,34 @@ const TaskFooterTeamAssigneeMenu = (props: Props) => {
     >
       <DropdownMenuLabel>Move to:</DropdownMenuLabel>
       {assignableTeams.map((team) => {
-        return <MenuItem key={team.id} label={team.name} onClick={handleTaskUpdate(team)} />
+        return (
+          <MenuItem
+            key={team.id}
+            label={team.name}
+            onClick={handleTaskUpdate(team)}
+            noCloseOnClick
+          />
+        )
       })}
+      {modalPortal(
+        isGitHubTask ? (
+          <TaskFooterTeamAssigneeAddGitHubDialog
+            onClose={handleClose}
+            onIntegrationAdded={handleIntegrationAdded}
+            teamId={newTeam.id}
+            teamName={newTeam.name}
+          />
+        ) : isJiraTask ? (
+          <TaskFooterTeamAssigneeAddJiraDialog
+            onClose={handleClose}
+            onIntegrationAdded={handleIntegrationAdded}
+            teamId={newTeam.id}
+            teamName={newTeam.name}
+          />
+        ) : (
+          undefined
+        )
+      )}
     </Menu>
   )
 }
diff --git a/packages/client/modules/outcomeCard/components/OutcomeCardFooter/TaskFooterTeamAssignee.tsx b/packages/client/modules/outcomeCard/components/OutcomeCardFooter/TaskFooterTeamAssignee.tsx
index 7bbc3550ebf..7a1615c77c2 100644
--- a/packages/client/modules/outcomeCard/components/OutcomeCardFooter/TaskFooterTeamAssignee.tsx
+++ b/packages/client/modules/outcomeCard/components/OutcomeCardFooter/TaskFooterTeamAssignee.tsx
@@ -59,7 +59,9 @@ const TaskFooterTeamAssignee = (props: Props) => {
   const {canAssign, task, useTaskChild} = props
   const {team} = task
   const {name: teamName} = team
-  const {togglePortal, originRef, menuPortal, menuProps} = useMenu(MenuPosition.UPPER_LEFT)
+  const {togglePortal, originRef, menuPortal, menuProps} = useMenu(MenuPosition.UPPER_LEFT, {
+    id: 'taskFooterTeamAssigneeMenu'
+  })
   const {tooltipPortal, openTooltip, closeTooltip, originRef: tipRef} = useTooltip<HTMLDivElement>(
     MenuPosition.UPPER_CENTER
   )

From 69739604da20e13fceb1f611de592869357dad7c Mon Sep 17 00:00:00 2001
From: Georg Bremer <github@dschoordsch.de>
Date: Fri, 5 Nov 2021 11:10:55 +0100
Subject: [PATCH 06/11] Polish add integration now dialog

---
 .../TaskFooterTeamAssigneeAddGitHubDialog.tsx               | 6 +++---
 .../TaskFooterTeamAssigneeAddJiraDialog.tsx                 | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/packages/client/modules/outcomeCard/components/OutcomeCardAssignMenu/TaskFooterTeamAssigneeAddGitHubDialog.tsx b/packages/client/modules/outcomeCard/components/OutcomeCardAssignMenu/TaskFooterTeamAssigneeAddGitHubDialog.tsx
index e5aaba7a8f3..4d27fe4d30f 100644
--- a/packages/client/modules/outcomeCard/components/OutcomeCardAssignMenu/TaskFooterTeamAssigneeAddGitHubDialog.tsx
+++ b/packages/client/modules/outcomeCard/components/OutcomeCardAssignMenu/TaskFooterTeamAssigneeAddGitHubDialog.tsx
@@ -30,8 +30,8 @@ const ButtonGroup = styled('div')({
 })
 
 const StyledTip = styled('p')({
-  fontSize: 13,
-  lineHeight: '16px',
+  fontSize: 14,
+  lineHeight: '20px',
   margin: 0,
   padding: '0 0 16px'
 })
@@ -84,7 +84,7 @@ const TaskFooterTeamAssigneeAddGitHubDialog = (props: Props) => {
       <DialogContent>
         <div>
           <StyledTip>
-            You do not have GitHub configured for {teamName}, do you want to add it now?
+            You don't have GitHub configured for {teamName}. Do you want to add it now?
           </StyledTip>
 
           {error && (
diff --git a/packages/client/modules/outcomeCard/components/OutcomeCardAssignMenu/TaskFooterTeamAssigneeAddJiraDialog.tsx b/packages/client/modules/outcomeCard/components/OutcomeCardAssignMenu/TaskFooterTeamAssigneeAddJiraDialog.tsx
index 61fbb30ab7d..68f46be2ee9 100644
--- a/packages/client/modules/outcomeCard/components/OutcomeCardAssignMenu/TaskFooterTeamAssigneeAddJiraDialog.tsx
+++ b/packages/client/modules/outcomeCard/components/OutcomeCardAssignMenu/TaskFooterTeamAssigneeAddJiraDialog.tsx
@@ -30,8 +30,8 @@ const ButtonGroup = styled('div')({
 })
 
 const StyledTip = styled('p')({
-  fontSize: 13,
-  lineHeight: '16px',
+  fontSize: 14,
+  lineHeight: '20px',
   margin: 0,
   padding: '0 0 16px'
 })
@@ -84,7 +84,7 @@ const TaskFooterTeamAssigneeAddJiraDialog = (props: Props) => {
       <DialogContent>
         <div>
           <StyledTip>
-            You do not have Jira configured for {teamName}, do you want to add it now?
+            You don't have Jira configured for {teamName}. Do you want to add it now?
           </StyledTip>
 
           {error && (

From cc7d17290978ad87afb5fca0c83287b772f1e179 Mon Sep 17 00:00:00 2001
From: Georg Bremer <github@dschoordsch.de>
Date: Mon, 8 Nov 2021 20:07:56 +0100
Subject: [PATCH 07/11] Cleanup

---
 packages/client/hooks/usePortal.tsx           |  2 +-
 .../TaskFooterTeamAssigneeMenu.tsx            | 35 +++++++++++--------
 .../TaskFooterTeamAssignee.tsx                | 32 +++++++++--------
 .../graphql/mutations/changeTaskTeam.ts       | 12 +++----
 4 files changed, 45 insertions(+), 36 deletions(-)

diff --git a/packages/client/hooks/usePortal.tsx b/packages/client/hooks/usePortal.tsx
index 6e9671b6d84..a1872883682 100644
--- a/packages/client/hooks/usePortal.tsx
+++ b/packages/client/hooks/usePortal.tsx
@@ -27,7 +27,7 @@ export type PortalId =
   | 'StageTimerEndTimePicker'
   | 'StageTimerStartTimePicker'
   | 'StageTimerMinutePicker'
-  | 'taskFooterTeamAssigneeAddGitHub'
+  | 'taskFooterTeamAssigneeAddIntegration'
   | 'taskFooterTeamAssigneeMenu'
 
 export interface UsePortalOptions {
diff --git a/packages/client/modules/outcomeCard/components/OutcomeCardAssignMenu/TaskFooterTeamAssigneeMenu.tsx b/packages/client/modules/outcomeCard/components/OutcomeCardAssignMenu/TaskFooterTeamAssigneeMenu.tsx
index 95d0d85081e..630d8cb941b 100644
--- a/packages/client/modules/outcomeCard/components/OutcomeCardAssignMenu/TaskFooterTeamAssigneeMenu.tsx
+++ b/packages/client/modules/outcomeCard/components/OutcomeCardAssignMenu/TaskFooterTeamAssigneeMenu.tsx
@@ -45,6 +45,7 @@ interface Props {
 
 const TaskFooterTeamAssigneeMenu = (props: Props) => {
   const {menuProps, task, viewer} = props
+  const {closePortal: closeTeamAssigneeMenu} = menuProps
   const {userIds, teamIds} = useUserTaskFilters(viewer.id)
   const {team, id: taskId, integration} = task
   const isGitHubTask = integration?.__typename === '_xGitHubIssue'
@@ -69,48 +70,52 @@ const TaskFooterTeamAssigneeMenu = (props: Props) => {
   const {submitting, submitMutation, onError, onCompleted} = useMutationProps()
 
   const onDialogClose = useEventCallback(() => {
-    menuProps.closePortal()
+    closeTeamAssigneeMenu()
   })
-  const {modalPortal, openPortal, closePortal} = useModal({
+  const {
+    modalPortal: addIntegrationModalPortal,
+    openPortal: openAddIntegrationPortal,
+    closePortal: closeAddIntegrationPortal
+  } = useModal({
     onClose: onDialogClose,
-    id: 'taskFooterTeamAssigneeAddGitHub',
+    id: 'taskFooterTeamAssigneeAddIntegration',
     parentId: 'taskFooterTeamAssigneeMenu'
   })
   const [newTeam, setNewTeam] = useState({id: '', name: ''})
 
   const handleIntegrationAdded = () => {
-    closePortal()
+    closeAddIntegrationPortal()
     if (!newTeam.id) return
 
     submitMutation()
     ChangeTaskTeamMutation(atmosphere, {taskId, teamId: newTeam.id}, {onError, onCompleted})
     setNewTeam({id: '', name: ''})
-    menuProps.closePortal()
+    closeTeamAssigneeMenu()
   }
   const handleClose = () => {
-    closePortal()
-    menuProps.closePortal()
+    closeAddIntegrationPortal()
+    closeTeamAssigneeMenu()
   }
 
-  const handleTaskUpdate = (newTeam) => async () => {
-    if (!submitting && teamId !== newTeam.id) {
-      setNewTeam(newTeam)
+  const handleTaskUpdate = (nextTeam: typeof newTeam) => async () => {
+    if (!submitting && teamId !== nextTeam.id) {
+      setNewTeam(nextTeam)
       if (isGitHubTask || isJiraTask) {
         const result = await atmosphere.fetchQuery<
           TaskFooterTeamAssigneeMenu_viewerIntegrationsQuery
         >(query, {
-          teamId: newTeam.id
+          teamId: nextTeam.id
         })
         const {github, atlassian} = result?.viewer?.teamMember?.integrations ?? {}
 
         if ((isGitHubTask && !github?.isActive) || (isJiraTask && !atlassian?.isActive)) {
-          openPortal()
+          openAddIntegrationPortal()
           return
         }
       }
       submitMutation()
-      ChangeTaskTeamMutation(atmosphere, {taskId, teamId: newTeam.id}, {onError, onCompleted})
-      menuProps.closePortal()
+      ChangeTaskTeamMutation(atmosphere, {taskId, teamId: nextTeam.id}, {onError, onCompleted})
+      closeTeamAssigneeMenu()
     }
   }
 
@@ -131,7 +136,7 @@ const TaskFooterTeamAssigneeMenu = (props: Props) => {
           />
         )
       })}
-      {modalPortal(
+      {addIntegrationModalPortal(
         isGitHubTask ? (
           <TaskFooterTeamAssigneeAddGitHubDialog
             onClose={handleClose}
diff --git a/packages/client/modules/outcomeCard/components/OutcomeCardFooter/TaskFooterTeamAssignee.tsx b/packages/client/modules/outcomeCard/components/OutcomeCardFooter/TaskFooterTeamAssignee.tsx
index 7a1615c77c2..ea4598c84b0 100644
--- a/packages/client/modules/outcomeCard/components/OutcomeCardFooter/TaskFooterTeamAssignee.tsx
+++ b/packages/client/modules/outcomeCard/components/OutcomeCardFooter/TaskFooterTeamAssignee.tsx
@@ -1,7 +1,7 @@
 import styled from '@emotion/styled'
 import graphql from 'babel-plugin-relay/macro'
 import React from 'react'
-import {createFragmentContainer} from 'react-relay'
+import {useFragment} from 'react-relay'
 import useTooltip from '~/hooks/useTooltip'
 import CardButton from '../../../../components/CardButton'
 import {MenuPosition} from '../../../../hooks/useCoords'
@@ -11,7 +11,7 @@ import textOverflow from '../../../../styles/helpers/textOverflow'
 import {PALETTE} from '../../../../styles/paletteV3'
 import {Radius} from '../../../../types/constEnums'
 import lazyPreload from '../../../../utils/lazyPreload'
-import {TaskFooterTeamAssignee_task} from '../../../../__generated__/TaskFooterTeamAssignee_task.graphql'
+import {TaskFooterTeamAssignee_task$key} from '../../../../__generated__/TaskFooterTeamAssignee_task.graphql'
 
 const TooltipToggle = styled('div')({
   width: '100%'
@@ -45,7 +45,7 @@ const TeamToggleButton = styled(CardButton)({
 
 interface Props {
   canAssign: boolean
-  task: TaskFooterTeamAssignee_task
+  task: TaskFooterTeamAssignee_task$key
   useTaskChild: UseTaskChild
 }
 
@@ -56,7 +56,20 @@ const TaskFooterTeamAssigneeMenuRoot = lazyPreload(() =>
 )
 
 const TaskFooterTeamAssignee = (props: Props) => {
-  const {canAssign, task, useTaskChild} = props
+  const {canAssign, task: taskRef, useTaskChild} = props
+
+  const task = useFragment(
+    graphql`
+      fragment TaskFooterTeamAssignee_task on Task {
+        ...TaskFooterTeamAssigneeMenu_task
+        team {
+          name
+        }
+      }
+    `,
+    taskRef
+  )
+
   const {team} = task
   const {name: teamName} = team
   const {togglePortal, originRef, menuPortal, menuProps} = useMenu(MenuPosition.UPPER_LEFT, {
@@ -90,13 +103,4 @@ const TaskFooterTeamAssignee = (props: Props) => {
   )
 }
 
-export default createFragmentContainer(TaskFooterTeamAssignee, {
-  task: graphql`
-    fragment TaskFooterTeamAssignee_task on Task {
-      ...TaskFooterTeamAssigneeMenu_task
-      team {
-        name
-      }
-    }
-  `
-})
+export default TaskFooterTeamAssignee
diff --git a/packages/server/graphql/mutations/changeTaskTeam.ts b/packages/server/graphql/mutations/changeTaskTeam.ts
index a2df9ce9277..7e5c96afa39 100644
--- a/packages/server/graphql/mutations/changeTaskTeam.ts
+++ b/packages/server/graphql/mutations/changeTaskTeam.ts
@@ -1,6 +1,7 @@
 import {GraphQLID, GraphQLNonNull} from 'graphql'
 import {SubscriptionChannel} from 'parabol-client/types/constEnums'
 import removeEntityKeepText from 'parabol-client/utils/draftjs/removeEntityKeepText'
+import Task from '../../database/types/Task'
 import getRethink from '../../database/rethinkDriver'
 import generateUID from '../../generateUID'
 import {getUserId, isTeamMember} from '../../utils/authorization'
@@ -86,7 +87,8 @@ export default {
           .table('Task')
           .getAll(task.integrationHash, {index: 'integrationHash'})
           .filter({teamId})
-          .delete({returnChanges: true}),
+          .delete({returnChanges: true})('changes')(0)('old_val')
+          .default(null),
       newTask: r
         .table('Task')
         .get(taskId)
@@ -109,10 +111,8 @@ export default {
         })
     }).run()
 
-    const deletedTasks = (deletedConflictingIntegrationTask as any)?.changes?.map(
-      ({old_val}) => old_val
-    )
-    deletedTasks?.forEach((task) => {
+    if (deletedConflictingIntegrationTask) {
+      const task = (deletedConflictingIntegrationTask as unknown) as Task
       const isPrivate = task.tags.includes('private')
       const data = {task}
       newTeamMembers.forEach(({userId}) => {
@@ -120,7 +120,7 @@ export default {
           publish(SubscriptionChannel.TASK, userId, 'DeleteTaskPayload', data, subOptions)
         }
       })
-    })
+    }
 
     const isPrivate = tags.includes('private')
     const data = {taskId}

From aaa72be1d60ac3c787392e262131d7997a803c43 Mon Sep 17 00:00:00 2001
From: Georg Bremer <github@dschoordsch.de>
Date: Tue, 9 Nov 2021 11:57:08 +0100
Subject: [PATCH 08/11] Copy integration first before moving a task to a
 different team

If a task is integrated and the user does not have an integration set up
for the target team, then copy their source teams integration over.

If they have neither source nor target team integration and the task was
pushed by someone else, then check if their integration is present in
target team and use that.
---
 docs/integrations.md                          | 26 +++++++
 packages/client/types/graphql.ts              |  2 +-
 .../graphql/mutations/changeTaskTeam.ts       | 67 ++++++++++++++++++-
 3 files changed, 92 insertions(+), 3 deletions(-)
 create mode 100644 docs/integrations.md

diff --git a/docs/integrations.md b/docs/integrations.md
new file mode 100644
index 00000000000..979a6abc7e9
--- /dev/null
+++ b/docs/integrations.md
@@ -0,0 +1,26 @@
+# Integrations
+
+## Jira and GitHub
+
+Some guidelines how we handle the user's integration of GitHub or Jira, especially in which cases the user's authentication might be used by someone else than the user.
+
+A user's integration might only be reused by someone else if the user previously connected the task with their credentials in some form.
+If a user has an integration set up, their authentication is used to perform actions with tasks.
+In some cases if the user has no integration set up, we will fall back to the assignee's authentication.
+
+This is how it should be in the future and does not necessarily reflect current state:
+
+- [ ] **reading** a task uses **any team member's auth**
+      in the preferred order of:
+  - `task.integration?.accessUserId`
+  - fallback to viewer
+  - fallback to the team lead (reason being is a team lead is less likely to leave a team. maybe this is too optimistic?)
+  - fallback to any other member
+- [x] **pushing a task** requires **viewer auth or assignee's auth**, but in both cases a comment will be added if viewer !== assignee
+- [x] adding tasks in **scoping** requires **viewer's auth**
+- [ ] adding task **estimates** uses **viewer's auth or assignee's auth** (Most likely just added in scoping by the assignee, but even when added to the board before it's little risk as estimating is a team activity)
+- [ ] **adding fields** to project requires **viewer's auth**
+- [ ] when **moving a task between teams** we check who's auth is used for this task
+  - if the viewer has an integration for the target team, use that
+  - else if `accessUserId === userId` (**viewer's auth** since switching teams is only allowed for viewer's own tasks), then we ask them to add the integration to the new team in UI and move it over automatically in server
+  - else if `accessUserId !== userId`, then we check if the user pushing the task initially has an integration set up for the target team and move the task if present, otherwise we report an error
diff --git a/packages/client/types/graphql.ts b/packages/client/types/graphql.ts
index cbd7dd789af..fa60a6af083 100644
--- a/packages/client/types/graphql.ts
+++ b/packages/client/types/graphql.ts
@@ -55240,7 +55240,7 @@ export interface IMutation {
   autoGroupReflections: IAutoGroupReflectionsPayload | null;
 
   /**
-   * Change the team a task is associated with
+   * Change the team a task is associated with. Also copy the viewers integration if necessary.
    */
   changeTaskTeam: IChangeTaskTeamPayload | null;
 
diff --git a/packages/server/graphql/mutations/changeTaskTeam.ts b/packages/server/graphql/mutations/changeTaskTeam.ts
index 7e5c96afa39..47f797a3c61 100644
--- a/packages/server/graphql/mutations/changeTaskTeam.ts
+++ b/packages/server/graphql/mutations/changeTaskTeam.ts
@@ -9,10 +9,13 @@ import publish from '../../utils/publish'
 import standardError from '../../utils/standardError'
 import {GQLContext} from '../graphql'
 import ChangeTaskTeamPayload from '../types/ChangeTaskTeamPayload'
+import upsertAtlassianAuth from '../../postgres/queries/upsertAtlassianAuth'
+import upsertGitHubAuth from '../../postgres/queries/upsertGitHubAuth'
 
 export default {
   type: ChangeTaskTeamPayload,
-  description: 'Change the team a task is associated with',
+  description:
+    'Change the team a task is associated with. Also copy the viewers integration if necessary.',
   args: {
     taskId: {
       type: new GraphQLNonNull(GraphQLID),
@@ -55,7 +58,63 @@ export default {
       })
     }
 
+    // The task might have been pushed by someone else for viewer (`userId !== accessUserId`).
+    // In that case we still try to use the viewer's target team authentication, but fall back to the
+    // accessUser's in case it is present for the target team.
+    const [sourceTeamAuth, targetTeamAuth, accessUsersTargetTeamAuth] =
+      task.integration?.service === 'jira'
+        ? await Promise.all([
+            dataLoader.get('freshAtlassianAuth').load({teamId: task.teamId, userId: viewerId}),
+            dataLoader.get('freshAtlassianAuth').load({teamId, userId: viewerId}),
+            dataLoader
+              .get('freshAtlassianAuth')
+              .load({teamId, userId: task.integration.accessUserId})
+          ])
+        : task.integration?.service === 'github'
+        ? await Promise.all([
+            dataLoader.get('githubAuth').load({teamId: task.teamId, userId: viewerId}),
+            dataLoader.get('githubAuth').load({teamId, userId: viewerId}),
+            dataLoader.get('githubAuth').load({teamId, userId: task.integration.accessUserId})
+          ])
+        : [null, null]
+
+    if (task.integration && !targetTeamAuth && !sourceTeamAuth && !accessUsersTargetTeamAuth) {
+      return standardError(new Error('No valid integration found'), {
+        userId: viewerId
+      })
+    }
+
     // RESOLUTION
+    // Transfer integration to target team
+    let accessUserId: string | undefined
+    if (task.integration) {
+      if (sourceTeamAuth && !targetTeamAuth) {
+        if (task.integration.service === 'jira') {
+          await upsertAtlassianAuth({
+            ...sourceTeamAuth,
+            teamId
+          })
+          const data = {teamId, userId: viewerId}
+          publish(SubscriptionChannel.TEAM, teamId, 'AddAtlassianAuthPayload', data, subOptions)
+        }
+        if (task.integration.service === 'github') {
+          await upsertGitHubAuth({
+            ...sourceTeamAuth,
+            teamId
+          })
+          const data = {teamId, userId: viewerId}
+          publish(SubscriptionChannel.TEAM, teamId, 'AddGitHubAuthPayload', data, subOptions)
+        }
+        accessUserId = viewerId
+      } else if (targetTeamAuth) {
+        // in case the task was pushed by someone else before
+        accessUserId = viewerId
+      } else {
+        // the task might also be integrated and the accessUser has the integration set up for the target team, do nothing in that case
+        accessUserId = task.integration.accessUserId
+      }
+    }
+
     // filter mentions of old team members from task content
     const [oldTeamMembers, newTeamMembers] = await dataLoader
       .get('teamMembersByTeamId')
@@ -74,7 +133,11 @@ export default {
     const updates = {
       content: rawContent === nextRawContent ? undefined : JSON.stringify(nextRawContent),
       updatedAt: now,
-      teamId
+      teamId,
+      integration: task.integration && {
+        ...task.integration,
+        accessUserId
+      }
     }
 
     // If there is a task with the same integration hash in the new team, then delete it first.

From 5266696a3c9e49d9549693034a627d7e5d09ce06 Mon Sep 17 00:00:00 2001
From: Georg Bremer <github@dschoordsch.de>
Date: Tue, 9 Nov 2021 17:46:41 +0100
Subject: [PATCH 09/11] Don't start OAuth flow when moving a to another team
 w/o integration

Assume for now in the UI that a user has set up the integration for the
source team and that we can just transfer it over to the target team.
---
 .../TaskFooterTeamAssigneeAddGitHubDialog.tsx | 117 ------------------
 ...FooterTeamAssigneeAddIntegrationDialog.tsx |  64 ++++++++++
 .../TaskFooterTeamAssigneeAddJiraDialog.tsx   | 117 ------------------
 .../TaskFooterTeamAssigneeMenu.tsx            |  29 ++---
 4 files changed, 76 insertions(+), 251 deletions(-)
 delete mode 100644 packages/client/modules/outcomeCard/components/OutcomeCardAssignMenu/TaskFooterTeamAssigneeAddGitHubDialog.tsx
 create mode 100644 packages/client/modules/outcomeCard/components/OutcomeCardAssignMenu/TaskFooterTeamAssigneeAddIntegrationDialog.tsx
 delete mode 100644 packages/client/modules/outcomeCard/components/OutcomeCardAssignMenu/TaskFooterTeamAssigneeAddJiraDialog.tsx

diff --git a/packages/client/modules/outcomeCard/components/OutcomeCardAssignMenu/TaskFooterTeamAssigneeAddGitHubDialog.tsx b/packages/client/modules/outcomeCard/components/OutcomeCardAssignMenu/TaskFooterTeamAssigneeAddGitHubDialog.tsx
deleted file mode 100644
index 4d27fe4d30f..00000000000
--- a/packages/client/modules/outcomeCard/components/OutcomeCardAssignMenu/TaskFooterTeamAssigneeAddGitHubDialog.tsx
+++ /dev/null
@@ -1,117 +0,0 @@
-import React from 'react'
-import {PALETTE} from '~/styles/paletteV3'
-import {ICON_SIZE} from '~/styles/typographyV2'
-import styled from '@emotion/styled'
-import Icon from '~/components/Icon'
-import DialogContainer from '~/components/DialogContainer'
-import DialogTitle from '~/components/DialogTitle'
-import SecondaryButton from '~/components/SecondaryButton'
-import useAtmosphere from '~/hooks/useAtmosphere'
-import useMutationProps from '~/hooks/useMutationProps'
-import PrimaryButton from '~/components/PrimaryButton'
-import DialogContent from '~/components/DialogContent'
-import GitHubClientManager from '~/utils/GitHubClientManager'
-
-interface Props {
-  onClose: () => void
-  onIntegrationAdded: () => void
-  teamId: string
-  teamName: string
-}
-
-const StyledDialogContainer = styled(DialogContainer)({
-  width: 480
-})
-
-const ButtonGroup = styled('div')({
-  marginTop: '24px',
-  display: 'flex',
-  justifyContent: 'flex-end'
-})
-
-const StyledTip = styled('p')({
-  fontSize: 14,
-  lineHeight: '20px',
-  margin: 0,
-  padding: '0 0 16px'
-})
-
-const ErrorWrapper = styled('div')({
-  alignItems: 'center',
-  color: PALETTE.TOMATO_500,
-  display: 'flex',
-  padding: 8,
-  marginTop: 8,
-  width: '100%'
-})
-
-const StyledIcon = styled(Icon)({
-  color: PALETTE.TOMATO_500,
-  fontSize: ICON_SIZE.MD24,
-  marginRight: 8
-})
-
-const StyledPrimaryButton = styled(PrimaryButton)({
-  marginLeft: 16
-})
-
-const Label = styled('div')({
-  fontSize: 14,
-  fontWeight: 600
-})
-
-const TaskFooterTeamAssigneeAddGitHubDialog = (props: Props) => {
-  const {onClose, onIntegrationAdded, teamId, teamName} = props
-  const atmosphere = useAtmosphere()
-  const {submitting, onError, onCompleted, submitMutation, error} = useMutationProps()
-
-  const onAddIntegrationClicked = () => {
-    const onOAuthCompleted = () => {
-      onIntegrationAdded()
-      onCompleted()
-    }
-    GitHubClientManager.openOAuth(atmosphere, teamId, {
-      onCompleted: onOAuthCompleted,
-      onError,
-      submitMutation,
-      submitting
-    })
-  }
-
-  return (
-    <StyledDialogContainer>
-      <DialogTitle>GitHub integration for {teamName}</DialogTitle>
-      <DialogContent>
-        <div>
-          <StyledTip>
-            You don't have GitHub configured for {teamName}. Do you want to add it now?
-          </StyledTip>
-
-          {error && (
-            <ErrorWrapper>
-              <StyledIcon>
-                <Icon>{'error'}</Icon>
-              </StyledIcon>
-              <Label>{error.message}</Label>
-            </ErrorWrapper>
-          )}
-          <ButtonGroup>
-            <SecondaryButton onClick={onClose} size='medium' disabled={submitting}>
-              Cancel
-            </SecondaryButton>
-            <StyledPrimaryButton
-              onClick={onAddIntegrationClicked}
-              size='medium'
-              waiting={submitting}
-              disabled={submitting}
-            >
-              Add it now
-            </StyledPrimaryButton>
-          </ButtonGroup>
-        </div>
-      </DialogContent>
-    </StyledDialogContainer>
-  )
-}
-
-export default TaskFooterTeamAssigneeAddGitHubDialog
diff --git a/packages/client/modules/outcomeCard/components/OutcomeCardAssignMenu/TaskFooterTeamAssigneeAddIntegrationDialog.tsx b/packages/client/modules/outcomeCard/components/OutcomeCardAssignMenu/TaskFooterTeamAssigneeAddIntegrationDialog.tsx
new file mode 100644
index 00000000000..677181ad566
--- /dev/null
+++ b/packages/client/modules/outcomeCard/components/OutcomeCardAssignMenu/TaskFooterTeamAssigneeAddIntegrationDialog.tsx
@@ -0,0 +1,64 @@
+import React from 'react'
+import styled from '@emotion/styled'
+import DialogContainer from '~/components/DialogContainer'
+import DialogTitle from '~/components/DialogTitle'
+import SecondaryButton from '~/components/SecondaryButton'
+import PrimaryButton from '~/components/PrimaryButton'
+import DialogContent from '~/components/DialogContent'
+
+interface Props {
+  onClose: () => void
+  onConfirm: () => void
+  serviceName: string
+  teamName: string
+}
+
+const StyledDialogContainer = styled(DialogContainer)({
+  width: 480
+})
+
+const ButtonGroup = styled('div')({
+  marginTop: '24px',
+  display: 'flex',
+  justifyContent: 'flex-end'
+})
+
+const StyledTip = styled('p')({
+  fontSize: 14,
+  lineHeight: '20px',
+  margin: 0,
+  padding: '0 0 16px'
+})
+
+const StyledPrimaryButton = styled(PrimaryButton)({
+  marginLeft: 16
+})
+
+const TaskFooterTeamAssigneeAddIntegrationDialog = (props: Props) => {
+  const {onClose, onConfirm, serviceName, teamName} = props
+
+  return (
+    <StyledDialogContainer>
+      <DialogTitle>
+        {serviceName} integration for {teamName}
+      </DialogTitle>
+      <DialogContent>
+        <div>
+          <StyledTip>
+            You don't have {serviceName} configured for {teamName}. Do you want to add it now?
+          </StyledTip>
+          <ButtonGroup>
+            <SecondaryButton onClick={onClose} size='medium'>
+              Cancel
+            </SecondaryButton>
+            <StyledPrimaryButton onClick={onConfirm} size='medium'>
+              Add it now
+            </StyledPrimaryButton>
+          </ButtonGroup>
+        </div>
+      </DialogContent>
+    </StyledDialogContainer>
+  )
+}
+
+export default TaskFooterTeamAssigneeAddIntegrationDialog
diff --git a/packages/client/modules/outcomeCard/components/OutcomeCardAssignMenu/TaskFooterTeamAssigneeAddJiraDialog.tsx b/packages/client/modules/outcomeCard/components/OutcomeCardAssignMenu/TaskFooterTeamAssigneeAddJiraDialog.tsx
deleted file mode 100644
index 68f46be2ee9..00000000000
--- a/packages/client/modules/outcomeCard/components/OutcomeCardAssignMenu/TaskFooterTeamAssigneeAddJiraDialog.tsx
+++ /dev/null
@@ -1,117 +0,0 @@
-import React from 'react'
-import {PALETTE} from '~/styles/paletteV3'
-import {ICON_SIZE} from '~/styles/typographyV2'
-import styled from '@emotion/styled'
-import Icon from '~/components/Icon'
-import DialogContainer from '~/components/DialogContainer'
-import DialogTitle from '~/components/DialogTitle'
-import SecondaryButton from '~/components/SecondaryButton'
-import useAtmosphere from '~/hooks/useAtmosphere'
-import useMutationProps from '~/hooks/useMutationProps'
-import PrimaryButton from '~/components/PrimaryButton'
-import DialogContent from '~/components/DialogContent'
-import AtlassianClientManager from '~/utils/AtlassianClientManager'
-
-interface Props {
-  onClose: () => void
-  onIntegrationAdded: () => void
-  teamId: string
-  teamName: string
-}
-
-const StyledDialogContainer = styled(DialogContainer)({
-  width: 480
-})
-
-const ButtonGroup = styled('div')({
-  marginTop: '24px',
-  display: 'flex',
-  justifyContent: 'flex-end'
-})
-
-const StyledTip = styled('p')({
-  fontSize: 14,
-  lineHeight: '20px',
-  margin: 0,
-  padding: '0 0 16px'
-})
-
-const ErrorWrapper = styled('div')({
-  alignItems: 'center',
-  color: PALETTE.TOMATO_500,
-  display: 'flex',
-  padding: 8,
-  marginTop: 8,
-  width: '100%'
-})
-
-const StyledIcon = styled(Icon)({
-  color: PALETTE.TOMATO_500,
-  fontSize: ICON_SIZE.MD24,
-  marginRight: 8
-})
-
-const StyledPrimaryButton = styled(PrimaryButton)({
-  marginLeft: 16
-})
-
-const Label = styled('div')({
-  fontSize: 14,
-  fontWeight: 600
-})
-
-const TaskFooterTeamAssigneeAddJiraDialog = (props: Props) => {
-  const {onClose, onIntegrationAdded, teamId, teamName} = props
-  const atmosphere = useAtmosphere()
-  const {submitting, onError, onCompleted, submitMutation, error} = useMutationProps()
-
-  const onAddIntegrationClicked = () => {
-    const onOAuthCompleted = () => {
-      onIntegrationAdded()
-      onCompleted()
-    }
-    AtlassianClientManager.openOAuth(atmosphere, teamId, {
-      onCompleted: onOAuthCompleted,
-      onError,
-      submitMutation,
-      submitting
-    })
-  }
-
-  return (
-    <StyledDialogContainer>
-      <DialogTitle>Jira integration for {teamName}</DialogTitle>
-      <DialogContent>
-        <div>
-          <StyledTip>
-            You don't have Jira configured for {teamName}. Do you want to add it now?
-          </StyledTip>
-
-          {error && (
-            <ErrorWrapper>
-              <StyledIcon>
-                <Icon>{'error'}</Icon>
-              </StyledIcon>
-              <Label>{error.message}</Label>
-            </ErrorWrapper>
-          )}
-          <ButtonGroup>
-            <SecondaryButton onClick={onClose} size='medium' disabled={submitting}>
-              Cancel
-            </SecondaryButton>
-            <StyledPrimaryButton
-              onClick={onAddIntegrationClicked}
-              size='medium'
-              waiting={submitting}
-              disabled={submitting}
-            >
-              Add it now
-            </StyledPrimaryButton>
-          </ButtonGroup>
-        </div>
-      </DialogContent>
-    </StyledDialogContainer>
-  )
-}
-
-export default TaskFooterTeamAssigneeAddJiraDialog
diff --git a/packages/client/modules/outcomeCard/components/OutcomeCardAssignMenu/TaskFooterTeamAssigneeMenu.tsx b/packages/client/modules/outcomeCard/components/OutcomeCardAssignMenu/TaskFooterTeamAssigneeMenu.tsx
index 630d8cb941b..4f1ecd69725 100644
--- a/packages/client/modules/outcomeCard/components/OutcomeCardAssignMenu/TaskFooterTeamAssigneeMenu.tsx
+++ b/packages/client/modules/outcomeCard/components/OutcomeCardAssignMenu/TaskFooterTeamAssigneeMenu.tsx
@@ -13,8 +13,7 @@ import useMutationProps from '../../../../hooks/useMutationProps'
 import {useUserTaskFilters} from '~/utils/useUserTaskFilters'
 import {TaskFooterTeamAssigneeMenu_viewerIntegrationsQuery} from '~/__generated__/TaskFooterTeamAssigneeMenu_viewerIntegrationsQuery.graphql'
 import useModal from '~/hooks/useModal'
-import TaskFooterTeamAssigneeAddGitHubDialog from './TaskFooterTeamAssigneeAddGitHubDialog'
-import TaskFooterTeamAssigneeAddJiraDialog from './TaskFooterTeamAssigneeAddJiraDialog'
+import TaskFooterTeamAssigneeAddIntegrationDialog from './TaskFooterTeamAssigneeAddIntegrationDialog'
 import useEventCallback from '~/hooks/useEventCallback'
 
 const query = graphql`
@@ -83,7 +82,7 @@ const TaskFooterTeamAssigneeMenu = (props: Props) => {
   })
   const [newTeam, setNewTeam] = useState({id: '', name: ''})
 
-  const handleIntegrationAdded = () => {
+  const handleAddIntegrationConfirmed = () => {
     closeAddIntegrationPortal()
     if (!newTeam.id) return
 
@@ -99,7 +98,6 @@ const TaskFooterTeamAssigneeMenu = (props: Props) => {
 
   const handleTaskUpdate = (nextTeam: typeof newTeam) => async () => {
     if (!submitting && teamId !== nextTeam.id) {
-      setNewTeam(nextTeam)
       if (isGitHubTask || isJiraTask) {
         const result = await atmosphere.fetchQuery<
           TaskFooterTeamAssigneeMenu_viewerIntegrationsQuery
@@ -109,6 +107,12 @@ const TaskFooterTeamAssigneeMenu = (props: Props) => {
         const {github, atlassian} = result?.viewer?.teamMember?.integrations ?? {}
 
         if ((isGitHubTask && !github?.isActive) || (isJiraTask && !atlassian?.isActive)) {
+          // viewer is not integrated, now we have these options:
+          // 1) if user has integration in source team, then we will use that, but still ask
+          // 2) if accessUser is someone else and they have integration for target team, then we will use that without asking
+          // 3) else we need to ask the user to integrate with complete oauth flow
+          // For now ignore 2) and 3) and just assume it's 1) as that's the most common case.
+          setNewTeam(nextTeam)
           openAddIntegrationPortal()
           return
         }
@@ -137,22 +141,13 @@ const TaskFooterTeamAssigneeMenu = (props: Props) => {
         )
       })}
       {addIntegrationModalPortal(
-        isGitHubTask ? (
-          <TaskFooterTeamAssigneeAddGitHubDialog
+        (isGitHubTask || isJiraTask) && (
+          <TaskFooterTeamAssigneeAddIntegrationDialog
             onClose={handleClose}
-            onIntegrationAdded={handleIntegrationAdded}
-            teamId={newTeam.id}
+            onConfirm={handleAddIntegrationConfirmed}
+            serviceName={isGitHubTask ? 'GitHub' : 'Jira'}
             teamName={newTeam.name}
           />
-        ) : isJiraTask ? (
-          <TaskFooterTeamAssigneeAddJiraDialog
-            onClose={handleClose}
-            onIntegrationAdded={handleIntegrationAdded}
-            teamId={newTeam.id}
-            teamName={newTeam.name}
-          />
-        ) : (
-          undefined
         )
       )}
     </Menu>

From 6cf7590feec90cd92ae3fa1348ebc5bd38aea732 Mon Sep 17 00:00:00 2001
From: Georg Bremer <github@dschoordsch.de>
Date: Tue, 9 Nov 2021 17:51:12 +0100
Subject: [PATCH 10/11] Cleanup

---
 docs/integrations.md                          |  11 +-
 .../graphql/mutations/changeTaskTeam.ts       | 103 ++++++++----------
 2 files changed, 56 insertions(+), 58 deletions(-)

diff --git a/docs/integrations.md b/docs/integrations.md
index 979a6abc7e9..331f2e048ce 100644
--- a/docs/integrations.md
+++ b/docs/integrations.md
@@ -3,10 +3,15 @@
 ## Jira and GitHub
 
 Some guidelines how we handle the user's integration of GitHub or Jira, especially in which cases the user's authentication might be used by someone else than the user.
+There are up to 3 parties which can provide integration authentication for a task:
+
+- **viewer** - the user who is performing the action
+- **assignee** - the user assigned to the task
+- **access user** - the user who's credentials were used to add the integration to the task
 
 A user's integration might only be reused by someone else if the user previously connected the task with their credentials in some form.
 If a user has an integration set up, their authentication is used to perform actions with tasks.
-In some cases if the user has no integration set up, we will fall back to the assignee's authentication.
+In some cases if the user has no integration set up, we will fall back to the assignee's authentication or the access user's authentication.
 
 This is how it should be in the future and does not necessarily reflect current state:
 
@@ -18,9 +23,9 @@ This is how it should be in the future and does not necessarily reflect current
   - fallback to any other member
 - [x] **pushing a task** requires **viewer auth or assignee's auth**, but in both cases a comment will be added if viewer !== assignee
 - [x] adding tasks in **scoping** requires **viewer's auth**
-- [ ] adding task **estimates** uses **viewer's auth or assignee's auth** (Most likely just added in scoping by the assignee, but even when added to the board before it's little risk as estimating is a team activity)
+- [ ] adding task **estimates** uses **viewer's auth, assignee's auth or access user's auth** (Most likely just added in scoping by the assignee, but even when added to the board before it's little risk as estimating is a team activity)
 - [ ] **adding fields** to project requires **viewer's auth**
 - [ ] when **moving a task between teams** we check who's auth is used for this task
   - if the viewer has an integration for the target team, use that
   - else if `accessUserId === userId` (**viewer's auth** since switching teams is only allowed for viewer's own tasks), then we ask them to add the integration to the new team in UI and move it over automatically in server
-  - else if `accessUserId !== userId`, then we check if the user pushing the task initially has an integration set up for the target team and move the task if present, otherwise we report an error
+  - else if `accessUserId !== userId`, then we check if the **access user** has an integration set up for the target team and move the task if present, otherwise we report an error
diff --git a/packages/server/graphql/mutations/changeTaskTeam.ts b/packages/server/graphql/mutations/changeTaskTeam.ts
index 47f797a3c61..ec81589ec89 100644
--- a/packages/server/graphql/mutations/changeTaskTeam.ts
+++ b/packages/server/graphql/mutations/changeTaskTeam.ts
@@ -58,60 +58,56 @@ export default {
       })
     }
 
-    // The task might have been pushed by someone else for viewer (`userId !== accessUserId`).
-    // In that case we still try to use the viewer's target team authentication, but fall back to the
-    // accessUser's in case it is present for the target team.
-    const [sourceTeamAuth, targetTeamAuth, accessUsersTargetTeamAuth] =
-      task.integration?.service === 'jira'
-        ? await Promise.all([
-            dataLoader.get('freshAtlassianAuth').load({teamId: task.teamId, userId: viewerId}),
-            dataLoader.get('freshAtlassianAuth').load({teamId, userId: viewerId}),
-            dataLoader
-              .get('freshAtlassianAuth')
-              .load({teamId, userId: task.integration.accessUserId})
-          ])
-        : task.integration?.service === 'github'
-        ? await Promise.all([
-            dataLoader.get('githubAuth').load({teamId: task.teamId, userId: viewerId}),
-            dataLoader.get('githubAuth').load({teamId, userId: viewerId}),
-            dataLoader.get('githubAuth').load({teamId, userId: task.integration.accessUserId})
-          ])
-        : [null, null]
+    // RESOLUTION
 
-    if (task.integration && !targetTeamAuth && !sourceTeamAuth && !accessUsersTargetTeamAuth) {
-      return standardError(new Error('No valid integration found'), {
-        userId: viewerId
-      })
-    }
+    const {integration} = task
+    if (integration) {
+      // The task might have been pushed by someone else for viewer (`userId !== accessUserId`).
+      // In that case we still try to use the viewer's target team authentication, but fall back to the
+      // accessUser's in case it is present for the target team.
+      const authKeys = [
+        {teamId: task.teamId, userId: viewerId},
+        {teamId, userId: viewerId},
+        {teamId, userId: integration.accessUserId}
+      ]
+      const [sourceTeamAuth, targetTeamAuth, accessUsersTargetTeamAuth] =
+        task.integration?.service === 'jira'
+          ? await Promise.all(authKeys.map((key) => dataLoader.get('freshAtlassianAuth').load(key)))
+          : task.integration?.service === 'github'
+          ? await Promise.all(authKeys.map((key) => dataLoader.get('githubAuth').load(key)))
+          : authKeys.map(() => null)
 
-    // RESOLUTION
-    // Transfer integration to target team
-    let accessUserId: string | undefined
-    if (task.integration) {
-      if (sourceTeamAuth && !targetTeamAuth) {
-        if (task.integration.service === 'jira') {
-          await upsertAtlassianAuth({
-            ...sourceTeamAuth,
-            teamId
-          })
-          const data = {teamId, userId: viewerId}
-          publish(SubscriptionChannel.TEAM, teamId, 'AddAtlassianAuthPayload', data, subOptions)
-        }
-        if (task.integration.service === 'github') {
-          await upsertGitHubAuth({
-            ...sourceTeamAuth,
-            teamId
-          })
-          const data = {teamId, userId: viewerId}
-          publish(SubscriptionChannel.TEAM, teamId, 'AddGitHubAuthPayload', data, subOptions)
+      if (!targetTeamAuth && !sourceTeamAuth && !accessUsersTargetTeamAuth) {
+        return standardError(new Error('No valid integration found'), {
+          userId: viewerId
+        })
+      }
+
+      // Transfer integration to target team
+      if (task.integration) {
+        if (sourceTeamAuth && !targetTeamAuth) {
+          if (task.integration.service === 'jira') {
+            await upsertAtlassianAuth({
+              ...sourceTeamAuth,
+              teamId
+            })
+            const data = {teamId, userId: viewerId}
+            publish(SubscriptionChannel.TEAM, teamId, 'AddAtlassianAuthPayload', data, subOptions)
+          }
+          if (task.integration.service === 'github') {
+            await upsertGitHubAuth({
+              ...sourceTeamAuth,
+              teamId
+            })
+            const data = {teamId, userId: viewerId}
+            publish(SubscriptionChannel.TEAM, teamId, 'AddGitHubAuthPayload', data, subOptions)
+          }
+          integration.accessUserId = viewerId
+        } else if (targetTeamAuth) {
+          // in case the task was pushed by someone else before
+          integration.accessUserId = viewerId
         }
-        accessUserId = viewerId
-      } else if (targetTeamAuth) {
-        // in case the task was pushed by someone else before
-        accessUserId = viewerId
-      } else {
-        // the task might also be integrated and the accessUser has the integration set up for the target team, do nothing in that case
-        accessUserId = task.integration.accessUserId
+        // else the task might also be integrated and the accessUser has the integration set up for the target team, do nothing in that case
       }
     }
 
@@ -134,10 +130,7 @@ export default {
       content: rawContent === nextRawContent ? undefined : JSON.stringify(nextRawContent),
       updatedAt: now,
       teamId,
-      integration: task.integration && {
-        ...task.integration,
-        accessUserId
-      }
+      integration
     }
 
     // If there is a task with the same integration hash in the new team, then delete it first.

From d73485bb9cca00fe894738319ae0c1f2f8913341 Mon Sep 17 00:00:00 2001
From: Georg Bremer <github@dschoordsch.de>
Date: Thu, 11 Nov 2021 13:01:22 +0100
Subject: [PATCH 11/11] Clear freshly added integration auth from dataLoader

When a task changes team and the integration is copied to the new team,
then we already checked the integration for the target team, thus the
dataLoader has `null` cached for it. We need to clear this value before
publishing/returning any results which might read that value again.
---
 packages/server/graphql/mutations/changeTaskTeam.ts | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/packages/server/graphql/mutations/changeTaskTeam.ts b/packages/server/graphql/mutations/changeTaskTeam.ts
index ec81589ec89..12103b061e1 100644
--- a/packages/server/graphql/mutations/changeTaskTeam.ts
+++ b/packages/server/graphql/mutations/changeTaskTeam.ts
@@ -65,9 +65,10 @@ export default {
       // The task might have been pushed by someone else for viewer (`userId !== accessUserId`).
       // In that case we still try to use the viewer's target team authentication, but fall back to the
       // accessUser's in case it is present for the target team.
+      const targetTeamAuthKey = {teamId, userId: viewerId}
       const authKeys = [
         {teamId: task.teamId, userId: viewerId},
-        {teamId, userId: viewerId},
+        targetTeamAuthKey,
         {teamId, userId: integration.accessUserId}
       ]
       const [sourceTeamAuth, targetTeamAuth, accessUsersTargetTeamAuth] =
@@ -91,6 +92,8 @@ export default {
               ...sourceTeamAuth,
               teamId
             })
+            // dataLoader does not allow to refresh the value, so clear the updated one
+            dataLoader.get('freshAtlassianAuth').clear(targetTeamAuthKey)
             const data = {teamId, userId: viewerId}
             publish(SubscriptionChannel.TEAM, teamId, 'AddAtlassianAuthPayload', data, subOptions)
           }
@@ -99,6 +102,8 @@ export default {
               ...sourceTeamAuth,
               teamId
             })
+            // dataLoader does not allow to refresh the value, so clear the updated one
+            dataLoader.get('githubAuth').clear(targetTeamAuthKey)
             const data = {teamId, userId: viewerId}
             publish(SubscriptionChannel.TEAM, teamId, 'AddGitHubAuthPayload', data, subOptions)
           }