fix(watcher): supported remove watcher for ent (#225)

Enterprise-CMCS · Aug 8, 2024 · da390ab · da390ab
1 parent bcf5083
commit da390ab
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/src/libs/jira-lib.ts b/src/libs/jira-lib.ts
@@ -70,20 +70,24 @@ export class Jira {
       const axiosHeader = {
         Authorization: "",
       };
+      let params = {
+        username: undefined,
+        accountId: undefined,
+      };
       if (process.env.JIRA_HOST?.includes("jiraent")) {
         axiosHeader["Authorization"] = `Bearer ${process.env.JIRA_TOKEN}`;
+        params["username"] = currentUser.name;
       } else {
         axiosHeader["Authorization"] = `Basic ${Buffer.from(
           `${process.env.JIRA_USERNAME}:${process.env.JIRA_TOKEN}`
         ).toString("base64")}`;
+        params["accountId"] = currentUser.accountId;
       }
       await axios({
         method: "DELETE",
         url: `https://${process.env.JIRA_HOST}/rest/api/3/issue/${issueKey}/watchers`,
         headers: axiosHeader,
-        params: {
-          accountId: currentUser.accountId,
-        },
+        params,
       });
     } catch (err) {
       console.error("Error creating issue or removing watcher:", err);