Merge branch 'main' into 946-associate-commits-by-email-rebase

Author: kriswest

README.md

@@ -114,6 +114,8 @@ Drop a note, ask a question or just say hello in our [community Slack channel](h
 
 If you can't access Slack, you can also [subscribe to our mailing list](mailto:[email protected]).
 
-Join our [fortnightly Zoom meeting](https://zoom.us/j/97235277537?pwd=aDJsaE8zcDJpYW1vZHJmSTJ0RXNZUT09) on Monday, 11AM EST (odd week numbers). Send an e-mail to [[email protected]](mailto:[email protected]) to get a calendar invitation.
+🤝 Join our [fortnightly Zoom meeting](https://zoom-lfx.platform.linuxfoundation.org/meeting/95849833904?password=99413314-d03a-4b1c-b682-1ede2c399595) on Monday, 4PM BST (odd week numbers). 
+🌍 [Convert to your local time](https://www.timeanddate.com/worldclock)
+📅 [Click here](https://calendar.google.com/calendar/event?action=TEMPLATE&tmeid=MTRvbzM0NG01dWNvNGc4OGJjNWphM2ZtaTZfMjAyNTA2MDJUMTUwMDAwWiBzYW0uaG9sbWVzQGNvbnRyb2wtcGxhbmUuaW8&tmsrc=sam.holmes%40control-plane.io&scp=ALL) for the recurring Google Calendar meeting invite. Alternatively, send an e-mail to [[email protected]](https://zoom-lfx.platform.linuxfoundation.org/meeting/95849833904?password=99413314-d03a-4b1c-b682-1ede2c399595#:~:text=Need-,an,-invite%3F) to get a calendar invitation. 
 
 Otherwise, if you have a deeper query or require more support, please [raise an issue](https://github.com/finos/git-proxy/issues).

cypress/e2e/repo.cy.js

@@ -10,7 +10,7 @@ describe('Repo', () => {
 
   describe('Code button for repo row', () => {
     it('Opens tooltip with correct content and can copy', () => {
-      const cloneURL = 'http://localhost:8000/finos/test-repo.git';
+      const cloneURL = 'http://localhost:8000/finos/git-proxy.git';
       const tooltipQuery = 'div[role="tooltip"]';
 
       cy
@@ -19,8 +19,8 @@ describe('Repo', () => {
         .should('not.exist');
 
       cy
-        // find the entry for finos/test-repo
-        .get('a[href="/dashboard/repo/test-repo"]')
+        // find the entry for finos/git-proxy
+        .get('a[href="/dashboard/repo/git-proxy"]')
         // take it's parent row
         .closest('tr')
         // find the nearby span containing Code we can click to open the tooltip

experimental/li-cli/package-lock.json

@@ -17,7 +17,7 @@
     "@inquirer/prompts": "^7.6.0",
     "yaml": "^2.8.0",
     "yargs": "^17.7.2",
-    "zod": "^3.25.67"
+    "zod": "^3.25.73"
   },
   "devDependencies": {
     "@jest/globals": "^29.7.0",

experimental/li-cli/package.json

@@ -46,7 +46,6 @@
     "axios": "^1.6.0",
     "bcryptjs": "^3.0.2",
     "bit-mask": "^1.0.2",
-    "body-parser": "^1.20.1",
     "classnames": "2.5.1",
     "concurrently": "^9.0.0",
     "connect-mongo": "^5.1.0",

package-lock.json

@@ -3,18 +3,24 @@ export type ServerConfig = {
   GIT_PROXY_HTTPS_SERVER_PORT: string | number;
   GIT_PROXY_UI_HOST: string;
   GIT_PROXY_UI_PORT: string | number;
+  GIT_PROXY_COOKIE_SECRET: string | undefined;
+  GIT_PROXY_MONGO_CONNECTION_STRING: string;
 };
 
 const {
   GIT_PROXY_SERVER_PORT = 8000,
   GIT_PROXY_HTTPS_SERVER_PORT = 8443,
   GIT_PROXY_UI_HOST = 'http://localhost',
   GIT_PROXY_UI_PORT = 8080,
+  GIT_PROXY_COOKIE_SECRET,
+  GIT_PROXY_MONGO_CONNECTION_STRING = 'mongodb://localhost:27017/git-proxy',
 } = process.env;
 
 export const serverConfig: ServerConfig = {
   GIT_PROXY_SERVER_PORT,
   GIT_PROXY_HTTPS_SERVER_PORT,
   GIT_PROXY_UI_HOST,
   GIT_PROXY_UI_PORT,
+  GIT_PROXY_COOKIE_SECRET,
+  GIT_PROXY_MONGO_CONNECTION_STRING,
 };

package.json

@@ -1,6 +1,7 @@
 import { existsSync, readFileSync } from 'fs';
 
 import defaultSettings from '../../proxy.config.json';
+import { serverConfig } from './env';
 import { configFile, validate } from './file';
 import { ConfigLoader, Configuration } from './ConfigLoader';
 import {
@@ -23,7 +24,7 @@ let _apiAuthentication: Authentication[] = defaultSettings.apiAuthentication;
 let _tempPassword: TempPasswordConfig = defaultSettings.tempPassword;
 let _proxyUrl = defaultSettings.proxyUrl;
 let _api: Record<string, unknown> = defaultSettings.api;
-let _cookieSecret: string = defaultSettings.cookieSecret;
+let _cookieSecret: string = serverConfig.GIT_PROXY_COOKIE_SECRET || defaultSettings.cookieSecret;
 let _sessionMaxAgeHours: number = defaultSettings.sessionMaxAgeHours;
 let _plugins: any[] = defaultSettings.plugins;
 let _commitConfig: Record<string, any> = defaultSettings.commitConfig;
@@ -82,6 +83,10 @@ export const getDatabase = () => {
     if (ix) {
       const db = _database[ix];
       if (db.enabled) {
+        // if mongodb is configured and connection string unspecified, fallback to env var
+        if (db.type === 'mongo' && !db.connectionString) {
+          db.connectionString = serverConfig.GIT_PROXY_MONGO_CONNECTION_STRING;
+        }
         return db;
       }
     }
@@ -124,7 +129,7 @@ export const getAPIAuthMethods = (): Authentication[] => {
   const enabledAuthMethods = _apiAuthentication.filter((auth) => auth.enabled);
 
   if (enabledAuthMethods.length === 0) {
-    console.log("Warning: No authentication method enabled for API endpoints.");
+    console.log('Warning: No authentication method enabled for API endpoints.');
   }
 
   return enabledAuthMethods;

src/config/env.ts

@@ -1,5 +1,4 @@
 import express, { Application } from 'express';
-import bodyParser from 'body-parser';
 import http from 'http';
 import https from 'https';
 import fs from 'fs';
@@ -57,8 +56,6 @@ export const proxyPreparations = async () => {
 // just keep this async incase it needs async stuff in the future
 const createApp = async (): Promise<Application> => {
   const app = express();
-  // Setup the proxy middleware
-  app.use(bodyParser.raw(options));
   app.use('/', router);
   return app;
 };