Merge pull request #1967 from Real-Dev-Squad/develop

Dev to Main Sync

Author: prakashchoudhary07

.github/workflows/test.yml

@@ -15,7 +15,7 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [18.x]
+        node-version: [20.x]
 
     steps:
       - uses: actions/checkout@v3

package.json

@@ -16,71 +16,71 @@
     "tdd:watch": "sh scripts/tests/tdd.sh"
   },
   "dependencies": {
-    "axios": "^1.0.0",
-    "cloudinary": "^1.25.1",
-    "config": "^3.3.6",
-    "cookie-parser": "~1.4.5",
+    "axios": "^1.6.7",
+    "cloudinary": "^2.0.3",
+    "config": "3.3.7",
+    "cookie-parser": "~1.4.6",
     "cors": "^2.8.5",
-    "datauri": "^4.0.0",
-    "debug": "~4.3.1",
-    "express": "~4.18.0",
+    "datauri": "^4.1.0",
+    "debug": "~4.3.4",
+    "express": "~4.18.3",
     "express-boom": "^3.0.0",
-    "firebase-admin": "^11.0.0",
-    "helmet": "^6.0.0",
+    "firebase-admin": "^11.11.1",
+    "helmet": "^7.1.0",
     "http-errors": "~2.0.0",
-    "joi": "^17.4.0",
-    "jsdoc": "^4.0.0",
+    "joi": "^17.12.2",
+    "jsdoc": "^4.0.2",
     "jsonwebtoken": "^8.5.1",
     "morgan": "~1.10.0",
     "multer": "^1.4.2",
-    "newrelic": "^9.0.0",
-    "passport": "^0.6.0",
+    "newrelic": "^11.12.0",
+    "passport": "^0.7.0",
     "passport-github2": "^0.1.12",
-    "rate-limiter-flexible": "^2.4.1",
-    "winston": "^3.3.3"
+    "rate-limiter-flexible": "^5.0.0",
+    "winston": "^3.12.0"
   },
   "devDependencies": {
-    "@types/chai": "^4.3.5",
+    "@types/chai": "^4.3.12",
     "@types/config": "^3.3.3",
-    "@types/express": "^4.17.17",
-    "@types/jest": "^29.5.3",
-    "@types/mocha": "^10.0.1",
-    "@types/node": "^20.4.3",
+    "@types/express": "^4.17.21",
+    "@types/jest": "^29.5.12",
+    "@types/mocha": "^10.0.6",
+    "@types/node": "^20.11.24",
     "@types/sinon": "^17.0.3",
-    "@typescript-eslint/parser": "^6.1.0",
-    "chai": "^4.3.7",
-    "chai-http": "^4.3.0",
+    "@typescript-eslint/parser": "^7.1.1",
+    "chai": "^4.4.1",
+    "chai-http": "^4.4.0",
     "cross-env": "^7.0.3",
-    "eslint": "^8.0.0",
-    "eslint-config-prettier": "^8.3.0",
-    "eslint-config-standard": "^16.0.2",
+    "eslint": "^8.57.0",
+    "eslint-config-prettier": "^9.1.0",
+    "eslint-config-standard": "^16.0.3",
     "eslint-plugin-import": "^2.22.1",
     "eslint-plugin-mocha": "^10.0.0",
     "eslint-plugin-node": "^11.1.0",
-    "eslint-plugin-prettier": "^4.0.0",
+    "eslint-plugin-prettier": "^4.2.1",
     "eslint-plugin-promise": "^6.0.0",
-    "eslint-plugin-security": "^1.4.0",
+    "eslint-plugin-security": "^1.7.1",
     "eslint-plugin-standard": "^4.1.0",
-    "firebase-tools": "^11.28.0",
-    "mocha": "^10.2.0",
-    "nock": "^13.0.11",
-    "nodemon": "^2.0.7",
+    "firebase-tools": "^13.4.0",
+    "mocha": "^10.3.0",
+    "nock": "~13.2.9",
+    "nodemon": "^3.1.0",
     "nyc": "^15.1.0",
     "pre-commit": "^1.2.2",
     "prettier": "^2.5.1",
-    "sinon": "^15.0.0",
-    "ts-node": "^10.9.1",
+    "sinon": "^17.0.1",
+    "ts-node": "^10.9.2",
     "ts-node-dev": "^2.0.0",
-    "typescript": "^5.1.6"
+    "typescript": "~5.3.3"
   },
   "engines": {
-    "node": "18.x"
+    "node": "20.x"
   },
   "pre-commit": [
     "lint"
   ],
   "volta": {
-    "node": "18.15.0",
-    "yarn": "1.22.19"
+    "node": "20.11.1",
+    "yarn": "1.22.21"
   }
 }

scripts/tests/testIntegration.sh

@@ -2,6 +2,7 @@
 
 # set 'test' environment
 export NODE_ENV='test'
+export NODE_CONFIG_DIR='./test/config'
 
 # get project_id value from firestore config
 json=$(node -e "console.log(require('config').get('firestore'))")

scripts/tests/testUnit.sh

@@ -2,6 +2,7 @@
 
 # set 'test' environment
 export NODE_ENV='test'
+export NODE_CONFIG_DIR='./test/config'
 
 # get project_id value from firestore config
 json=$(node -e "console.log(require('config').get('firestore'))")

config/test.js renamed to test/config/test.js

@@ -4,15 +4,21 @@
  */
 
 const port = 3000;
-
+const NODE_ENV = process.env.NODE_ENV;
 module.exports = {
+  port: 3000,
   enableFileLogs: false,
   // Console logs are set to avoid the winston error of no defined transports
   enableConsoleLogs: true,
   discordUnverifiedRoleId: "1234567890",
   discordDeveloperRoleId: "9876543210",
   discordNewComersChannelId: "709080951824842783",
   discordMavenRoleId: "1212121212",
+  discordMissedUpdatesRoleId: "<discordMissedUpdatesRoleId>",
+  githubApi: {
+    baseUrl: "https://api.github.com",
+    org: "Real-Dev-Squad",
+  },
   githubOauth: {
     clientId: "clientId",
     clientSecret: "clientSecret",
@@ -33,6 +39,17 @@ module.exports = {
     rdsApi: {
       baseUrl: `http://localhost:${port}`,
     },
+    rdsUi: {
+      baseUrl: "https://realdevsquad.com",
+      routes: {
+        authRedirection: "/goto",
+      },
+      goalAPI: {
+        baseUrl: "<goalBaseUrl>",
+        secretKey: "<goalSecretKey>",
+        cookieName: `goals-session-test`,
+      },
+    },
     discordBot: {
       baseUrl: "DISCORD_BASE_URL",
     },
@@ -48,6 +65,10 @@ module.exports = {
   },
 
   userToken: {
+    cookieName: `rds-session-${NODE_ENV}`,
+    cookieV2Name: `rds-session-v2-${NODE_ENV}`,
+    ttl: 30 * 24 * 60 * 60, // in seconds
+    refreshTtl: 180 * 24 * 60 * 60, // in seconds
     publicKey:
       "-----BEGIN PUBLIC KEY-----\n" +
       "MIGeMA0GCSqGSIb3DQEBAQUAA4GMADCBiAKBgHo6sGbw8qk+XU9sBVa4w2aEq01i\n" +
@@ -197,6 +218,33 @@ module.exports = {
       "-----END PUBLIC KEY-----",
   },
 
+  // Cloudinary keys
+  cloudinary: {
+    cloud_name: "Cloud_name",
+    api_key: "API_KEY",
+    api_secret: "api_secret_key",
+  },
+
+  // Cloudflare
+  cloudflare: {
+    CLOUDFLARE_ZONE_ID: "Cloudflare_Zone_ID_or_ID",
+    CLOUDFLARE_X_AUTH_KEY: "Cloudflare_API_Auth_Key",
+    CLOUDFLARE_X_AUTH_EMAIL: "Cloudflare_User_Email",
+  },
+
+  integrations: {
+    newrelic: {
+      appName: "RDS_API_production",
+      licenseKey: "<newrelicLicenseKey>",
+    },
+  },
+
+  routesCacheTTL: {
+    "/members": 900,
+  },
+
+  githubAccessToken: "GITHUB_PERSONAL_ACCESS_TOKEN",
+
   Event100ms: {
     APP_ACCESS_KEY: "EVENT_100MS_APP_ACCESS_KEY",
     APP_SECRET: "EVENT_100MS_APP_SECRET",

test/integration/arts.test.js

@@ -47,6 +47,7 @@ describe("Arts", function () {
           return done();
         });
     });
+
     it("Should return 401, for Unauthenticated User", function (done) {
       chai
         .request(app)
@@ -111,6 +112,7 @@ describe("Arts", function () {
           return done();
         });
     });
+
     it("Should return 401, for Unauthenticated User", function (done) {
       chai
         .request(app)

test/integration/auth.test.js

@@ -51,6 +51,7 @@ describe("auth", function () {
     expect(res).to.have.status(302);
     expect(res.headers.location).to.equal(githubOauthURL);
   });
+
   it("should redirect the user to new sign up flow if they are have incomplete user details true", async function () {
     const redirectURL = "https://my.realdevsquad.com/new-signup";
 

test/integration/authorizeRoles.test.js

@@ -182,6 +182,7 @@ describe("authorizeRoles", function () {
           return done();
         });
     });
+
     it("should return server error for super user on route with invalid required role", function (done) {
       chai
         .request(app)
@@ -195,6 +196,7 @@ describe("authorizeRoles", function () {
           return done();
         });
     });
+
     it("should return server error for app owner on route with invalid required role", function (done) {
       chai
         .request(app)

test/integration/contributions.test.js

@@ -58,9 +58,11 @@ describe("Contributions", function () {
     task.isNoteworthy = false;
     await testModel.updateTask(task);
   });
+
   afterEach(function () {
     sinon.restore();
   });
+
   describe("GET /contributions/{username}", function () {
     it("Should get all the contributions of the user", function (done) {
       sinon.stub(githubService, "fetchPRsByUser").returns(githubPRInfo.prakash);
@@ -104,6 +106,7 @@ describe("Contributions", function () {
           return done();
         });
     });
+
     it("Should respond 404 for unregistered user", function (done) {
       chai
         .request(app)
@@ -118,6 +121,7 @@ describe("Contributions", function () {
           return done();
         });
     });
+
     it("Should respond empty object when user has no pr and task available", function (done) {
       sinon.stub(githubService, "fetchPRsByUser").returns(githubPRInfo.userWithNoPrs);
       chai

test/integration/discord.test.js

@@ -88,6 +88,7 @@ describe("test discord actions", function () {
       ];
       await Promise.all(addGroupRolesPromises);
     });
+
     afterEach(async function () {
       await cleanDb();
     });