From ee9b317a87d9fdd37b093b2b954836e035e2e2c9 Mon Sep 17 00:00:00 2001 From: princegupta1131 <114015020+princegupta1131@users.noreply.github.com> Date: Fri, 8 Aug 2025 14:30:12 +0530 Subject: [PATCH 1/6] Added frac-etl-service service route in UI proxy --- src/proxies_v8/proxies_v8.ts | 5 +++++ src/utils/proxyCreator.ts | 21 +++++++++++++++++++++ src/utils/whitelistApis.ts | 6 ++++++ 3 files changed, 32 insertions(+) diff --git a/src/proxies_v8/proxies_v8.ts b/src/proxies_v8/proxies_v8.ts index 0fcd1ad5..14c79745 100644 --- a/src/proxies_v8/proxies_v8.ts +++ b/src/proxies_v8/proxies_v8.ts @@ -14,6 +14,7 @@ import { proxyContent, proxyContentLearnerVM, proxyCreatorDownloadCertificate, + proxyCreatorEtlFrac, proxyCreatorForms, proxyCreatorKnowledge, proxyCreatorLearner, @@ -202,6 +203,10 @@ proxiesV8.use( '/content', proxyCreatorRoute(express.Router(), CONSTANTS.CONTENT_API_BASE + '/content') ) +proxiesV8.use( + '/fractv1', + proxyCreatorEtlFrac(express.Router(), CONSTANTS.FRAC_ETL_API_BASE) +) proxiesV8.use( '/registry', proxyCreatorRoute(express.Router(), CONSTANTS.REGISTRY_API_BASE) diff --git a/src/utils/proxyCreator.ts b/src/utils/proxyCreator.ts index 4d4558d0..888d947b 100644 --- a/src/utils/proxyCreator.ts +++ b/src/utils/proxyCreator.ts @@ -472,3 +472,24 @@ export function proxyCreatorDownloadCertificate( }) return route } +/** + * Proxies requests from the frontend to the etl-frac service. + * @param route The express router to which the proxy routes should be added. + * @param targetUrl The URL of the etl-frac service. + * @param timeout The maximum time in milliseconds that the proxy should wait for a response from the etl-frac service. + * @returns The express router with the proxy routes added. + */ +export function proxyCreatorEtlFrac( + route: Router, + targetUrl: string, + timeout = 10000 +): Router { + route.all('/*', (req, res) => { + // tslint:disable-next-line: no-console + console.log('REQ_URL_ORIGINAL_FRAC', req.originalUrl) + proxyCreator(timeout).web(req, res, { + target: targetUrl, + }) + }) + return route +} diff --git a/src/utils/whitelistApis.ts b/src/utils/whitelistApis.ts index dac59f9c..066a44f0 100644 --- a/src/utils/whitelistApis.ts +++ b/src/utils/whitelistApis.ts @@ -512,6 +512,11 @@ export const API_LIST = { // tslint:disable-next-line: object-literal-sort-keys ROLE_CHECK: [ROLE.PUBLIC], }, + '/proxies/v8/fractv1': { + checksNeeded: [CHECK.ROLE], + // tslint:disable-next-line: object-literal-sort-keys + ROLE_CHECK: [ROLE.PUBLIC], + }, '/protected/v8/admin/userRegistration/bulkUpload': { checksNeeded: [CHECK.ROLE], // tslint:disable-next-line: object-literal-sort-keys @@ -1614,6 +1619,7 @@ export const API_LIST = { '/proxies/v8/learner/course/v1/enrol', '/proxies/v8/learnervm/private/content/v3/retire/', '/proxies/v8/private/content/v3/update/:do_id', + "/proxies/v8/fractv1", '/protected/v8/user/profileDetails/test', '/protected/v8/resource/', '/protected/v8/user/details', From a9518755173be51ecae732537cf95354f208af03 Mon Sep 17 00:00:00 2001 From: gohilamariappan <41056032+gohilamariappan@users.noreply.github.com> Date: Fri, 8 Aug 2025 14:51:31 +0530 Subject: [PATCH 2/6] Update Dockerfile --- Dockerfile | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 58da514b..a9060e00 100644 --- a/Dockerfile +++ b/Dockerfile @@ -8,8 +8,10 @@ RUN mkdir -p /usr/src/app/logs COPY package*.json ./ RUN npm install --only=production COPY dist/ . -RUN sed -i 's/stretch/buster/' /etc/apt/sources.list && apt-get update && apt-get install libgbm-dev ca-certificates fonts-liberation libappindicator3-1 libasound2 libatk-bridge2.0-0 libatk1.0-0 libc6 libcairo2 libcups2 libdbus-1-3 libexpat1 libfontconfig1 libgbm1 libgcc1 libglib2.0-0 libgtk-3-0 libnspr4 libnss3 libpango-1.0-0 libpangocairo-1.0-0 libstdc++6 libx11-6 libx11-xcb1 libxcb1 libxcomposite1 libxcursor1 libxdamage1 libxext6 libxfixes3 libxi6 libxrandr2 libxrender1 libxss1 libxtst6 lsb-release wget xdg-utils -y - +RUN sed -i '/stretch-updates/d' /etc/apt/sources.list && \ + sed -i 's|http://deb.debian.org/debian|http://archive.debian.org/debian|g' /etc/apt/sources.list && \ + sed -i 's|http://security.debian.org/debian-security|http://archive.debian.org/debian-security|g' /etc/apt/sources.list && \ + echo 'Acquire::Check-Valid-Until "false";' > /etc/apt/apt.conf.d/99no-check-valid-until && apt-get update && apt-get install libgbm-dev ca-certificates fonts-liberation libappindicator3-1 libasound2 libatk-bridge2.0-0 libatk1.0-0 libc6 libcairo2 libcups2 libdbus-1-3 libexpat1 libfontconfig1 libgbm1 libgcc1 libglib2.0-0 libgtk-3-0 libnspr4 libnss3 libpango-1.0-0 libpangocairo-1.0-0 libstdc++6 libx11-6 libx11-xcb1 libxcb1 libxcomposite1 libxcursor1 libxdamage1 libxext6 libxfixes3 libxi6 libxrandr2 libxrender1 libxss1 libxtst6 lsb-release wget xdg-utils -y EXPOSE 8080 CMD [ "node", "index.js" ] From 11edd23cacaf57391620130805262356ddbdccc9 Mon Sep 17 00:00:00 2001 From: princegupta1131 <114015020+princegupta1131@users.noreply.github.com> Date: Fri, 8 Aug 2025 16:23:22 +0530 Subject: [PATCH 3/6] remvoed double quots to single --- src/utils/whitelistApis.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/utils/whitelistApis.ts b/src/utils/whitelistApis.ts index 066a44f0..77ee9a74 100644 --- a/src/utils/whitelistApis.ts +++ b/src/utils/whitelistApis.ts @@ -1619,7 +1619,7 @@ export const API_LIST = { '/proxies/v8/learner/course/v1/enrol', '/proxies/v8/learnervm/private/content/v3/retire/', '/proxies/v8/private/content/v3/update/:do_id', - "/proxies/v8/fractv1", + '/proxies/v8/fractv1', '/protected/v8/user/profileDetails/test', '/protected/v8/resource/', '/protected/v8/user/details', From 5c2351e3421d374f8d9a4d0dfa07b0c56551960a Mon Sep 17 00:00:00 2001 From: gohilamariappan <41056032+gohilamariappan@users.noreply.github.com> Date: Fri, 8 Aug 2025 16:24:47 +0530 Subject: [PATCH 4/6] Update Dockerfile.build --- Dockerfile.build | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/Dockerfile.build b/Dockerfile.build index 178508f2..7b6fa1eb 100644 --- a/Dockerfile.build +++ b/Dockerfile.build @@ -6,8 +6,12 @@ WORKDIR /usr/src/app COPY . . -RUN sed -i 's/stretch/buster/' /etc/apt/sources.list && apt update && apt install -y zip - +RUN sed -i '/stretch-updates/d' /etc/apt/sources.list && \ + sed -i 's|http://deb.debian.org/debian|http://archive.debian.org/debian|g' /etc/apt/sources.list && \ + sed -i 's|http://security.debian.org/debian-security|http://archive.debian.org/debian-security|g' /etc/apt/sources.list && \ + echo 'Acquire::Check-Valid-Until "false";' > /etc/apt/apt.conf.d/99no-check-valid-until && \ + apt update && \ + apt install -y zip libjpeg-turbo-progs nasm RUN npm install && npm run build RUN zip -r dist.zip dist From b09aa88cf81324c0a6bb80d753693d627f8ee9ff Mon Sep 17 00:00:00 2001 From: princegupta1131 <114015020+princegupta1131@users.noreply.github.com> Date: Fri, 8 Aug 2025 17:08:16 +0530 Subject: [PATCH 5/6] fract const added --- src/utils/env.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/src/utils/env.ts b/src/utils/env.ts index 10637fc1..37a70a95 100644 --- a/src/utils/env.ts +++ b/src/utils/env.ts @@ -35,6 +35,7 @@ export const CONSTANTS = { COMPETENCY_ROLES_DATA_PATH: env.COMPETENCY_ROLES_WISE_DATA_PATH || '', COMPETENCY_ROLES_MAPPING_PATH: env.COMPETENCY_ROLES_MAPPING_PATH || '', CONTENT_API_BASE: env.CONTENT_API_BASE || 'http://localhost:5903', + FRAC_ETL_API_BASE: env.FRAC_ETL_API_BASE || 'http://frac-etl-service:8083', CONTENT_HIERARCHY: env.CONTENT_HIERARCHY || 'http://localhost:5903/hierarchy', CONTENT_META_FETCH_API_BASE: env.CONTENT_META_FETCH_API_BASE || 'http://localhost:5906', From aac93b1924e4831ad5943d18ecbdf6d3fe975d09 Mon Sep 17 00:00:00 2001 From: princegupta1131 <114015020+princegupta1131@users.noreply.github.com> Date: Fri, 8 Aug 2025 17:12:31 +0530 Subject: [PATCH 6/6] fract const added --- src/utils/env.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/utils/env.ts b/src/utils/env.ts index 37a70a95..45ff9624 100644 --- a/src/utils/env.ts +++ b/src/utils/env.ts @@ -35,7 +35,6 @@ export const CONSTANTS = { COMPETENCY_ROLES_DATA_PATH: env.COMPETENCY_ROLES_WISE_DATA_PATH || '', COMPETENCY_ROLES_MAPPING_PATH: env.COMPETENCY_ROLES_MAPPING_PATH || '', CONTENT_API_BASE: env.CONTENT_API_BASE || 'http://localhost:5903', - FRAC_ETL_API_BASE: env.FRAC_ETL_API_BASE || 'http://frac-etl-service:8083', CONTENT_HIERARCHY: env.CONTENT_HIERARCHY || 'http://localhost:5903/hierarchy', CONTENT_META_FETCH_API_BASE: env.CONTENT_META_FETCH_API_BASE || 'http://localhost:5906', @@ -53,6 +52,7 @@ export const CONSTANTS = { ES_PASSWORD: env.ES_PASSWORD || 'iGOT@123+', ES_USERNAME: env.ES_USERNAME || 'elastic', FEEDBACK_API_BASE: env.FEEDBACK_API_BASE || env.SB_EXT_API_BASE_2, + FRAC_ETL_API_BASE: env.FRAC_ETL_API_BASE || 'http://frac-etl-service:8083', GAMIFICATION_API_BASE: env.GAMIFICATION_API_BASE || 'http://localhost:port-number', GOALS_API_BASE: env.GOALS_API_BASE || env.SB_EXT_API_BASE_2,