Fixed the GET searchUser API body issue

TECHOUS · Oct 2, 2024 · e3e94d2 · e3e94d2
1 parent 13a16e2
commit e3e94d2
Show file tree

Hide file tree

Showing 11 changed files with 445 additions and 331 deletions.
diff --git a/.github/job.js b/.github/job.js
@@ -29,10 +29,7 @@ const getUserNameFromCodeBaseFile = (fileName) => {
 
 // function to connect to mongodb using mongoose
 const connectMongoDB = () => {
-    mongoose.connect(process.env.MONGODB_URI, {
-        useNewUrlParser: true,
-        useUnifiedTopology: true,
-    })
+    mongoose.connect(process.env.MONGODB_URI)
     const db = mongoose.connection
     db.on('error', console.error.bind(console, 'Connection error:'))
     return db
@@ -58,13 +55,13 @@ const insertDataInMongo = (records) => {
 const callGithubCodeBaseAPI = () => {
     axios
         .get(
-            `https://api.github.com/repos/TECHOUS/${process.env.CODE_SRC}/contents/CodeBase`
+            `https://api.github.com/repos/TECHOUS/${process.env.CODE_SRC}/contents/CodeBase`,
         )
         .then((res) => {
             // get all the names from the files
             const filePromises = res.data.map((codeObject) => {
                 return getUserNameFromCodeBaseFile(
-                    `${process.env.CODE_SRC}/${codeObject.path}`
+                    `${process.env.CODE_SRC}/${codeObject.path}`,
                 )
             })
 
@@ -77,7 +74,7 @@ const callGithubCodeBaseAPI = () => {
                             fileObject.value.fileName,
                             fileObject.value.username,
                         ]
-                    })
+                    }),
                 )
 
                 const dataToInsert = res.data.map((data) => {

diff --git a/.github/workflows/Vercel Deployment.yml b/.github/workflows/Vercel Deployment.yml
@@ -10,10 +10,10 @@ jobs:
   test:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-node@v2
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
         with:
-          node-version: '18.x'
+          node-version: '20.x'
       - run: yarn install
       - run: yarn run test
     env:
@@ -25,8 +25,8 @@ jobs:
     needs: test
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
-      - uses: amondnet/vercel-action@v20
+      - uses: actions/checkout@v4
+      - uses: amondnet/vercel-action@v25
         with:
           vercel-token: ${{ secrets.VERCEL_TOKEN }} # Required
           vercel-args: '--prod' #Optional

diff --git a/.github/workflows/Vercel Dev Deployment.yml b/.github/workflows/Vercel Dev Deployment.yml
@@ -10,10 +10,10 @@ jobs:
   test:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-node@v2
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
         with:
-          node-version: '18.x'
+          node-version: '20.x'
       - run: yarn install
       - run: yarn run test
     env:
@@ -25,8 +25,8 @@ jobs:
     needs: test
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
-      - uses: amondnet/vercel-action@v20
+      - uses: actions/checkout@v4
+      - uses: amondnet/vercel-action@v25
         with:
           vercel-token: ${{ secrets.VERCEL_TOKEN }} # Required
           vercel-org-id: ${{ secrets.ORG_ID}}  #Required

diff --git a/.github/workflows/codebase-engine.yml b/.github/workflows/codebase-engine.yml
@@ -6,10 +6,10 @@ jobs:
   init-setup:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-node@v2
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
         with:
-          node-version: '18.x'
+          node-version: '20.x'
       - run: yarn install
       - run: bash .github/job.sh
     env:

diff --git a/api/public/assets/main.bundle.js b/api/public/assets/main.bundle.js
diff --git a/api/public/index.html b/api/public/index.html
@@ -5,15 +5,15 @@
   <meta name="description" content="Engine to handle the rating mechanisms for the clean code">
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <link href="assets/bootstrap.min.css?v=1697340676180" rel="stylesheet" media="screen">
-  <link href="assets/prism.css?v=1697340676180" rel="stylesheet" />
-  <link href="assets/prism-toolbar.css?v=1697340676180" rel="stylesheet" />
-  <link href="assets/prism-diff-highlight.css?v=1697340676180" rel="stylesheet" />
-  <link href="assets/main.css?v=1697340676180" rel="stylesheet" media="screen, print">
-  <link href="assets/favicon.ico?v=1697340676180" rel="icon" type="image/x-icon">
-  <link href="assets/apple-touch-icon.png?v=1697340676180" rel="apple-touch-icon" sizes="180x180">
-  <link href="assets/favicon-32x32.png?v=1697340676180" rel="icon" type="image/png" sizes="32x32">
-  <link href="assets/favicon-16x16.png?v=1697340676180" rel="icon" type="image/png" sizes="16x16">
+  <link href="assets/bootstrap.min.css?v=1727848448632" rel="stylesheet" media="screen">
+  <link href="assets/prism.css?v=1727848448632" rel="stylesheet" />
+  <link href="assets/prism-toolbar.css?v=1727848448632" rel="stylesheet" />
+  <link href="assets/prism-diff-highlight.css?v=1727848448632" rel="stylesheet" />
+  <link href="assets/main.css?v=1727848448632" rel="stylesheet" media="screen, print">
+  <link href="assets/favicon.ico?v=1727848448632" rel="icon" type="image/x-icon">
+  <link href="assets/apple-touch-icon.png?v=1727848448632" rel="apple-touch-icon" sizes="180x180">
+  <link href="assets/favicon-32x32.png?v=1727848448632" rel="icon" type="image/png" sizes="32x32">
+  <link href="assets/favicon-16x16.png?v=1727848448632" rel="icon" type="image/png" sizes="16x16">
 </head>
 
 <body class="container-fluid">
@@ -1042,6 +1042,6 @@ <h2>{{__ "Request Body"}}</h2>
   </div>
 </div>
 
-<script src="assets/main.bundle.js?v=1697340676180"></script>
+<script src="assets/main.bundle.js?v=1727848448632"></script>
 </body>
 </html>
diff --git a/package.json b/package.json
@@ -1,8 +1,8 @@
 {
     "name": "coderatingengine",
-    "version": "1.0.0",
+    "version": "1.20.0",
     "engines": {
-        "node": "18.x",
+        "node": "20.x",
         "yarn": "1.x"
     },
     "description": "Engine to handle the rating mechanisms for the clean code",
@@ -17,22 +17,22 @@
     "author": "Gaurav Walia",
     "license": "ISC",
     "dependencies": {
-        "axios": "^1.5.1",
+        "axios": "^1.7.7",
         "cors": "^2.8.5",
-        "express": "^4.18.2",
-        "express-rate-limit": "^7.1.1",
-        "mongoose": "^7.6.2",
-        "uuid": "^9.0.1"
+        "express": "^4.21.0",
+        "express-rate-limit": "^7.4.0",
+        "mongoose": "^8.7.0",
+        "uuid": "^10.0.0"
     },
     "devDependencies": {
         "apidoc": "^1.2.0",
         "dotenv": "^16.3.1",
         "husky": "^8.0.3",
         "lint-staged": "^14.0.1",
-        "mocha": "^10.2.0",
-        "nodemon": "^3.0.1",
+        "mocha": "^10.7.3",
+        "nodemon": "^3.1.7",
         "prettier": "^3.0.3",
-        "supertest": "^6.3.3"
+        "supertest": "^7.0.0"
     },
     "lint-staged": {
         "*.js": "prettier --write"

diff --git a/routes/api/v1/API.js b/routes/api/v1/API.js
@@ -250,7 +250,12 @@ router.put(
  * @apiName searchUser
  * @apiDescription search and return the code rating for the specific user
  * @apiVersion 1.0.0
- * @apiBody {String} codeRatingEngineToken Access token received from randomCodes request
+ * @apiHeader {String} authorization Access token received from randomCodes request
+ * @apiHeaderExample {json} Request Header example
+ * {
+ *      "Authorization": "Bearer <ACCESS_TOKEN>"
+ * }
+ *
  * @apiQuery {String} username Username to search
  * @apiQuery {Boolean} sendContent Whether content is needed from the API or not
  *

diff --git a/src/auth.js b/src/auth.js
@@ -1,23 +1,26 @@
 const {validateToken} = require('./engine')
 
 async function authenticateAPI(req, res, next) {
-    const {codeRatingEngineToken} = req.body
+    const {authorization} = req.headers
 
-    if (codeRatingEngineToken === undefined) {
-        return res.status(401).json({
-            status: 401,
-            message: 'Invalid Token !! Please send the valid token',
-        })
-    } else {
+    if (authorization && authorization.startsWith('Bearer ')) {
+        const codeRatingEngineToken = authorization.replace('Bearer ', '')
         const tokenFound = await validateToken(codeRatingEngineToken)
         if (Array.isArray(tokenFound) && tokenFound.length > 0) {
             next()
         } else {
             return res.status(401).json({
                 status: 401,
-                message: 'Invalid Token !! Please send the valid token',
+                message:
+                    'Invalid Authorization Token !! Please send the valid token',
             })
         }
+    } else {
+        return res.status(401).json({
+            status: 401,
+            message:
+                'Invalid Authorization Token !! Please send the valid token',
+        })
     }
 }
 

diff --git a/src/engine.js b/src/engine.js
@@ -4,10 +4,7 @@ const accessTokenModel = require('../models/accessToken')
 const {default: axios} = require('axios')
 const {v4: uuidv4} = require('uuid')
 
-mongoose.connect(process.env.MONGODB_URI, {
-    useNewUrlParser: true,
-    useUnifiedTopology: true,
-})
+mongoose.connect(process.env.MONGODB_URI)
 const db = mongoose.connection
 db.on('error', console.error.bind(console, 'Connection error:'))