From d9a51136d96c05ead2f8dbe9d12ca036bb3c6dbb Mon Sep 17 00:00:00 2001 From: sumanvpacewisdom Date: Fri, 13 Dec 2024 10:46:03 +0530 Subject: [PATCH 1/3] adding BIB_BLUE_BUTTON_BASE_URL to env --- src/envVariables.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/envVariables.js b/src/envVariables.js index b5e19ae6..fcd7b784 100644 --- a/src/envVariables.js +++ b/src/envVariables.js @@ -137,7 +137,7 @@ let enviromentVariables = { optional: process.env.ENABLE_EMAIL_FOR_REPORT_ISSUE === 'true' ? false : true, default: 'user_issue_reported', }, - BIG_BLUE_BUTTON_BASE_URL: { + BIB_BLUE_BUTTON_BASE_URL: { message: 'Big blue button base url', optional: true, default: '/bigbluebutton/', From 4325285efdeee2f56582359026df2d9376aa6928 Mon Sep 17 00:00:00 2001 From: sumanvpacewisdom Date: Fri, 13 Dec 2024 12:26:51 +0530 Subject: [PATCH 2/3] replacing env variable name --- README.md | 2 +- dev-ops/integration_test.mentoring.env | 2 +- src/.env.backup | 2 +- src/.env.sample | 2 +- src/api-doc/elevate-setup.md | 4 ++-- src/api-doc/mentoring-2.5-setup.md | 2 +- src/envVariables.js | 2 +- src/requests/bigBlueButton.js | 2 +- src/services/bigBlueButton.js | 2 +- 9 files changed, 10 insertions(+), 10 deletions(-) diff --git a/README.md b/README.md index cc3daad5..9d7dd79c 100644 --- a/README.md +++ b/README.md @@ -1162,7 +1162,7 @@ USER_SERVICE_BASE_URL='/user/' BIG_BLUE_BUTTON_URL=https://dev.some.temp.org # Big blue button base URL -BIB_BLUE_BUTTON_BASE_URL=/bigbluebutton/ +BIG_BLUE_BUTTON_BASE_URL=/bigbluebutton/ # Meeting end callback events endpoint MEETING_END_CALLBACK_EVENTS=https%3A%2F%2Fdev.some-apis.temp.org%2Fmentoring%2Fv1%2Fsessions%2Fcompleted diff --git a/dev-ops/integration_test.mentoring.env b/dev-ops/integration_test.mentoring.env index 408981b1..ced57811 100644 --- a/dev-ops/integration_test.mentoring.env +++ b/dev-ops/integration_test.mentoring.env @@ -79,7 +79,7 @@ USER_SERIVCE_BASE_URL = '/user/' BIG_BLUE_BUTTON_URL = https://dev.mentoring.shikshalokam.org # Big blue button base url -BIB_BLUE_BUTTON_BASE_URL = /bigbluebutton/ +BIG_BLUE_BUTTON_BASE_URL = /bigbluebutton/ # Meeting end callback events end point MEETING_END_CALLBACK_EVENTS = https%3A%2F%2Fdev.elevate-apis.shikshalokam.org%2Fmentoring%2Fv1%2Fsessions%2Fcompleted diff --git a/src/.env.backup b/src/.env.backup index 36140245..c99019aa 100644 --- a/src/.env.backup +++ b/src/.env.backup @@ -78,7 +78,7 @@ USER_SERIVCE_BASE_URL = '/user/' BIG_BLUE_BUTTON_URL = https://dev.mentoring.shikshalokam.org # Big blue button base url -BIB_BLUE_BUTTON_BASE_URL = /bigbluebutton/ +BIG_BLUE_BUTTON_BASE_URL = /bigbluebutton/ # Meeting end callback events end point MEETING_END_CALLBACK_EVENTS = https%3A%2F%2Fdev.elevate-apis.shikshalokam.org%2Fmentoring%2Fv1%2Fsessions%2Fcompleted diff --git a/src/.env.sample b/src/.env.sample index 45e8b86f..c7175f77 100644 --- a/src/.env.sample +++ b/src/.env.sample @@ -43,7 +43,7 @@ USER_SERVICE_BASE_URL = '/user/' BIG_BLUE_BUTTON_URL = https://dev.mentoring.shikshalokam.org # Big blue button base url -BIB_BLUE_BUTTON_BASE_URL = /bigbluebutton/ +BIG_BLUE_BUTTON_BASE_URL = /bigbluebutton/ # Meeting end callback events end point MEETING_END_CALLBACK_EVENTS = https%3A%2F%2Fdev.elevate-apis.shikshalokam.org%2Fmentoring%2Fv1%2Fsessions%2Fcompleted diff --git a/src/api-doc/elevate-setup.md b/src/api-doc/elevate-setup.md index 2a3c9607..c283bee1 100644 --- a/src/api-doc/elevate-setup.md +++ b/src/api-doc/elevate-setup.md @@ -135,7 +135,7 @@ Please refer to the below documentation to install Docker and docker-compose on BIG_BLUE_BUTTON_URL=https://dev.some.temp.org # Big blue button base URL - BIB_BLUE_BUTTON_BASE_URL=/bigbluebutton/ + BIG_BLUE_BUTTON_BASE_URL=/bigbluebutton/ # Meeting end callback events endpoint MEETING_END_CALLBACK_EVENTS=https%3A%2F%2Fdev.some-apis.temp.org%2Fmentoring%2Fv1%2Fsessions%2Fcompleted @@ -855,7 +855,7 @@ USER_SERVICE_BASE_URL='/user/' BIG_BLUE_BUTTON_URL=https://dev.some.temp.org # Big blue button base URL -BIB_BLUE_BUTTON_BASE_URL=/bigbluebutton/ +BIG_BLUE_BUTTON_BASE_URL=/bigbluebutton/ # Meeting end callback events endpoint MEETING_END_CALLBACK_EVENTS=https%3A%2F%2Fdev.some-apis.temp.org%2Fmentoring%2Fv1%2Fsessions%2Fcompleted diff --git a/src/api-doc/mentoring-2.5-setup.md b/src/api-doc/mentoring-2.5-setup.md index de9ac411..e1cc0e2d 100644 --- a/src/api-doc/mentoring-2.5-setup.md +++ b/src/api-doc/mentoring-2.5-setup.md @@ -366,7 +366,7 @@ USER_SERVICE_BASE_URL='/user/' BIG_BLUE_BUTTON_URL=https://dev.some.temp.org # Big blue button base URL -BIB_BLUE_BUTTON_BASE_URL=/bigbluebutton/ +BIG_BLUE_BUTTON_BASE_URL=/bigbluebutton/ # Meeting end callback events endpoint MEETING_END_CALLBACK_EVENTS=https%3A%2F%2Fdev.some-apis.temp.org%2Fmentoring%2Fv1%2Fsessions%2Fcompleted diff --git a/src/envVariables.js b/src/envVariables.js index fcd7b784..b5e19ae6 100644 --- a/src/envVariables.js +++ b/src/envVariables.js @@ -137,7 +137,7 @@ let enviromentVariables = { optional: process.env.ENABLE_EMAIL_FOR_REPORT_ISSUE === 'true' ? false : true, default: 'user_issue_reported', }, - BIB_BLUE_BUTTON_BASE_URL: { + BIG_BLUE_BUTTON_BASE_URL: { message: 'Big blue button base url', optional: true, default: '/bigbluebutton/', diff --git a/src/requests/bigBlueButton.js b/src/requests/bigBlueButton.js index 9658c7c5..48677bdf 100644 --- a/src/requests/bigBlueButton.js +++ b/src/requests/bigBlueButton.js @@ -6,7 +6,7 @@ */ // Dependencies -const bigBlueButtonUrl = process.env.BIG_BLUE_BUTTON_URL + process.env.BIB_BLUE_BUTTON_BASE_URL +const bigBlueButtonUrl = process.env.BIG_BLUE_BUTTON_URL + process.env.BIG_BLUE_BUTTON_BASE_URL const request = require('@generics/requests') const endpoints = require('@constants/endpoints') const utils = require('@generics/utils') diff --git a/src/services/bigBlueButton.js b/src/services/bigBlueButton.js index 3f9c012b..52ac52f0 100644 --- a/src/services/bigBlueButton.js +++ b/src/services/bigBlueButton.js @@ -6,7 +6,7 @@ */ // Dependencies -const bigBlueButtonUrl = process.env.BIG_BLUE_BUTTON_URL + process.env.BIB_BLUE_BUTTON_BASE_URL +const bigBlueButtonUrl = process.env.BIG_BLUE_BUTTON_URL + process.env.BIG_BLUE_BUTTON_BASE_URL const endpoints = require('@constants/endpoints') const utils = require('@generics/utils') From e32fc9c91d41800e5eae8fffb94db18235c6d015 Mon Sep 17 00:00:00 2001 From: sumanvpacewisdom Date: Fri, 13 Dec 2024 12:48:34 +0530 Subject: [PATCH 3/3] updating the old envs --- documentation/2.5.6/dockerized/envs/mentoring_env | 2 +- documentation/2.5.6/native/envs/mentoring_env | 2 +- documentation/2.5.6/native/envs/non-citus/mentoring_env | 2 +- documentation/2.6.1/dockerized/envs/mentoring_env | 2 +- documentation/2.6.1/native/envs/mentoring_env | 2 +- documentation/2.6.1/native/envs/non-citus/mentoring_env | 2 +- src/api-doc/mentoring-2.5-setup.md | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/documentation/2.5.6/dockerized/envs/mentoring_env b/documentation/2.5.6/dockerized/envs/mentoring_env index ca6cbc73..745b4194 100644 --- a/documentation/2.5.6/dockerized/envs/mentoring_env +++ b/documentation/2.5.6/dockerized/envs/mentoring_env @@ -11,7 +11,7 @@ AWS_BUCKET_REGION=ap-south-1 AWS_SECRET_ACCESS_KEY=aws-secret-access-key AZURE_ACCOUNT_KEY=azure-account-key AZURE_ACCOUNT_NAME=account-name -BIG_BLUE_BUTTON_BASE_URL=/bigbluebutton/ +BIB_BLUE_BUTTON_BASE_URL=/bigbluebutton/ BIG_BLUE_BUTTON_LAST_USER_TIMEOUT_MINUTES=15 BIG_BLUE_BUTTON_SECRET_KEY=s90df8g09sd8fg098sdfg BIG_BLUE_BUTTON_SESSION_END_URL=https%3A%2F%2Fdev.some-mentoring.temp.org%2F diff --git a/documentation/2.5.6/native/envs/mentoring_env b/documentation/2.5.6/native/envs/mentoring_env index 119dac07..5a6c3b47 100644 --- a/documentation/2.5.6/native/envs/mentoring_env +++ b/documentation/2.5.6/native/envs/mentoring_env @@ -11,7 +11,7 @@ AWS_BUCKET_REGION=ap-south-1 AWS_SECRET_ACCESS_KEY=aws-secret-access-key AZURE_ACCOUNT_KEY=azure-account-key AZURE_ACCOUNT_NAME=account-name -BIG_BLUE_BUTTON_BASE_URL=/bigbluebutton/ +BIB_BLUE_BUTTON_BASE_URL=/bigbluebutton/ BIG_BLUE_BUTTON_LAST_USER_TIMEOUT_MINUTES=15 BIG_BLUE_BUTTON_SECRET_KEY=s90df8g09sd8fg098sdfg BIG_BLUE_BUTTON_SESSION_END_URL=https%3A%2F%2Fdev.some-mentoring.temp.org%2F diff --git a/documentation/2.5.6/native/envs/non-citus/mentoring_env b/documentation/2.5.6/native/envs/non-citus/mentoring_env index 456fdeeb..d927e439 100644 --- a/documentation/2.5.6/native/envs/non-citus/mentoring_env +++ b/documentation/2.5.6/native/envs/non-citus/mentoring_env @@ -11,7 +11,7 @@ AWS_BUCKET_REGION=ap-south-1 AWS_SECRET_ACCESS_KEY=aws-secret-access-key AZURE_ACCOUNT_KEY=azure-account-key AZURE_ACCOUNT_NAME=account-name -BIG_BLUE_BUTTON_BASE_URL=/bigbluebutton/ +BIB_BLUE_BUTTON_BASE_URL=/bigbluebutton/ BIG_BLUE_BUTTON_LAST_USER_TIMEOUT_MINUTES=15 BIG_BLUE_BUTTON_SECRET_KEY=s90df8g09sd8fg098sdfg BIG_BLUE_BUTTON_SESSION_END_URL=https%3A%2F%2Fdev.some-mentoring.temp.org%2F diff --git a/documentation/2.6.1/dockerized/envs/mentoring_env b/documentation/2.6.1/dockerized/envs/mentoring_env index ca6cbc73..745b4194 100644 --- a/documentation/2.6.1/dockerized/envs/mentoring_env +++ b/documentation/2.6.1/dockerized/envs/mentoring_env @@ -11,7 +11,7 @@ AWS_BUCKET_REGION=ap-south-1 AWS_SECRET_ACCESS_KEY=aws-secret-access-key AZURE_ACCOUNT_KEY=azure-account-key AZURE_ACCOUNT_NAME=account-name -BIG_BLUE_BUTTON_BASE_URL=/bigbluebutton/ +BIB_BLUE_BUTTON_BASE_URL=/bigbluebutton/ BIG_BLUE_BUTTON_LAST_USER_TIMEOUT_MINUTES=15 BIG_BLUE_BUTTON_SECRET_KEY=s90df8g09sd8fg098sdfg BIG_BLUE_BUTTON_SESSION_END_URL=https%3A%2F%2Fdev.some-mentoring.temp.org%2F diff --git a/documentation/2.6.1/native/envs/mentoring_env b/documentation/2.6.1/native/envs/mentoring_env index 119dac07..5a6c3b47 100644 --- a/documentation/2.6.1/native/envs/mentoring_env +++ b/documentation/2.6.1/native/envs/mentoring_env @@ -11,7 +11,7 @@ AWS_BUCKET_REGION=ap-south-1 AWS_SECRET_ACCESS_KEY=aws-secret-access-key AZURE_ACCOUNT_KEY=azure-account-key AZURE_ACCOUNT_NAME=account-name -BIG_BLUE_BUTTON_BASE_URL=/bigbluebutton/ +BIB_BLUE_BUTTON_BASE_URL=/bigbluebutton/ BIG_BLUE_BUTTON_LAST_USER_TIMEOUT_MINUTES=15 BIG_BLUE_BUTTON_SECRET_KEY=s90df8g09sd8fg098sdfg BIG_BLUE_BUTTON_SESSION_END_URL=https%3A%2F%2Fdev.some-mentoring.temp.org%2F diff --git a/documentation/2.6.1/native/envs/non-citus/mentoring_env b/documentation/2.6.1/native/envs/non-citus/mentoring_env index 456fdeeb..d927e439 100644 --- a/documentation/2.6.1/native/envs/non-citus/mentoring_env +++ b/documentation/2.6.1/native/envs/non-citus/mentoring_env @@ -11,7 +11,7 @@ AWS_BUCKET_REGION=ap-south-1 AWS_SECRET_ACCESS_KEY=aws-secret-access-key AZURE_ACCOUNT_KEY=azure-account-key AZURE_ACCOUNT_NAME=account-name -BIG_BLUE_BUTTON_BASE_URL=/bigbluebutton/ +BIB_BLUE_BUTTON_BASE_URL=/bigbluebutton/ BIG_BLUE_BUTTON_LAST_USER_TIMEOUT_MINUTES=15 BIG_BLUE_BUTTON_SECRET_KEY=s90df8g09sd8fg098sdfg BIG_BLUE_BUTTON_SESSION_END_URL=https%3A%2F%2Fdev.some-mentoring.temp.org%2F diff --git a/src/api-doc/mentoring-2.5-setup.md b/src/api-doc/mentoring-2.5-setup.md index e1cc0e2d..de9ac411 100644 --- a/src/api-doc/mentoring-2.5-setup.md +++ b/src/api-doc/mentoring-2.5-setup.md @@ -366,7 +366,7 @@ USER_SERVICE_BASE_URL='/user/' BIG_BLUE_BUTTON_URL=https://dev.some.temp.org # Big blue button base URL -BIG_BLUE_BUTTON_BASE_URL=/bigbluebutton/ +BIB_BLUE_BUTTON_BASE_URL=/bigbluebutton/ # Meeting end callback events endpoint MEETING_END_CALLBACK_EVENTS=https%3A%2F%2Fdev.some-apis.temp.org%2Fmentoring%2Fv1%2Fsessions%2Fcompleted