From 256971304dbf443ee798aa683632034b6b59043d Mon Sep 17 00:00:00 2001
From: Kraiem Taha Yassine <tahayk2@gmail.com>
Date: Tue, 16 Apr 2024 15:13:24 +0200
Subject: [PATCH] fix(chalice): fixed update JIRA integration (#2096)

fix(chalice): fixed JIRA URL validation
fix(chalice): fixed add/update JIRA token
---
 api/chalicelib/core/integration_jira_cloud.py | 34 +++++++++++--------
 1 file changed, 20 insertions(+), 14 deletions(-)

diff --git a/api/chalicelib/core/integration_jira_cloud.py b/api/chalicelib/core/integration_jira_cloud.py
index 4ded5afff..a711b484f 100644
--- a/api/chalicelib/core/integration_jira_cloud.py
+++ b/api/chalicelib/core/integration_jira_cloud.py
@@ -19,11 +19,13 @@ class JIRAIntegration(integration_base.BaseIntegration):
         self._user_id = user_id
         self.integration = self.get()
 
-        if self.integration is None:
-            return
-        self.integration["valid"] = True
-        if not self.integration["url"].endswith('atlassian.net'):
-            self.integration["valid"] = False
+    @staticmethod
+    def __validate(data):
+        data["valid"] = JIRAIntegration.__is_valid_url(data["url"])
+
+    @staticmethod
+    def __is_valid_url(url):
+        return url.endswith('atlassian.net') or url.endswith('atlassian.net/')
 
     @property
     def provider(self):
@@ -31,7 +33,7 @@ class JIRAIntegration(integration_base.BaseIntegration):
 
     @property
     def issue_handler(self):
-        if self.integration["url"].endswith('atlassian.net') and self._issue_handler is None:
+        if JIRAIntegration.__is_valid_url(self.integration["url"]) and self._issue_handler is None:
             try:
                 self._issue_handler = JIRACloudIntegrationIssue(token=self.integration["token"],
                                                                 username=self.integration["username"],
@@ -55,9 +57,7 @@ class JIRAIntegration(integration_base.BaseIntegration):
 
         if data is None:
             return
-        data["valid"] = True
-        if not data["url"].endswith('atlassian.net'):
-            data["valid"] = False
+        JIRAIntegration.__validate(data)
         return data
 
     def get_obfuscated(self):
@@ -81,16 +81,17 @@ class JIRAIntegration(integration_base.BaseIntegration):
                              **changes})
             )
             w = helper.dict_to_camel_case(cur.fetchone())
+            JIRAIntegration.__validate(w)
             if obfuscate:
                 w["token"] = obfuscate_string(w["token"])
-        return self.get()
+        return w
 
     # TODO: make this generic for all issue tracking integrations
     def _add(self, data):
         print("a pretty defined abstract method")
         return
 
-    def add(self, username, token, url):
+    def add(self, username, token, url, obfuscate=False):
         with pg_client.PostgresClient() as cur:
             cur.execute(
                 cur.mogrify("""\
@@ -101,7 +102,11 @@ class JIRAIntegration(integration_base.BaseIntegration):
                              "token": token, "url": url})
             )
             w = helper.dict_to_camel_case(cur.fetchone())
-        return self.get()
+            JIRAIntegration.__validate(w)
+            if obfuscate:
+                w["token"] = obfuscate_string(w["token"])
+
+        return w
 
     def delete(self):
         with pg_client.PostgresClient() as cur:
@@ -120,7 +125,7 @@ class JIRAIntegration(integration_base.BaseIntegration):
                     "username": data.username,
                     "token": data.token if len(data.token) > 0 and data.token.find("***") == -1 \
                         else self.integration.token,
-                    "url": data.url
+                    "url": str(data.url)
                 },
                 obfuscate=True
             )
@@ -128,5 +133,6 @@ class JIRAIntegration(integration_base.BaseIntegration):
             return self.add(
                 username=data.username,
                 token=data.token,
-                url=str(data.url)
+                url=str(data.url),
+                obfuscate=True
             )