Now using fetch-retry for unstable connections. Fixed a bug where ano…

…ther user's worklogs would show on oauth authentication
J2-Tech · Mar 25, 2024 · 4e28b3f · 4e28b3f
1 parent 6ae989b
commit 4e28b3f
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 1 deletion.
diff --git a/controllers/jiraAPIController.js b/controllers/jiraAPIController.js
@@ -1,4 +1,4 @@
-const fetch = require('node-fetch');
+const fetch = require('@adobe/node-fetch-retry');
 const https = require('https');
 
 function getDefaultHeaders(req) {

diff --git a/controllers/jiraController.js b/controllers/jiraController.js
@@ -29,6 +29,9 @@ exports.getUsersWorkLogsAsEvent = function(req, start, end) {
                     if (process.env.JIRA_BASIC_AUTH_USERNAME) {
                         condition = condition && worklog.author.emailAddress == process.env.JIRA_BASIC_AUTH_USERNAME;
                     }
+                    if (process.env.JIRA_AUTH_TYPE =="OAUTH") {
+                        condition = condition && worklog.author.emailAddress == req.user.email;
+                    }
                     return condition;
                 })
                 .map(worklog => {

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -6,6 +6,7 @@
     "start": "node ./bin/www"
   },
   "dependencies": {
+    "@adobe/node-fetch-retry": "^2.2.0",
     "cookie-parser": "~1.4.4",
     "dayjs": "^1.11.10",
     "debug": "~2.6.9",