Merge branch 'main' into fix-additional-user-api-leaks

Signed-off-by: Andy Pols <andy@pols.co.uk>

Author: andypols

.github/workflows/unused-dependencies.yml

@@ -21,7 +21,7 @@ jobs:
           node-version: '22.x'
       - name: 'Run depcheck'
         run: |
-          npx depcheck --skip-missing --ignores="tsx,@babel/*,@commitlint/*,eslint,eslint-*,husky,mocha,ts-mocha,ts-node,concurrently,nyc,prettier,typescript,tsconfig-paths,vite-tsconfig-paths"
+          npx depcheck --skip-missing --ignores="tsx,@babel/*,@commitlint/*,eslint,eslint-*,husky,mocha,ts-mocha,ts-node,concurrently,nyc,prettier,typescript,tsconfig-paths,vite-tsconfig-paths,history,@types/domutils"
           echo $?
           if [[ $? == 1 ]]; then
             echo "Unused dependencies or devDependencies found"

index.html

@@ -79,5 +79,5 @@
           To create a production bundle, use `npm run build` or `yarn build`.
         -->
   </body>
-  <script type="module" src="/src/index.jsx"></script>
+  <script type="module" src="/src/index.tsx"></script>
 </html>

package-lock.json

@@ -1,10 +1,10 @@
 {
   "name": "@finos/git-proxy",
-  "version": "1.18.2",
+  "version": "1.19.0",
   "description": "Deploy custom push protections and policies on top of Git.",
   "scripts": {
     "cli": "node ./packages/git-proxy-cli/index.js",
-    "client": "vite --config vite.config.js",
+    "client": "vite --config vite.config.ts",
     "clientinstall": "npm install --prefix client",
     "server": "tsx index.ts",
     "start": "concurrently \"npm run server\" \"npm run client\"",
@@ -88,14 +88,17 @@
     "@babel/preset-react": "^7.22.5",
     "@commitlint/cli": "^19.0.0",
     "@commitlint/config-conventional": "^19.0.0",
+    "@types/domutils": "^1.7.8",
     "@types/express": "^5.0.1",
     "@types/express-http-proxy": "^1.6.6",
     "@types/lodash": "^4.17.15",
     "@types/mocha": "^10.0.10",
     "@types/node": "^22.13.5",
+    "@types/react-dom": "^17.0.11",
+    "@types/react-html-parser": "^2.0.7",
     "@types/yargs": "^17.0.33",
-    "@typescript-eslint/eslint-plugin": "^8.26.1",
-    "@typescript-eslint/parser": "^8.26.1",
+    "@typescript-eslint/eslint-plugin": "^8.29.0",
+    "@typescript-eslint/parser": "^8.29.0",
     "@vitejs/plugin-react": "^4.0.2",
     "chai": "^4.2.0",
     "chai-http": "^4.3.0",

package.json

@@ -1,10 +1,6 @@
-import React, { useEffect } from 'react';
-import { Snackbar, TableCell, TableRow } from '@material-ui/core';
-import GridContainer from '../../../components/Grid/GridContainer';
-import GridItem from '../../../components/Grid/GridItem';
-import { CodeReviewIcon, LawIcon, PeopleIcon } from '@primer/octicons-react';
+// src/constants/languageColors.ts
 
-const colors = {
+export const languageColors: Record<string, string> = {
   '1C Enterprise': '#814CCC',
   '2-Dimensional Array': '#38761D',
   '4D': '#004289',
@@ -563,125 +559,3 @@ const colors = {
   ZIL: '#dc75e5',
   Zimpl: '#d67711',
 };
-
-import axios from 'axios';
-import moment from 'moment';
-import CodeActionButton from '../../../components/CustomButtons/CodeActionButton';
-
-export default function Repositories(props) {
-  const [github, setGitHub] = React.useState({});
-
-  const [errorMessage, setErrorMessage] = React.useState('');
-  const [snackbarOpen, setSnackbarOpen] = React.useState(false);
-
-  useEffect(() => {
-    getGitHubRepository();
-  }, [props.data.project, props.data.name]);
-
-  const getGitHubRepository = async () => {
-    await axios
-      .get(`https://api.github.com/repos/${props.data.project}/${props.data.name}`)
-      .then((res) => {
-        setGitHub(res.data);
-      })
-      .catch((error) => {
-        setErrorMessage(`Error fetching GitHub repository ${props.data.project}/${props.data.name}: ${error}`);
-        setSnackbarOpen(true);
-      });
-  };
-
-  const { project: org, name, proxyURL } = props?.data || {};
-  const cloneURL = `${proxyURL}/${org}/${name}.git`;
-
-  return (
-    <TableRow>
-      <TableCell>
-        <div style={{ padding: '15px' }}>
-          <a href={`/dashboard/repo/${props.data.name}`}>
-            <span style={{ fontSize: '17px' }}>
-              {props.data.project}/{props.data.name}
-            </span>
-          </a>
-          {github.parent && (
-            <span
-              style={{
-                fontSize: '11.5px',
-                display: 'block',
-                opacity: 0.8,
-              }}
-            >
-              Forked from{' '}
-              <a
-                style={{
-                  fontWeight: 'normal',
-                  color: 'inherit',
-                }}
-                href={github.parent.html_url}
-              >
-                {github.parent.full_name}
-              </a>
-            </span>
-          )}
-          {github.description && <p style={{ maxWidth: '80%' }}>{github.description}</p>}
-          <GridContainer>
-            {github.language && (
-              <GridItem>
-                <span
-                  style={{
-                    height: '12px',
-                    width: '12px',
-                    backgroundColor: `${colors[github.language]}`,
-                    borderRadius: '50px',
-                    display: 'inline-block',
-                    marginRight: '5px',
-                  }}
-                ></span>
-                {github.language}
-              </GridItem>
-            )}
-            {github.license && (
-              <GridItem>
-                <LawIcon size='small' />{' '}
-                <span style={{ marginLeft: '5px' }}>{github.license.spdx_id}</span>
-              </GridItem>
-            )}
-            <GridItem>
-              <PeopleIcon size='small' />{' '}
-              <span style={{ marginLeft: '5px' }}>{props.data.users?.canPush?.length || 0}</span>
-            </GridItem>
-            <GridItem>
-              <CodeReviewIcon size='small' />{' '}
-              <span style={{ marginLeft: '5px' }}>
-                {props.data.users?.canAuthorise?.length || 0}
-              </span>
-            </GridItem>
-            {(github.created_at || github.updated_at || github.pushed_at) && (
-              <GridItem>
-                Last updated{' '}
-                {moment
-                  .max([
-                    moment(github.created_at),
-                    moment(github.updated_at),
-                    moment(github.pushed_at),
-                  ])
-                  .fromNow()}
-              </GridItem>
-            )}
-          </GridContainer>
-        </div>
-      </TableCell>
-      <TableCell align='right'>
-        <div style={{ padding: '15px' }}>
-          <CodeActionButton cloneURL={cloneURL} />
-        </div>
-      </TableCell>
-      <Snackbar
-        anchorOrigin={{ vertical: 'top', horizontal: 'center' }}
-        open={snackbarOpen}
-        autoHideDuration={6000}
-        onClose={() => setSnackbarOpen(false)}
-        message={errorMessage}
-      />
-    </TableRow>
-  );
-}

src/ui/views/RepoList/Components/RepoOverview.jsx renamed to src/constants/languageColors.ts

@@ -0,0 +1,8 @@
+import { createContext } from 'react';
+import { UserContextType } from './ui/views/RepoDetails/RepoDetails';
+
+export const UserContext = createContext<UserContextType>({
+  user: {
+    admin: false,
+  },
+});

src/context.js

@@ -1,6 +1,5 @@
 import React from 'react';
 import ReactDOM from 'react-dom';
-import { createBrowserHistory } from 'history';
 import { BrowserRouter as Router, Route, Routes, Navigate } from 'react-router-dom';
 import { AuthProvider } from './ui/auth/AuthProvider';
 
@@ -11,16 +10,14 @@ import './ui/assets/css/material-dashboard-react.css';
 import NotAuthorized from './ui/views/Extras/NotAuthorized';
 import NotFound from './ui/views/Extras/NotFound';
 
-const hist = createBrowserHistory();
-
 ReactDOM.render(
   <AuthProvider>
-    <Router history={hist}>
+    <Router>
       <Routes>
-        <Route exact path='/dashboard/*' element={<Dashboard />} />
-        <Route exact path='/login' element={<Login />} />
-        <Route exact path='/not-authorized' element={<NotAuthorized />} />
-        <Route exact path='/' element={<Navigate from='/' to='/dashboard/repo' />} />
+        <Route path='/dashboard/*' element={<Dashboard />} />
+        <Route path='/login' element={<Login />} />
+        <Route path='/not-authorized' element={<NotAuthorized />} />
+        <Route path='/' element={<Navigate to='/dashboard/repo' />} />
         <Route path='*' element={<NotFound />} />
       </Routes>
     </Router>

src/context.ts

@@ -27,91 +27,73 @@ import RepoDetails from './ui/views/RepoDetails/RepoDetails';
 import RepoList from './ui/views/RepoList/RepoList';
 
 import { RepoIcon } from '@primer/octicons-react';
-
 import { Group, AccountCircle, Dashboard } from '@material-ui/icons';
+import { Route } from './types/models';
 
-const dashboardRoutes = [
+const dashboardRoutes: Route[] = [
   {
     path: '/repo',
     name: 'Repositories',
     icon: RepoIcon,
-    component: (props) => 
-      <RouteGuard
-        component={RepoList}
-        fullRoutePath={`/dashboard/repo`}
-      />,
+    component: (props) => <RouteGuard component={RepoList} fullRoutePath={`/dashboard/repo`} />,
     layout: '/dashboard',
     visible: true,
   },
   {
     path: '/repo/:id',
     name: 'Repo Details',
     icon: Person,
-    component: (props) => 
-      <RouteGuard
-        component={RepoDetails}
-        fullRoutePath={`/dashboard/repo/:id`}
-      />,
+    component: (props) => (
+      <RouteGuard component={RepoDetails} fullRoutePath={`/dashboard/repo/:id`} />
+    ),
     layout: '/dashboard',
     visible: false,
   },
   {
     path: '/push',
     name: 'Dashboard',
     icon: Dashboard,
-    component: (props) =>
-      <RouteGuard
-        component={OpenPushRequests}
-        fullRoutePath={`/dashboard/push`}
-      />,
+    component: (props) => (
+      <RouteGuard component={OpenPushRequests} fullRoutePath={`/dashboard/push`} />
+    ),
     layout: '/dashboard',
     visible: true,
   },
   {
     path: '/push/:id',
     name: 'Open Push Requests',
     icon: Person,
-    component: (props) =>
-      <RouteGuard
-        component={PushDetails}
-        fullRoutePath={`/dashboard/push/:id`}
-      />,
+    component: (props) => (
+      <RouteGuard component={PushDetails} fullRoutePath={`/dashboard/push/:id`} />
+    ),
     layout: '/dashboard',
     visible: false,
   },
   {
     path: '/profile',
     name: 'My Account',
     icon: AccountCircle,
-    component: (props) =>
-      <RouteGuard
-        component={User}
-        fullRoutePath={`/dashboard/profile`}
-      />,
+    component: (props) => <RouteGuard component={User} fullRoutePath={`/dashboard/profile`} />,
     layout: '/dashboard',
     visible: true,
   },
   {
     path: '/admin/user',
     name: 'Users',
     icon: Group,
-    component: (props) =>
-      <RouteGuard
-        component={UserList}
-        fullRoutePath={`/dashboard/admin/user`}
-      />,
+    component: (props) => (
+      <RouteGuard component={UserList} fullRoutePath={`/dashboard/admin/user`} />
+    ),
     layout: '/dashboard',
     visible: true,
   },
   {
     path: '/admin/user/:id',
     name: 'User',
     icon: Person,
-    component: (props) =>
-      <RouteGuard
-        component={User}
-        fullRoutePath={`/dashboard/admin/user/:id`}
-      />,
+    component: (props) => (
+      <RouteGuard component={User} fullRoutePath={`/dashboard/admin/user/:id`} />
+    ),
     layout: '/dashboard',
     visible: false,
   },

src/index.jsx renamed to src/index.tsx

@@ -136,8 +136,12 @@ router.post('/gitAccount', async (req, res) => {
         return;
       }
 
+      const reqUser = await db.findUser(req.user.username);
+      if (username !== reqUser.username && !reqUser.admin) {
+        res.status(403).send('Error: You must be an admin to update a different account').end();
+        return;
+      }
       const user = await db.findUser(username);
-
       console.log('Adding gitAccount' + req.body.gitAccount);
       user.gitAccount = req.body.gitAccount;
       db.updateUser(user);