Merge branch 'main' into ui

backend/controller/components.controller.js

@@ -218,7 +218,6 @@ const getCategoriesList = async (req, res) => {
 module.exports = { getCategoriesList };
 
 
-
 module.exports = {
     getLatestFiles,
     readFilesInformations,

backend/controller/github-oauth.controller.js

@@ -8,6 +8,7 @@ const {getUserInformationsByName} = require('../controller/userProfile.controlle
 const { response } = require('express');
 
 const JWT_SECRET = process.env.JWT_ACCESS_TOKEN;
+const TOKEN_EXPIRE_TIMEOUT = process.env.TOKEN_EXPIRE_TIMEOUT;
 
 async function exchangeGitHubCodeForToken(code) {
   const client_id = process.env.GITHUB_CLIENT_ID;
@@ -27,11 +28,10 @@ async function exchangeGitHubCodeForToken(code) {
     const { access_token } = response.data;
     if (!access_token) {
       console.error('GitHub OAuth code exchange failed. Response:', response.data);
-      throw new Error('Access token not received from GitHub.');
+      throw new Error('Bad Verifications Code Exchange');
     }
     return access_token;
   } catch (error) {
-    console.error('GitHub OAuth code exchange error:', error);
     throw error;
   }
 }

backend/controller/userProfile.controller.js

@@ -105,6 +105,60 @@ const getUserInformationsByName = async (userName, callback) => {
     }
 };
 
+const getprofileinfoprotect = async (req, res) => {
+    try {
+        const user_id = req.user.user.user_id;
+        console.log(req.user);
+        // Find user information using user_id
+        const existingUser = await GitHubUser.findOne({ _id: user_id });
+        if (!existingUser) {
+            return res.status(404).send('User not found');
+        }
+        // Get userComponents details using user_id 
+        const userComponents = await UserComponents.find({ user_id: existingUser._id });
+
+        // Map user components and append file information
+        const updatedComponentsPromises = userComponents.map(async component => {
+            const folderNames = component.folder_name;
+            const categories = component.categories;
+            const data = component;
+            const user = existingUser;
+            console.log(`Component ${component}`);
+
+            return new Promise((resolve, reject) => {
+                readFilesInformations(categories, folderNames,{data, user}, (err, fileInfo) => {
+                    if (err) {
+                        reject(err);
+                    } else {
+                        resolve({
+                            ...component.toObject(), // Convert Mongoose document to object
+                            component_details: fileInfo 
+                        });
+                    }
+                });
+            });
+        });
+
+        // Wait for all promises to resolve
+        const updatedComponents = await Promise.all(updatedComponentsPromises);
+
+        // Construct the response object
+        const userProfileWithComponents = {
+            user: existingUser,
+            components: updatedComponents
+        };
+
+        // Send the success response
+        res.send(jsonStatusSuccess({ errorStatus: false, message: 'User data received successfully', response: userProfileWithComponents, count: userComponents.length }));
+
+    } catch (error) {
+        // Handle errors
+        console.error('Error in getUserProfileInformations:', error);
+        res.status(500).send(`Internal Server Error ${error}`);
+    }
+}
+
+
 const getUserInformationsByNameFromDb = async (req, res) => {
     const userName = req.body.user_name;
     try {
@@ -123,4 +177,4 @@ const getUserInformationsByNameFromDb = async (req, res) => {
 
 
 
-module.exports = { getUserProfileInformations, getUserInformationsByName, getUserInformationsByNameFromDb };
+module.exports = { getUserProfileInformations, getUserInformationsByName, getUserInformationsByNameFromDb, getprofileinfoprotect };

backend/copy.env

@@ -6,6 +6,7 @@ GITHUB_CLIENT_SECRET=
 #jtw secrets
 JWT_ACCESS_TOKEN = 
 REFRESH_TOKEN = 
+TOKEN_EXPIRE_TIMEOUT = 
 
 #Mongodb 
 MONGODB_CONNECTION_STRING=mongodb://172.28.0.2:27017/github_user

backend/middleware/Auth.js

@@ -0,0 +1,29 @@
+const jwt = require('jsonwebtoken');
+const {jsonStatus, jsonStatusError, jsonStatusSuccess} = require('../operations/errorhandlingOperations');
+require('dotenv').config();
+
+const JWT_SECRET = process.env.JWT_ACCESS_TOKEN;
+
+const authanticateJwtToken = (req,res,next)=>{
+
+  const authHeader = req.headers['authorization'];
+  console.log(req.headers);
+
+  if (!authHeader || !authHeader.startsWith('Bearer ')) {
+    return res.send(jsonStatusError({message: "Unauthorised", statusCode: 401}))
+  }
+
+  const token = authHeader.split(' ')[1];
+
+  try {
+      const decoded = jwt.verify(token, JWT_SECRET);
+      req.user = decoded;
+      next();  
+  } catch (err) {
+      // Token verification failed
+      return res.send(jsonStatusError({message: err, statusCode: 401}))
+  }
+}
+
+
+module.exports = {authanticateJwtToken}

backend/routes/userProfile.router.js

@@ -1,8 +1,10 @@
 const { Router } = require('express')
 const userProfileRouter = Router()
-const {getUserProfileInformations, getUserInformationsByName, getUserInformationsByNameFromDb} = require('../controller/userProfile.controller');
+const {getUserProfileInformations, getUserInformationsByName, getUserInformationsByNameFromDb, getprofileinfoprotect} = require('../controller/userProfile.controller');
+const {authanticateJwtToken} = require('../middleware/Auth')
 
 userProfileRouter.post('/getuserprofileinfo', getUserProfileInformations);
+userProfileRouter.get('/getprofileinfoprotect', authanticateJwtToken, getprofileinfoprotect );
 userProfileRouter.post('/getprofileinfo', getUserInformationsByNameFromDb);
 
 module.exports = {userProfileRouter};