Merge pull request #110 from dhruvit-r/develop

Gitlab auth fix-up

Author: jmgasper

.eslintrc

@@ -7,7 +7,7 @@
         "jsdoc"
     ],
     "parserOptions": {
-        "ecmaVersion": 8,
+        "ecmaVersion": 2023,
         "ecmaFeatures": {
             "experimentalObjectRestSpread": true
         }
@@ -45,6 +45,8 @@
                 "functions": "ignore"
             }
         ],
+        "import/no-unresolved": 0,
+        "max-params": 0,
         "max-lines": 0,
         "max-statements": 0,
         "valid-jsdoc": 0

config/default.js

@@ -80,5 +80,6 @@ module.exports = {
   GITLAB_REFRESH_TOKEN_BEFORE_EXPIRATION: 300,
   GITLAB_CLIENT_ID: process.env.GITLAB_CLIENT_ID,
   GITLAB_CLIENT_SECRET: process.env.GITLAB_CLIENT_SECRET,
-  GITLAB_OWNER_USER_CALLBACK_URL: process.env.GITLAB_OWNER_USER_CALLBACK_URL
+  GITLAB_OWNER_USER_CALLBACK_URL: process.env.GITLAB_OWNER_USER_CALLBACK_URL,
+  GITLAB_GUEST_USER_CALLBACK_URL: process.env.GITLAB_GUEST_USER_CALLBACK_URL
 };

constants.js

@@ -19,7 +19,8 @@ const USER_TYPES = {
 
 // The user roles
 const USER_ROLES = {
-  OWNER: 'owner'
+  OWNER: 'owner',
+  GUEST: 'guest'
 };
 
 // The challenge status

models/User.js

@@ -49,7 +49,9 @@ const schema = new Schema({
   // gitlab token data
   accessToken: {type: String, required: false},
   accessTokenExpiration: {type: Date, required: false},
-  refreshToken: {type: String, required: false}
+  refreshToken: {type: String, required: false},
+  lockId: {type: String, required: false},
+  lockExpiration: {type: Date, required: false}
 });
 
 module.exports = schema;

package-lock.json

@@ -13,7 +13,8 @@
     "direct-connect-migration": "node scripts/direct-connect-migration.js"
   },
   "engines": {
-    "node": "~8.6.0"
+    "node": ">=20",
+    "npm": ">=9"
   },
   "repository": {
     "type": "git",
@@ -26,7 +27,7 @@
   },
   "homepage": "https://gitlab.com/luettich/processor#README",
   "dependencies": {
-    "@gitbeaker/rest": "^39.12.0",
+    "@gitbeaker/rest": "^39.13.0",
     "@octokit/rest": "^18.9.0",
     "axios": "^0.19.0",
     "circular-json": "^0.5.7",

package.json

@@ -14,7 +14,7 @@ const logger = require('../utils/logger');
 const models = require('../models');
 const dbHelper = require('../utils/db-helper');
 const gitHubService = require('./GithubService');
-const gitlabService = require('./GitlabService');
+const GitlabService = require('./GitlabService');
 
 const timeoutMapper = {};
 
@@ -27,7 +27,8 @@ async function reOpenIssue(event, issue) {
   if (event.provider === 'github') {
     await gitHubService.changeState(event.copilot, event.data.repository.full_name, issue.number, 'open');
   } else if (event.provider === 'gitlab') {
-    await gitlabService.changeState(event.copilot, event.data.repository.id, issue.number, 'reopen');
+    const gitlabService = await GitlabService.create(event.copilot);
+    await gitlabService.changeState(event.data.repository.id, issue.number, 'reopen');
   }
 }
 
@@ -37,7 +38,7 @@ async function reOpenIssue(event, issue) {
  * @param {Object} data the issue data or the copilot payment data
  * @param {Object} err the error
  */
-async function handleEventGracefully(event, data, err) {
+async function handleEventGracefully(event, data, err) { // eslint-disable-line complexity
   if (err.errorAt === 'topcoder' || err.errorAt === 'processor') {
     event.retryCount = _.toInteger(event.retryCount);
     let keyName = '';
@@ -64,7 +65,7 @@ async function handleEventGracefully(event, data, err) {
     if (event.retryCount === config.RETRY_COUNT) {
       // Clear out the kafka queue of any queued messages (assignment, label changes, etc...)
       const timeoutsToClear = timeoutMapper[keyName];
-      for (let i = 0; i < timeoutsToClear.length; i++) {  // eslint-disable-line no-restricted-syntax
+      for (let i = 0; i < timeoutsToClear.length; i++) { // eslint-disable-line no-restricted-syntax
         clearTimeout(timeoutsToClear[i]);
       }
       let comment = `[${err.statusCode}]: ${err.message}`;
@@ -95,7 +96,8 @@ async function handleEventGracefully(event, data, err) {
       if (event.provider === 'github') {
         await gitHubService.createComment(event.copilot, event.data.repository.full_name, data.number, comment);
       } else if (event.provider === 'gitlab') {
-        await gitlabService.createComment(event.copilot, event.data.repository.id, data.number, comment);
+        const gitlabService = await GitlabService.create(event.copilot);
+        await gitlabService.createComment(event.data.repository.id, data.number, comment);
       }
 
       if (event.event === 'issue.closed') {