diff --git a/backend/src/middleware/requireIntegrationAuthorizationAuth.ts b/backend/src/middleware/requireIntegrationAuthorizationAuth.ts index e8e0d29102..c43af2452c 100644 --- a/backend/src/middleware/requireIntegrationAuthorizationAuth.ts +++ b/backend/src/middleware/requireIntegrationAuthorizationAuth.ts @@ -25,7 +25,6 @@ const requireIntegrationAuthorizationAuth = ({ }) => { return async (req: Request, res: Response, next: NextFunction) => { const { integrationAuthId } = req[location]; - const integrationAuth = await IntegrationAuth.findOne({ _id: integrationAuthId }) diff --git a/frontend/src/components/basic/dialog/ActivateBotDialog.tsx b/frontend/src/components/basic/dialog/ActivateBotDialog.tsx index f2cb9cc2b0..521053d92f 100644 --- a/frontend/src/components/basic/dialog/ActivateBotDialog.tsx +++ b/frontend/src/components/basic/dialog/ActivateBotDialog.tsx @@ -19,7 +19,6 @@ type Props = { isOpen: boolean; closeModal: () => void; selectedIntegrationOption: IntegrationOption | null; - handleBotActivate: () => Promise; integrationOptionPress: (integrationOption: IntegrationOption) => void; }; @@ -27,20 +26,16 @@ const ActivateBotDialog = ({ isOpen, closeModal, selectedIntegrationOption, - handleBotActivate, integrationOptionPress }: Props) => { const { t } = useTranslation(); const submit = async () => { try { - // 1. activate bot - await handleBotActivate(); - // type check if (!selectedIntegrationOption) return; - // 2. start integration or probe for PAT + // start integration or probe for PAT integrationOptionPress(selectedIntegrationOption); } catch (err) { diff --git a/frontend/src/components/basic/dialog/IntegrationAccessTokenDialog.tsx b/frontend/src/components/basic/dialog/IntegrationAccessTokenDialog.tsx index 3a261ea4bc..89b98dd39e 100644 --- a/frontend/src/components/basic/dialog/IntegrationAccessTokenDialog.tsx +++ b/frontend/src/components/basic/dialog/IntegrationAccessTokenDialog.tsx @@ -52,7 +52,6 @@ const IntegrationAccessTokenDialog = ({
{ - console.log('onClose'); closeModal(); }}> - integrations.length > 0 ? ( +}: Props) => { + return integrations.length > 0 ? (

Current Integrations

@@ -40,7 +40,6 @@ const ProjectIntegrationSection = ({

{integrations.map((integration: Integration) => { - console.log('IntegrationSection integration: ', integration); return ( ); - +} + export default ProjectIntegrationSection; \ No newline at end of file diff --git a/frontend/src/pages/integrations/[id].tsx b/frontend/src/pages/integrations/[id].tsx index a1a4c4cd91..a4bf83a897 100644 --- a/frontend/src/pages/integrations/[id].tsx +++ b/frontend/src/pages/integrations/[id].tsx @@ -183,6 +183,10 @@ export default function Integrations() { accessToken?: string; }) => { try { + if (!bot.isActive) { + await handleBotActivate(); + } + if (integrationOption.type === 'oauth') { // integration is of type OAuth @@ -233,7 +237,7 @@ export default function Integrations() { return; } } catch (err) { - console.log(err); + console.error(err); } }; @@ -247,6 +251,7 @@ export default function Integrations() { * @returns */ const integrationOptionPress = async (integrationOption: IntegrationOption) => { + // consider: don't start integration until at [handleIntegrationOption] step try { const integrationAuthX = integrationAuths.find((integrationAuth) => integrationAuth.integration === integrationOption.slug); @@ -264,12 +269,15 @@ export default function Integrations() { return; } + if (!bot.isActive) { + await handleBotActivate(); + } + // case: integration has been authorized before // -> create new integration const integration = await createIntegration({ integrationAuthId: integrationAuthX._id }); - setIntegrations([...integrations, integration]); } catch (err) { console.error(err); @@ -350,7 +358,6 @@ export default function Integrations() { isOpen={isActivateBotDialogOpen} closeModal={() => setIsActivateBotDialogOpen(false)} selectedIntegrationOption={selectedIntegrationOption} - handleBotActivate={handleBotActivate} integrationOptionPress={integrationOptionPress} /> setIntegrationAccessTokenDialogOpen(false)} selectedIntegrationOption={selectedIntegrationOption} handleIntegrationOption={handleIntegrationOption} - />