From feb999380f95fd8629d5c7211a7564ee7de3109c Mon Sep 17 00:00:00 2001 From: Taha Yassine Kraiem Date: Thu, 1 Sep 2022 15:22:20 +0100 Subject: [PATCH] feat(chalice): changed delte jira integration feat(chalice): changed delete github integration --- api/chalicelib/core/integrations_manager.py | 4 ++-- api/routers/core.py | 6 ++++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/api/chalicelib/core/integrations_manager.py b/api/chalicelib/core/integrations_manager.py index ef63a7d96..5cc15cfba 100644 --- a/api/chalicelib/core/integrations_manager.py +++ b/api/chalicelib/core/integrations_manager.py @@ -27,7 +27,7 @@ def __get_default_integration(user_id): current_integrations["jira"] else None -def get_integration(tenant_id, user_id, tool=None): +def get_integration(tenant_id, user_id, tool=None, for_delete=False): if tool is None: tool = __get_default_integration(user_id=user_id) if tool is None: @@ -37,7 +37,7 @@ def get_integration(tenant_id, user_id, tool=None): return {"errors": [f"issue tracking tool not supported yet, available: {SUPPORTED_TOOLS}"]}, None if tool == integration_jira_cloud.PROVIDER: integration = integration_jira_cloud.JIRAIntegration(tenant_id=tenant_id, user_id=user_id) - if integration.integration is not None and not integration.integration.get("valid", True): + if not for_delete and integration.integration is not None and not integration.integration.get("valid", True): return {"errors": ["JIRA: connexion issue/unauthorized"]}, integration return None, integration elif tool == integration_github.PROVIDER: diff --git a/api/routers/core.py b/api/routers/core.py index f9ca28a4d..b3252e34a 100644 --- a/api/routers/core.py +++ b/api/routers/core.py @@ -491,7 +491,8 @@ def delete_default_issue_tracking_tool(context: schemas.CurrentContext = Depends def delete_jira_cloud(context: schemas.CurrentContext = Depends(OR_context)): error, integration = integrations_manager.get_integration(tool=integration_jira_cloud.PROVIDER, tenant_id=context.tenant_id, - user_id=context.user_id) + user_id=context.user_id, + for_delete=True) if error is not None: return error return {"data": integration.delete()} @@ -501,7 +502,8 @@ def delete_jira_cloud(context: schemas.CurrentContext = Depends(OR_context)): def delete_github(context: schemas.CurrentContext = Depends(OR_context)): error, integration = integrations_manager.get_integration(tool=integration_github.PROVIDER, tenant_id=context.tenant_id, - user_id=context.user_id) + user_id=context.user_id, + for_delete=True) if error is not None: return error return {"data": integration.delete()}