Merge branch 'develop' into fix/localstorageClear

.github/workflows/deploy.yml

@@ -7,6 +7,7 @@ jobs:
   publish-containers:
     runs-on: ubuntu-latest
     timeout-minutes: 20
+    if: ${{ !contains(github.event.head_commit.message, 'from COS301-SE-2024/documentation') }}
     steps:
     - name: Checkout
       uses: actions/checkout@v2
@@ -95,6 +96,7 @@ jobs:
   deploy-containers:
     runs-on: ubuntu-latest
     timeout-minutes: 10
+    if: ${{ !contains(github.event.head_commit.message, 'from COS301-SE-2024/documentation') }}
     needs: publish-containers
     steps:
      - name: Deploy using ssh

CoVAR-app/src/app/(pages)/dashboard/components/InviteList.tsx

@@ -0,0 +1,56 @@
+'use client';
+import React, { useEffect, useState } from 'react';
+import { Paper, Typography, Box, CircularProgress, List, ListItem, ListItemText } from '@mui/material';
+import { fetchAllInvites } from '@/functions/requests';
+
+type Invite = {
+    invite_id: string;
+    username: string;
+    organization_name: string;
+    invite_status: string;
+};
+
+const InviteList: React.FC = () => {
+    const [invites, setInvites] = useState<Invite[]>([]);
+    const [loading, setLoading] = useState(true);
+
+    useEffect(() => {
+        const loadInvites = async () => {
+            try {
+                const token = localStorage.getItem('accessToken');
+                const invites = await fetchAllInvites(token as string);
+                setInvites(invites);
+                setLoading(false);
+            } catch (error) {
+                console.error('Error fetching invites:', error);
+                setLoading(false);
+            }
+        };
+
+        loadInvites();
+    }, []);
+
+    return (
+        <Box sx={{ padding: 2 }}>
+            <Typography variant="h6" color="text.primary">Pending Invites</Typography>
+            {loading ? (
+                <CircularProgress />
+            ) : invites.length === 0 ? (
+                <Typography>No pending invites at the moment.</Typography>
+            ) : (
+                <List>
+                    {invites.map((invite) => (
+                        <ListItem key={invite.invite_id}>
+                            <ListItemText
+                                primary={`${invite.username} - ${invite.organization_name}`}
+                                secondary={`Status: ${invite.invite_status}`}
+                            />
+                        </ListItem>
+                    ))}
+                </List>
+            )}
+        </Box>
+    );
+};
+
+export default InviteList;

CoVAR-app/src/app/(pages)/dashboard/components/adminPage.tsx

@@ -10,6 +10,8 @@ import { Height } from '@mui/icons-material';
 import { mainContentStyles } from '@/styles/sidebarStyle';
 import SeverityDistribution from './severityDistribution';
 import { chartContainerStyles } from '@/styles/dashboardStyle';
+import InviteList from './InviteList'; // Import the new component
+
 
 type User = {
     user_id: string;
@@ -160,49 +162,47 @@ const AdminPage: React.FC = () => {
         { name: 'Clients', value: userMetrics.clients },
       ];
 
-    return (
-
-            <Box sx={mainContentStyles}>
-                <Box sx = {{marginBottom : '2vh'}}>
-                    <Typography variant="h5" color="text.primary">
-                        User Metrics
-                    </Typography>
-                </Box>
-
-
-                <Paper sx={{ padding: 2 }}>
-                    <Typography>Total Users: {userMetrics.total}</Typography>
-                    <Typography>Admins: {userMetrics.admins}</Typography>
-                    <Typography>VAs: {userMetrics.vas}</Typography>
-                    <Typography>Clients: {userMetrics.clients}</Typography>
-                    <Paper sx={chartContainerStyles}>
+      return (
+        <Box sx={mainContentStyles}>
+            <Box sx={{ marginBottom: '2vh' }}>
+                <Typography variant="h5" color="text.primary">
+                    User Metrics
+                </Typography>
+            </Box>
+
+            <Paper sx={{ padding: 2 }}>
+                <Typography>Total Users: {userMetrics.total}</Typography>
+                <Typography>Admins: {userMetrics.admins}</Typography>
+                <Typography>VAs: {userMetrics.vas}</Typography>
+                <Typography>Clients: {userMetrics.clients}</Typography>
+
+                <Box sx={{ display: 'flex', justifyContent: 'space-between', marginTop: 2 }}>
+                    <Paper sx={{ ...chartContainerStyles, width: '48%' }}>
                         <Typography variant="h6">Role Distribution</Typography>
                         <SeverityDistribution data={roleData} />
                     </Paper>
-                </Paper>
-
-
-
-                    <Box sx = {{marginBottom : '2vh', marginTop : '2vh'}}>
-                        <Typography variant="h5" color="text.primary">
-                            Unauthorised Users (Last Week)
-                        </Typography>                    
-                    </Box>
 
+                    <Paper sx={{ ...chartContainerStyles, width: '48%' }}>
+                        <InviteList />
+                    </Paper>
+                </Box>
+            </Paper>
 
+            <Box sx={{ marginBottom: '2vh', marginTop: '2vh' }}>
+                <Typography variant="h5" color="text.primary">
+                    Unauthorised Users (Last Week)
+                </Typography>
+            </Box>
 
             {loading ? (
                 <CircularProgress />
             ) : (
-
-                    <DataGrid
-                        rows={users}
-                        columns={columns}
-                        getRowId={(row) => row.user_id}
-                        sx = {{...dataGridStyles, 
-                            height : '50vh'
-                        }}
-                    />
+                <DataGrid
+                    rows={users}
+                    columns={columns}
+                    getRowId={(row) => row.user_id}
+                    sx={{ ...dataGridStyles, height: '50vh' }}
+                />
             )}
 
             <ConfirmAuthorizeDialog

CoVAR-app/src/functions/requests.tsx

@@ -733,3 +733,14 @@ export const getOwner = async (orgId: string, accessToken: string) => {
     };
     return await handleRequest(request);
 };
+
+
+// Function to fetch all invites
+export const fetchAllInvites = async (accessToken: string) => {
+    const request = {
+        method: 'get',
+        url: `/api/invites`,
+        headers: { Authorization: `Bearer ${accessToken}` },
+    };
+    return await handleRequest(request);
+};

README.md

@@ -37,6 +37,7 @@ The CoVAR project by BlueVision ITM aims to develop a comprehensive vulnerabilit
 ## Demos
 * [Demo 1 Video](https://drive.google.com/file/d/18-8LR9x710CWpvD0dDpWLcKnwXGHsy_M/view?usp=sharing)
 * [Demo 2 Video](https://drive.google.com/file/d/1Dpynfe4pK_SkFPkS9EYfpClK6Z_cxYXn/view?usp=sharing)
+* [Demo 3 Video](https://drive.google.com/file/d/1Njv7EX8lYqedBnqkF562axwaYqV2sQBU/view?usp=sharing)
 
 ## Documentation
 * [Requirements and Design (SRS) Document](https://docs.google.com/document/d/1rhLhNdHQONaVFSU4WyOLPm6ZoKlxLMqk/edit?usp=sharing&ouid=112929114105055327648&rtpof=true&sd=true)

langchain/requirements.txt

@@ -10,4 +10,5 @@ python-dotenv
 openai
 PyJWT
 cryptography
-gunicorn 
+gunicorn 
+

server/routes/invites.js

@@ -1,12 +1,9 @@
 const express = require('express');
-
-const { authenticateToken} = require('../lib/securityFunctions');
-
+const { authenticateToken } = require('../lib/securityFunctions');
 const pgClient = require('../lib/postgres');
-
 const router = express.Router();
 
-// Fetch invites for a user
+// Fetch invites for a specific user
 router.get('/invites/:username', authenticateToken, async (req, res) => {
     const { username } = req.params;
 
@@ -19,7 +16,7 @@ router.get('/invites/:username', authenticateToken, async (req, res) => {
 
         const userId = userResult.rows[0].user_id;
 
-        // Fetch invites for the user
+        // Fetch pending invites for the user
         const invitesQuery = `
             SELECT i.invite_id, o.name as organization_name, i.invite_status 
             FROM organization_invites i
@@ -82,5 +79,23 @@ router.patch('/invites/:inviteId/reject', authenticateToken, async (req, res) =>
     }
 });
 
+// Fetch all invites
+router.get('/invites', authenticateToken, async (req, res) => {
+    try {
+        const invitesQuery = `
+            SELECT i.invite_id, u.username, o.name as organization_name, i.invite_status 
+            FROM organization_invites i
+            JOIN organizations o ON i.organization_id = o.organization_id
+            JOIN users u ON i.user_id = u.user_id
+        `;
+        const invitesResult = await pgClient.query(invitesQuery);
+
+        res.json(invitesResult.rows);
+    } catch (err) {
+        console.error(err.message);
+        res.status(500).send('Server Error');
+    }
+});
+
 
-module.exports = router;
+module.exports = router;