Merge remote-tracking branch 'origin/main' into jwt-claims-role-mapping

Author: jescalada

.eslintrc.json

@@ -1,5 +1,5 @@
 {
-  "parser": "@babel/eslint-parser",
+  "parser": "@typescript-eslint/parser",
   "env": {
     "node": true,
     "browser": true,
@@ -9,13 +9,23 @@
   },
   "extends": [
     "eslint:recommended",
+    "plugin:@typescript-eslint/recommended",
     "plugin:react/recommended",
     "google",
     "prettier",
     "plugin:json/recommended"
   ],
-  "overrides": [],
+  "overrides": [
+    {
+      "files": ["test/**/*.js", "**/*.json"],
+      "parser": "espree",
+      "rules": {
+        "@typescript-eslint/no-unused-expressions": "off"
+      }
+    }
+  ],
   "parserOptions": {
+    "project": "./tsconfig.json",
     "requireConfigFile": false,
     "ecmaVersion": 12,
     "sourceType": "module",
@@ -27,11 +37,15 @@
       "presets": ["@babel/preset-react"]
     }
   },
-  "plugins": ["react", "prettier"],
+  "plugins": ["@typescript-eslint", "react", "prettier"],
   "rules": {
     "react/prop-types": "off",
     "require-jsdoc": "off",
-    "no-async-promise-executor": "off"
+    "no-async-promise-executor": "off",
+    "@typescript-eslint/no-explicit-any": "warn", // temporary until TS refactor is complete
+    "@typescript-eslint/no-unused-vars": "off", // temporary until TS refactor is complete
+    "@typescript-eslint/no-require-imports": "off", // prevents error on old "require" imports
+    "@typescript-eslint/no-unused-expressions": "off" // prevents error on test "expect" expressions
   },
   "settings": {
     "react": {

.github/workflows/unused-dependencies.yml

@@ -1,8 +1,8 @@
 name: 'Unused Dependencies'
 on: [pull_request]
 
-permissions: 
-  contents: read 
+permissions:
+  contents: read
 
 jobs:
   unused-dependecies:
@@ -20,11 +20,10 @@ jobs:
         with:
           node-version: '18.x'
       - name: 'Run depcheck'
-        run: | 
-          npx depcheck --skip-missing --ignores="@babel/*,@commitlint/*,eslint,eslint-*,husky,mocha,concurrently,nyc,prettier"
+        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"
           echo $?
           if [[ $? == 1 ]]; then
             echo "Unused dependencies or devDependencies found"
             exit 1
           fi
-

config.schema.json

@@ -85,6 +85,16 @@
       "items": {
         "$ref": "#/definitions/authentication"
       }
+    },
+    "tls": {
+      "description": "TLS configuration for secure connections",
+      "type": "object",
+      "properties": {
+        "enabled": { "type": "boolean" },
+        "key": { "type": "string" },
+        "cert": { "type": "string" }
+      },
+      "required": ["enabled", "key", "cert"]
     }
   },
   "definitions": {

cypress/e2e/autoApproved.cy.js

@@ -0,0 +1,72 @@
+import moment from 'moment';
+
+describe('Auto-Approved Push Test', () => {
+  beforeEach(() => {
+    cy.intercept('GET', '/api/v1/push/123', {
+      statusCode: 200,
+      body: {
+        steps: [
+          {
+            stepName: 'diff',
+            content: '',
+          },
+        ],
+        error: false,
+        allowPush: true,
+        authorised: true,
+        canceled: false,
+        rejected: false,
+        autoApproved: true,
+        autoRejected: false,
+        commitFrom: 'commitFrom',
+        commitTo: 'commitTo',
+        branch: 'refs/heads/main',
+        user: 'testUser',
+        id: 'commitFrom__commitTo',
+        type: 'push',
+        method: 'POST',
+        timestamp: 1696161600000,
+        project: 'testUser',
+        repoName: 'test.git',
+        url: 'https://github.com/testUser/test.git',
+        repo: 'testUser/test.git',
+        commitData: [
+          {
+            tree: '1234',
+            parent: '12345',
+          },
+        ],
+        attestation: {
+          timestamp: '2023-10-01T12:00:00Z',
+          autoApproved: true,
+        },
+      },
+    }).as('getPush');
+  });
+
+  it('should display auto-approved message and verify tooltip contains the expected timestamp', () => {
+    cy.visit('/admin/push/123');
+
+    cy.wait('@getPush');
+
+    cy.contains('Auto-approved by system').should('be.visible');
+
+    cy.get('svg.MuiSvgIcon-root')
+      .filter((_, el) => getComputedStyle(el).fill === 'rgb(0, 128, 0)')
+      .invoke('attr', 'style')
+      .should('include', 'cursor: default')
+      .and('include', 'opacity: 0.5');
+
+    const expectedTooltipTimestamp = moment('2023-10-01T12:00:00Z')
+      .local()
+      .format('dddd, MMMM Do YYYY, h:mm:ss a');
+
+    cy.get('kbd')
+      .trigger('mouseover')
+      .then(() => {
+        cy.get('.MuiTooltip-tooltip').should('contain', expectedTooltipTimestamp);
+      });
+
+    cy.contains('approved this contribution').should('not.exist');
+  });
+});

index.js

@@ -0,0 +1,51 @@
+#!/usr/bin/env tsx
+/* eslint-disable max-len */
+import yargs from 'yargs';
+import { hideBin } from 'yargs/helpers';
+import * as fs from 'fs';
+import { configFile, setConfigFile, validate } from './src/config/file';
+import proxy from './src/proxy';
+import service from './src/service';
+
+const argv = yargs(hideBin(process.argv))
+  .usage('Usage: $0 [options]')
+  .options({
+    validate: {
+      description:
+        'Check the proxy.config.json file in the current working directory for validation errors.',
+      required: false,
+      alias: 'v',
+      type: 'boolean',
+    },
+    config: {
+      description: 'Path to custom git-proxy configuration file.',
+      default: 'proxy.config.json',
+      required: false,
+      alias: 'c',
+      type: 'string',
+    },
+  })
+  .strict()
+  .parseSync();
+
+setConfigFile(argv.c as string || "");
+
+if (argv.v) {
+  if (!fs.existsSync(configFile)) {
+    console.error(
+      `Config file ${configFile} doesn't exist, nothing to validate! Did you forget -c/--config?`,
+    );
+    process.exit(1);
+  }
+
+  validate();
+  console.log(`${configFile} is valid`);
+  process.exit(0);
+}
+
+validate();
+
+proxy.start();
+service.start();
+
+export { proxy, service };