feat: merge Upstream/main

Author: fabiovincenzi

cypress.config.js

@@ -4,5 +4,13 @@ module.exports = defineConfig({
   e2e: {
     baseUrl: process.env.CYPRESS_BASE_URL || 'http://localhost:3000',
     chromeWebSecurity: false, // Required for OIDC testing
+    setupNodeEvents(on, config) {
+      on('task', {
+        log(message) {
+          console.log(message);
+          return null;
+        },
+      });
+    },
   },
 });

cypress/e2e/repo.cy.js

@@ -1,55 +1,83 @@
 describe('Repo', () => {
-  beforeEach(() => {
+  let repoName;
+  let cloneURL;
+  let csrfToken;
+  let cookies;
+  let repoId;
+
+  before(() => {
     cy.login('admin', 'admin');
 
-    cy.visit('/dashboard/repo');
+    // Create a new repo
+    cy.getCSRFToken().then((csrfToken) => {
+      repoName = `${Date.now()}`;
+      cloneURL = `http://localhost:8000/github.com/cypress-test/${repoName}.git`;
+
+      cy.request({
+        method: 'POST',
+        url: 'http://localhost:8080/api/v1/repo',
+        body: {
+          project: 'cypress-test',
+          name: repoName,
+          url: `https://github.com/cypress-test/${repoName}.git`,
+        },
+        headers: {
+          cookie: cookies?.join('; ') || '',
+          'X-CSRF-TOKEN': csrfToken,
+        },
+      }).then((res) => {
+        expect(res.status).to.eq(200);
+        repoId = res.body._id;
+      });
+    });
+  });
 
-    // prevent failures on 404 request and uncaught promises
+  it('Opens tooltip with correct content and can copy', () => {
+    cy.visit('/dashboard/repo');
     cy.on('uncaught:exception', () => false);
+
+    const tooltipQuery = 'div[role="tooltip"]';
+
+    // Check the tooltip isn't open to start with
+    cy.get(tooltipQuery).should('not.exist');
+
+    // Find the repo's Code button and click it
+    cy.get(`a[href="/dashboard/repo/${repoId}"]`)
+      .closest('tr')
+      .find('span')
+      .contains('Code')
+      .should('exist')
+      .click();
+
+    // Check tooltip is open and contains the correct clone URL
+    cy.get(tooltipQuery)
+      .should('exist')
+      .find('span')
+      .contains(cloneURL)
+      .should('exist')
+      .parent()
+      .find('span')
+      .next()
+      .get('svg.octicon-copy')
+      .should('exist')
+      .click()
+      .get('svg.octicon-copy')
+      .should('not.exist')
+      .get('svg.octicon-check')
+      .should('exist');
   });
 
-  describe('Code button for repo row', () => {
-    it('Opens tooltip with correct content and can copy', () => {
-      const cloneURLRegex = /http:\/\/localhost:8000\/(?:[^\/]+\/).+\.git/;
-      const tooltipQuery = 'div[role="tooltip"]';
-
-      cy
-        // tooltip isn't open to start with
-        .get(tooltipQuery)
-        .should('not.exist');
-
-      cy
-        // find a table row for a repo (any will do)
-        .get('table#RepoListTable>tbody>tr')
-        // find the nearby span containing Code we can click to open the tooltip
-        .find('span')
-        .contains('Code')
-        .should('exist')
-        .click();
-
-      cy
-        // find the newly opened tooltip
-        .get(tooltipQuery)
-        .should('exist')
-        .find('span')
-        // check it contains the url we expect
-        .contains(cloneURLRegex)
-        .should('exist')
-        .parent()
-        // find the adjacent span that contains the svg
-        .find('span')
-        .next()
-        // check it has the copy icon first and click it
-        .get('svg.octicon-copy')
-        .should('exist')
-        .click()
-        // check the icon has changed to the check icon
-        .get('svg.octicon-copy')
-        .should('not.exist')
-        .get('svg.octicon-check')
-        .should('exist');
-
-      // failed to successfully check the clipboard
+  after(() => {
+    // Delete the repo
+    cy.getCSRFToken().then((csrfToken) => {
+      cy.request({
+        method: 'DELETE',
+        url: `http://localhost:8080/api/v1/repo/${repoName}/delete`,
+        headers: {
+          cookie: cookies?.join('; ') || '',
+          'X-CSRF-TOKEN': csrfToken,
+        },
+      });
     });
   });
 });

cypress/support/commands.js

@@ -39,3 +39,25 @@ Cypress.Commands.add('login', (username, password) => {
     cy.url().should('include', '/dashboard/repo');
   });
 });
+
+Cypress.Commands.add('getCSRFToken', () => {
+  return cy.request('GET', 'http://localhost:8080/api/v1/repo').then((res) => {
+    let cookies = res.headers['set-cookie'];
+
+    if (typeof cookies === 'string') {
+      cookies = [cookies];
+    }
+
+    if (!cookies) {
+      throw new Error('No cookies found in response');
+    }
+
+    const csrfCookie = cookies.find((c) => c.startsWith('csrf='));
+    if (!csrfCookie) {
+      throw new Error('No CSRF cookie found in response headers');
+    }
+
+    const token = csrfCookie.split('=')[1].split(';')[0];
+    return cy.wrap(decodeURIComponent(token));
+  });
+});

package-lock.json

@@ -47,7 +47,7 @@
     "axios": "^1.11.0",
     "bcryptjs": "^3.0.2",
     "bit-mask": "^1.0.2",
-    "classnames": "2.5.1",
+    "clsx": "^2.1.1",
     "concurrently": "^9.2.0",
     "connect-mongo": "^5.1.0",
     "cors": "^2.8.5",

package.json

@@ -1,5 +1,3 @@
-// src/constants/languageColors.ts
-
 export const languageColors: Record<string, string> = {
   '1C Enterprise': '#814CCC',
   '2-Dimensional Array': '#38761D',

src/constants/languageColors.ts

@@ -25,9 +25,11 @@ import User from './ui/views/User/User';
 import UserList from './ui/views/UserList/UserList';
 import RepoDetails from './ui/views/RepoDetails/RepoDetails';
 import RepoList from './ui/views/RepoList/RepoList';
+import SettingsView from './ui/views/Settings/Settings';
 
 import { RepoIcon } from '@primer/octicons-react';
-import { Group, AccountCircle, Dashboard } from '@material-ui/icons';
+import { Group, AccountCircle, Dashboard, Settings } from '@material-ui/icons';
+
 import { Route } from './types/models';
 
 const dashboardRoutes: Route[] = [
@@ -97,6 +99,16 @@ const dashboardRoutes: Route[] = [
     layout: '/dashboard',
     visible: false,
   },
+  {
+    path: '/admin/settings',
+    name: 'Settings',
+    icon: Settings,
+    component: (props) => (
+      <RouteGuard component={SettingsView} fullRoutePath={`/dashboard/admin/settings`} />
+    ),
+    layout: '/dashboard',
+    visible: true,
+  },
 ];
 
 export default dashboardRoutes;

src/routes.tsx

@@ -16,10 +16,6 @@ const jwtAuthHandler = (overrideConfig = null) => {
       return next();
     }
 
-    if (req.isAuthenticated()) {
-      return next();
-    }
-
     const token = req.header('Authorization');
     if (!token) {
       return res.status(401).send('No token provided\n');
@@ -29,11 +25,15 @@ const jwtAuthHandler = (overrideConfig = null) => {
     const audience = expectedAudience || clientID;
 
     if (!authorityURL) {
-      return res.status(500).send('OIDC authority URL is not configured\n');
+      return res.status(500).send({
+        message: 'JWT handler: authority URL is not configured\n',
+      });
     }
 
     if (!clientID) {
-      return res.status(500).send('OIDC client ID is not configured\n');
+      return res.status(500).send({
+        message: 'JWT handler: client ID is not configured\n',
+      });
     }
 
     const tokenParts = token.split(' ');

src/service/passport/jwtAuthHandler.js

@@ -1,5 +1,5 @@
 import React from 'react';
-import classNames from 'classnames';
+import clsx from 'clsx';
 import { makeStyles } from '@material-ui/core/styles';
 import styles from '../../assets/jss/material-dashboard-react/components/cardStyle';
 
@@ -23,7 +23,7 @@ const Card: React.FC<CardProps> = ({
 }) => {
   const classes = useStyles();
 
-  const cardClasses = classNames({
+  const cardClasses = clsx({
     [classes.card]: true,
     [classes.cardPlain]: plain,
     [classes.cardProfile]: profile,