diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 190228018125ffa2d883f2d15fb9a0a62d9199f6..ae5ab05a853cd50643c78deca9ac4e743085cdfc 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -240,7 +240,7 @@ release:doc:wiki: # Push the change back to the master branch of the wiki - git push origin "HEAD:main" rules: - - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH + - when: never release:gitlab: diff --git a/ExpressAPI/.env.vault b/ExpressAPI/.env.vault index 7ac1c765633f9f8b279fde28bbfbb846b14d968a..ffc78bfda9655dd082d4cc9b85abaec0929edb83 100644 --- a/ExpressAPI/.env.vault +++ b/ExpressAPI/.env.vault @@ -4,7 +4,7 @@ #/--------------------------------------------------/ # development -DOTENV_VAULT_DEVELOPMENT="NqYn17d990xqkl4t1qrPJcCm4D7N6DJVH9QffHCO8Qa+9YYOZLKASTb1VQN3nEbM4hbno4GDP5tX9nF5Nq3KCDd/QK2MuSGpRy/ab7JV8KbG/TsYCcUcTC8j6FvE1pfbeRSXskBgH4HbTDFJWfOfke7RbqcAqrlhQE72T0vEDYTuJqQrilQljzaDVwOw2JW/iZFXForpG5KYP4JZeGXuiyzwrFa+lRrdgm1oIiR9hENP+kcqCWDfySvCWJLqUAal+L7WAR4obue6ASSEZn/GGE1jZHD+8KrHJKyNzKBpdzaGcpeuuXuT8Qp9takZQ0Y0vf+LJVUGxy1oibwpIVOmsT/ICnmmfyYVW1VheOuMFPueTFTzrcgCtiw+E9U7TfIOufDFkpFz5sF7zTzkM2rc4nNEgRSCsNibkfM1Btc9Tt2CviJwk6NXBlb0r8+BW9aEMHv7r0Kf/WW7C6D3Rgma1LhxGYDhDsQOfBDpxMoEFmkGV4t2xVH+OKLpyU+8afFZE75Tfhwuhp0aLKfm/Dyo83/+98KSgNNRqKllvSm9Ar3qE/9DQLJZkBJGw5ZmnDJ4l6hAGHN4Wr0eQa0qqzh9oE7UXId/0i4ZH1b1GQYUrCiLeqYejv2A3gEG2ZIlf0qHiWltEhqNa85HkpO9oZg0OGPYvIz7DOqOGn8tnjR+zPxmDjiGyV66LnU/+7sK/itKwF3AIljQS1nz2oxZoD3OM3CVjNHufwN2HHaOh0qdchA46RX0Jj4LuZL579IV9Hd9jXKO9gjouyjzAwSloxRssFbi3JlWCd2QJFu04U4UTeNvL1jb+N/knGOzTdTEee4sCvdl8Rc/lii2gf8YaB6N8ga74ZOocvBUBxWmS/TdTzh35PkP5YNVNOBPJ4kLoozA7CPBCqvo7WWijlSMRq81XcWAsHWEBptXYQB9NeHwWZc09UyVYewdWgIQ6m5Gtdl361tjRxMzYFeEnpObVz0bhBulqbtx3UtpBFO2DjV3VrqFKDIcBExFOc67iUTXHUmgFjZ2oS6+n+61NxJ42xhacBYnQYcKrPwhabrTCLDOpRh/7aDsGCKmD5KzD/r6qmv9WmC3IYYxn2coYsCUNEBFcRn+MqbUO6PSfgLHD6aSe3lnRQOhvdbkIJqQ8VfqB4mAW8av56cljBafZmcqa221bDUwMfhI8wrWb6ddxcVtAjpkWBlLbjnwFhqHtCLPKN+Gd5Pwc6IpnJPAZmCd1+UbZXJzoFT7apzmdh7VlEpCHkEbj8yTzn9TA7H3GdtOEv/4M/x+OlgB3OixXYNfPwnrZzEHxrWjsvADTXxj5EQUlxuXaS5f4fQN3SoSJooRqhyeEEfNFL4T5JaUY9AMI9RiZxBbAzj/LEi+zmZ8bZTkcwmB1ALoaIOiwyPpHt1S+7f3Uulqm4dvvvuNAwWo+IgGv2T/tNztO+PhfAJ2+IoGny+bQ/GggMifDuRLEmKfFz2EEeqOE+aIKGBasn27+gACHjBZ52BZAJH/GmpwPd+08gV+pTnCkLCfXhErOpaQKstCD76Sn1lUwCpI2eDPzQWUOHSgaNxzUtELFaqUCVL3pa+wO0elknfD4EsKKsBc8vpQYeOaADtfndpaJPbZ/xshhee82Vh3p0d+acYLq8xyActP+B/+fpaxg10HXkpjcypsDAjORZqStsYdirGBArdqKjFk0Y7+dybqeSrdNNK0DlkP6kAK9dZAh6pJ4AAw7hCpEJ+I+XPXByx/25TWlWmHWwnPW7luTLU6+VA=" +DOTENV_VAULT_DEVELOPMENT="Fd25NWoFJbBzT9wwBCRGUOXTJ1c7zrEJ+iju5jTuU6Vm0K6JwkdsL/TO2+Lb5Qw1VGuSsly+oU/Dm0hrdjwP6Tjo67Xi8Mgct8Hs7MzsAzfSqvY0if0V7imVM5GhjwxnOD6wc9RZeb1iNeBflrcp69LhFHWY8DzX9DL75BeXCmDJyk2E/jD64othmpognt7e5pwznljWcxd1zZaMUMHfV0GlWiLdJfr712D4kFOtqW4TGL0Dh1s/E/xI8TY/HnwmFRDL5n4KiAWg89gFi3OxpRUOQeTHOtq5RwVo3Bi+ImFpbFRtfFkxOT5SLoPvnQrljR/VzcQw8cFuSeCsEfnN/4dabm7TVfsN906UsEQcX1gbYB1PmejWfNcD533kaew0Nw7PxNonoHqqPHQbzjKb+d3P63j3UmHeUJy2oZoIswAuhi0/uENDFzvN9dahBGeZmhJHFAkBiyTl5LMboCPWLyUzdx4ACM0qAsV/gTRv2ZkZI6UJ7GKei7SsDddbWeppK+vsHFgWpKRJtWflbHSqlGMT0uDRXo8B8LvulMwwz1NGXYC99QNkrNnQDFKa9OCAjVRAu0EnBHGYaK/dyZm69Wx44n4gP1ZQqzwxAqJvJIMkF1VjNsJpVcxOsTUQ6eEIGhIrRYBtjYHSPUHmVffpbgBHEwdChn4y62L+98+SSxkeTCjhZRLdEhwzObLVd5DYhED/tKVUW44Ut5pAOt/ZNULM2PixH0StlPCFpqQMkeX4GTCldC8agwzj2Mj5QHSAdhQwBS0hdwHR6fbxUO3OCQ7aNjU/M/cBCSgJb9KyP5Yn9vhDSjIea/itaOWhTLC8sXNfBbArkRgwDQWBj/PL8yBgSTJRlDX5g9jYWf1v9dJpzqpMr3K2dEjqJ+ymWSGpLuFDC19s2OwBM/+RA3zwvEVUTP0/QNeLHVQR88DBbdIzttnEKscEtz2KBZ1GISeo5zkhQCw3PtI3438lj5ybYOvq9psb8APC4VyfWWJwToR4DfuLzFvHYjBTWhSpzRSRwGdG7FOhS+z5azc3NVQ8h9qCD6ImZ05AtQtBnYYVPrKxP2y1lx0ZaY8+FKqGZtLowgGecSidhJdelw4+tZaf7yL6MaE6gJGPhWuyTKTJeVGSYy6W+aGW0EuvhhlW5cUpUvSD60cIUHTHDghMUOJVoo7y4s7eghixnP3S/tfXZDQCSgl5h2veogPMS4cGBIlg9x7Dp5wY95xsp+9bHu34w05K7EiXRDwa2gH4kaX8KrDmyXKaCG0b7LI0Th888kw61pz0Row/MepeVVJB+oTQvOH1+zezw93zBtEU4TB0PA1KCne29Qd+vzsbTIa+82+1cndhoBm0KLxPYHnten4hMAcPq1s3/elIwyl1vmF3hJ6ZTBeqyrc674PQu/kOkh1B55CbV2MQLYHxOA4awVF35vmc1l53Y26uqtXkvCK7f6m5sj8NCc2lmPEe4HSHSRF3E3TojOzrlcRwkmkZzVulJgFSOViLIDmJ8Fnr3lseb7d43yyos2LjvMrLpjAZq372XRT1VyN2oAuBVOzM2dSnL8Mu/pPxVWE9/z9zxkoB1Yf65FWHoJYI8WZH9Ya6aIvXF0BoAeI9JgdyYcg53Ua01kaI6w1SLo0REI9xesw2t7VeeWrWQX0Mst0Q0T+Qarv75rvF9vmQkF3uK3FQgBEMc4S09zYsVyZmpuOV2RRwGrQj/vn7u0bjpMF6grM2nocfyd89Uaj03TSLNhQPIzq0zpl/Mdhqsec=" # production DOTENV_VAULT_PRODUCTION="0OzXeuQZxAt17kp/qb9ocAB9iAjs1CxKeWnrV5bOpSfxdQzuWnbKq5QdPOPhFOF/PfK5bhwXZ9Rwc/2ZcpJHTyRQvi24/y3pUf4GjWeKBVn+MynOeO7X8OMgW5xQpmz7Gfgn198gFOIl8A57dtE00rCa+itlnkM/srqPWWsySkvoO0ncScqZJRQVK1r1w+jiM8SV1Ikcq/RMr5n3xHEd3fZLmuHdp3AGcZ8opo/nNu9GEXMWCoGTgdYUaTzwnEbzHvP/9dGRrQiFd9hZjM96rXjYOPBadLmNC63u3YaaJ+AztChZM7QnMYy0FHqvQT4OIVWqkB1H+hxaavnENrd0MAkEhVg/kCHN7Ao1cvauPwh9gWlIbOvTH4Q231hkXDz3Ud07kX07VLYKEZUBG8yjkjSmTS+UQ8oWzBRwtvW7FKcDSOYiG5sw7oY16TSrHe+rAQUwB0Ii6PaP9UM/yQ5GUNePBQwwPkc9w2mU4SDzmh1e78kqK5HIRH+GtT/ld4HgVbkOoJkdAUtqJJwdNwaUkrT17Z5CV56+6ntydZhoa14urPBU9AaiDaC+EhhnnIjTeTdQaev02t9d2iqm5M67GgLsADlyGlzVtr2Dpn+Dtnvic8Qw0CE9zhGUwh11GQdImUYpr7QPvmAI/Rr6gFetWTaIyh7Uz8KixINqMvWlVmS0KNN46R9g2GeeBqKqJ5hF0k6i+psWquZo988cE5mYIb9FTe1lQL2mfGAJiIz7YKHLDTZEIOtD7DV74Tb4E3ylXFS6JZPuIv2ehhZO+4GqYaXAvjWpLDfFOAR3rbzBs92ZHmnbebyh6bEaU7G8ojDxYSddfGeB+R/Vts/WFJfxpcB04kAeOSdb4uSS6qh2inq9eAHO3lfeD3CyJ4Q7l0GwHSLB2sxm4cfYw7kZgPQMaaO2hOanQSG5JiAhQi+zyF1p3vUVwgVeepuF3scF4EpU/sBtBm9k7qoonIsGYKRcEiQUcRj6zOCGgmkKshqdNIVUvRfioBgkHiz+ozx3sSdA8hKrqw17LcDFHJr/m4VjixxbNRtK1pi9VCsw4n6Yrp6ezNa+3CU4M5BfXeDHsA2kPBwrie//wmiliq0cq1KR0xp51SBOG5NhBmx7Bf086D6nLKWpC5PATL6GsptiZs0TkPGIYTjh/Suh6usZ9NU9pUKaB88lVQuMgAHkRKG3Z6Qhb9nWoqUEBCi/LkkAk1u4e/rKTEBBxa/hTH8q9dfo9VX8XbgKS1LJXaYAV2aXn/dAfn4W4/yFsyL3n7M9LabXVVEIxc9Lh0j4QrRtmvsYv0cptIsdxMlpobWlKB9eVfEMo79TBAnJIOgt18ihWfUq57bClN9qyRZ7qV7N4mG4AgfG/Zx3o5Kvpyp6FqI0KlGRhgcUDkUt/CDy/RHjQ+U1VbybbbrPdSu6xw3fmrWbf095YLP2vZGuC7o1RZUGM4hbLkGlpfMkw4izcNmD5K3E1Zwmuh2JhlqZZf7AA3l5EjTCTL4FudNm8mRpbvJ7qgEA0tawozC52HtngnrlaTS+LMuN7YsoUh2w61JFkbCTjzMbQ8uCXjArW21tPWaHBQqm2jMyOYN1/wIPIM8E6LVHUq0N68jOVZC5bxIt0bT+sTxzUT2U1pz9kHiOoKUOQYl/Kj+0Z6H5zTotyNEpomkmpukudLcjkmjxfcJkOrFZQfbQdRCO5Jl8Pce4u0Z0EDfOskkEwRWBPCZnlqR/jajBaP2qGMySbS6l8v7YSuzfuSUA2/c56x0yCoFhc7+d90C5" diff --git a/ExpressAPI/config.env b/ExpressAPI/config.env index e3f29d426c0823ec9767c546c037c65ae4fe706e..346d74e903fb1f2b8b5c3cd15e476c51f774032f 100644 --- a/ExpressAPI/config.env +++ b/ExpressAPI/config.env @@ -1,5 +1,5 @@ ########################### Server env vars -API_PORT=30992 +API_PORT=30993 LOGS_FOLDER=logs diff --git a/ExpressAPI/src/config/Config.ts b/ExpressAPI/src/config/Config.ts index e191f2162d1780d14fe48c39c9e1c934916e4cdb..58a659cbf15fb66685cff315e84f8d82dfb59e71 100644 --- a/ExpressAPI/src/config/Config.ts +++ b/ExpressAPI/src/config/Config.ts @@ -72,7 +72,7 @@ class Config { constructor() { this.api = { - port: Number(process.env.API_PORT || 30992) + port: Number(process.env.API_PORT || 0) }; this.requestClientValidation = JSON5.parse(process.env.REQUEST_CLIENT_VALIDATION || '{"version": {}}'); diff --git a/ExpressAPI/src/express/API.ts b/ExpressAPI/src/express/API.ts index c8df2c015aee0c6cf1b6a3aa7e5f06bf4a37fae7..452f821664f4c72bce52300fdb31a8cdfbea0380 100644 --- a/ExpressAPI/src/express/API.ts +++ b/ExpressAPI/src/express/API.ts @@ -16,7 +16,6 @@ import compression from 'compression'; import ClientVersionCheckerMiddleware from '../middlewares/ClientVersionCheckerMiddleware.js'; import swaggerUi from 'swagger-ui-express'; import path from 'path'; -import DojoCliVersionHelper from '../helpers/DojoCliVersionHelper.js'; class API implements WorkerTask { @@ -45,12 +44,15 @@ class API implements WorkerTask { this.backend.use(cors()); //Allow CORS requests this.backend.use(compression()); //Compress responses - this.backend.use((_req, res, next) => { - DojoCliVersionHelper.getLatestVersion().then(latestVersion => { - res.header('dojocli-latest-version', latestVersion); - next(); - }); + /* + this.backend.use((_req, res, next) => { + + DojoCliVersionHelper.getLatestVersion().then(latestVersion => { + res.header('dojocli-latest-version', latestVersion); + next(); + }); }); + */ } private initOpenAPI() { diff --git a/ExpressAPI/src/init.ts b/ExpressAPI/src/init.ts index 98c30469cf440496d2a1871731dbafc5ed1435d0..5c8026f79fd773ecd7b7defb81d1c01913fcd66f 100644 --- a/ExpressAPI/src/init.ts +++ b/ExpressAPI/src/init.ts @@ -7,9 +7,7 @@ import './shared/helpers/TypeScriptExtensions.js'; if ( cluster.isPrimary ) { if ( process.env.NODE_ENV && process.env.NODE_ENV === 'production' ) { - dotenvExpand.expand(dotenv.config({ - path: [ path.join(__dirname, '../.env'), path.join(__dirname, '../config.env') ] - })); + dotenvExpand.expand(dotenv.config()); } else { dotenv.config({ path: path.join(__dirname, '../.env.keys') }); dotenvExpand.expand(dotenv.config({ DOTENV_KEY: process.env.DOTENV_KEY_DEVELOPMENT })); diff --git a/ExpressAPI/src/shared b/ExpressAPI/src/shared index d9ecaee5f58b1b94413903ebf737b4d235bc2858..de8af98ab1085f83a5756e797812b400298689dd 160000 --- a/ExpressAPI/src/shared +++ b/ExpressAPI/src/shared @@ -1 +1 @@ -Subproject commit d9ecaee5f58b1b94413903ebf737b4d235bc2858 +Subproject commit de8af98ab1085f83a5756e797812b400298689dd