chore: merge branch 'main' into feat/fix-config

package.json

@@ -1,13 +1,13 @@
 {
   "name": "@finos/git-proxy",
-  "version": "1.5.0",
+  "version": "1.5.1",
   "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",
     "clientinstall": "npm install --prefix client",
     "server": "node index.js",
-    "start": "concurrently 'npm run server' 'npm run client'",
+    "start": "concurrently \"npm run server\" \"npm run client\"",
     "build": "vite build",
     "test": "NODE_ENV=test mocha --exit",
     "test-coverage": "nyc npm run test",

src/proxy/processors/push-action/blockForAuth.js

@@ -1,15 +1,16 @@
-const Step = require('../../actions').Step;
+const { getServiceUIURL } = require('../../../service/urls');
 
-const { GIT_PROXY_UI_PORT: uiPort } = require('../../../config/env').Vars;
+const Step = require('../../actions').Step;
 
 const exec = async (req, action) => {
   const step = new Step('authBlock');
+  const url = getServiceUIURL(req);
 
   const message =
     '\n\n\n' +
     `\x1B[32mGitProxy has received your push ✅\x1B[0m\n\n` +
     '🔗 Shareable Link\n\n' +
-    `\x1B[34mhttp://localhost:${uiPort}/admin/push/${action.id}\x1B[0m` +
+    `\x1B[34m${url}/admin/push/${action.id}\x1B[0m` +
     '\n\n\n';
   step.setAsyncBlock(message);
 

src/proxy/processors/push-action/pullRemote.js

@@ -16,7 +16,7 @@ const exec = async (req, action) => {
     }
 
     if (!fs.existsSync(action.proxyGitPath)) {
-      fs.mkdirSync(action.proxyGitPath, '0777', true);
+      fs.mkdirSync(action.proxyGitPath, '0755', true);
     }
 
     const cmd = `git clone ${action.url} --bare`;

src/service/routes/repo.js

@@ -1,7 +1,7 @@
 const express = require('express');
 const router = new express.Router();
 const db = require('../../db');
-const { getProxyURL } = require('../proxyURL');
+const { getProxyURL } = require('../urls');
 
 router.get('/', async (req, res) => {
   const proxyURL = getProxyURL(req);

src/service/proxyURL.js → src/service/urls.js

@@ -10,4 +10,11 @@ module.exports = {
     );
     return config.getDomains().proxy ?? defaultURL;
   },
+  getServiceUIURL: (req) => {
+    const defaultURL = `${req.protocol}://${req.headers.host}`.replace(
+      `:${PROXY_HTTP_PORT}`,
+      `:${UI_PORT}`,
+    );
+    return config.getDomains().service ?? defaultURL;
+  },
 };

test/proxyURL.test.js

@@ -2,7 +2,7 @@ const chai = require('chai');
 const sinon = require('sinon');
 const express = require('express');
 const chaiHttp = require('chai-http');
-const { getProxyURL } = require('../src/service/proxyURL');
+const { getProxyURL } = require('../src/service/urls');
 const config = require('../src/config');
 
 chai.use(chaiHttp);