Issue ED-521 fix: Update CSP varibales changes in environment variable file

d98a607b · Rajesh Kumaravel · b4a69d51 · d98a607b · d98a607b · d98a607b
Commit d98a607b authored 2 years ago by Rajesh Kumaravel
Hide whitespace changes
Inline Side-by-side

Showing

with 102 additions and 40 deletions
+102 -40
--- a/.github/pull_request_template.md
+++ b/.github/pull_request_template.md
+# SunbirdEd - Portal
+---
+
+### Please include a summary of the change and which issue is fixed. Please also include relevant motivation and context. List any dependencies that are required for this change.
+---
+
+### Please choose applicable option 
+#### Example
+- [x] Applicable
+- [ ] Not applicable
+
+### Type of change
+
+Please choose appropriate options.
+
+- [ ] Bug fix (non-breaking change which fixes an issue)
+- [ ] New feature (non-breaking change which adds functionality)
+- [ ] Breaking change (fix or feature that would cause existing functionality to not work as expected)
+- [ ] Enhancement (additive changes to improve performance)
+- [ ] This change requires a documentation update
+
+### Checklist:
+
+- [ ] My code follows the style guidelines of this project
+- [ ] I have performed a self-review of my own code
+- [ ] I have commented my code, particularly in hard-to-understand areas
+- [ ] I have made corresponding changes to the documentation
+- [ ] My changes generate no new warnings
+- [ ] I have added tests that prove my fix is effective or that my feature works
+- [ ] New and existing unit tests pass locally with my changes
+- [ ] Any dependent changes have been merged and published in downstream modules
--- a/README.md
+++ b/README.md
@@ -39,6 +39,7 @@ Installing Sunbird requires two primary software components:
 - [Running Application](#running-application)
 - [Project Structure](#project-structure)
 - [Testing](#testing)
+- [Dependencies List](#dependencies-list)
 ---

 ### Prerequisites
@@ -203,3 +204,17 @@ Installing Sunbird requires two primary software components:
        2. $ npm run backend-test
        3. With Coverage $ npm run backend-test-with-coverage

+
+### Dependencies list
+
+<details>
+  <summary>Portal - Frontend</summary>
+</details>
+
+|              Plugin Name              	|                         Plugin Repository                        	|                             npm package                             	| npm version 	| NG Version 	|
+|:-------------------------------------:	|:----------------------------------------------------------------:	|:-------------------------------------------------------------------:	|-------------	|------------	|
+| @project-sunbird/chatbot-client       	| https://github.com/project-sunbird/sunbird-bot-client            	| https://www.npmjs.com/package/@project-sunbird/chatbot-client       	|    3.0.3    	| NG 11      	|
+| @project-sunbird/common-consumption   	| https://github.com/Sunbird-Ed/SunbirdEd-consumption-ngcomponents 	| https://www.npmjs.com/package/@project-sunbird/common-consumption   	|    4.12.0   	| NG 11      	|
+| @project-sunbird/common-form-elements 	| https://github.com/Sunbird-Ed/SunbirdEd-forms                    	| https://www.npmjs.com/package/@project-sunbird/common-form-elements 	|    5.1.1    	| NG 11      	|
+| @project-sunbird/sb-content-section   	| https://github.com/Sunbird-Ed/sb-content-module                  	| https://www.npmjs.com/package/@project-sunbird/sb-content-section   	|    5.1.0    	| NG 11      	|
+| @project-sunbird/sb-notification      	| https://github.com/Sunbird-Ed/sb-notification                    	| https://www.npmjs.com/package/@project-sunbird/sb-notification      	|    5.0.7    	| NG 11      	|
--- a/src/app/client/package.json
+++ b/src/app/client/package.json
@@ -53,7 +53,7 @@
    "@angular/router": "^11.2.14",
    "@ngx-translate/core": "12.0.0",
    "@ngx-translate/http-loader": "^5.0.0",
-    "@project-sunbird/chatbot-client": "3.0.2",
+    "@project-sunbird/chatbot-client": "3.0.3",
    "@project-sunbird/ckeditor-build-classic": "4.1.3",
    "@project-sunbird/ckeditor-build-font": "^1.0.8",
    "@project-sunbird/client-services": "4.8.13",

--- a/src/app/client/yarn.lock
+++ b/src/app/client/yarn.lock
@@ -2064,10 +2064,10 @@
    node-gyp "^7.1.0"
    read-package-json-fast "^2.0.1"
  
-"@project-sunbird/chatbot-client@3.0.2":
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/@project-sunbird/chatbot-client/-/chatbot-client-3.0.2.tgz#9af1c61d508a47ddcbc7dd4b3f904c9f489b8eb7"
-  integrity sha512-+YdjLAuSTnE4EPETP62X597e/8KOUooQH4kZ8ee89lLqSQYXQ3mgToqM2t2s4cEHtlFXrpimIeyizm7Cjz+b0A==
+"@project-sunbird/chatbot-client@3.0.3":
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/@project-sunbird/chatbot-client/-/chatbot-client-3.0.3.tgz#da74b4ce70305e855ec0affac4ce706624e732a1"
+  integrity sha512-zq9MwsCJiGULXb9sjRRqx21upMaGz1ly6CHj3ZqCEV8DaTAfj9UHj09z6BuBI+W+rq6lzh6Ee8Evx3M3A1aB+g==
  dependencies:
    tslib "^2.0.0"
  
@@ -2540,9 +2540,9 @@
    localforage "*"
  
 "@types/lodash@^4.14.104":
-  version "4.14.189"
-  resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.189.tgz#975ff8c38da5ae58b751127b19ad5e44b5b7f6d2"
-  integrity sha512-kb9/98N6X8gyME9Cf7YaqIMvYGnBSWqEci6tiettE6iJWH1XdJz/PO8LB0GtLCG7x8dU3KWhZT+lA1a35127tA==
+  version "4.14.190"
+  resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.190.tgz#d8e99647af141c63902d0ca53cf2b34d2df33545"
+  integrity sha512-5iJ3FBJBvQHQ8sFhEhJfjUP+G+LalhavTkYyrAYqz5MEJG+erSv0k9KJLb6q7++17Lafk1scaTIFXcMJlwK8Mw==
  
 "@types/minimatch@*":
  version "5.1.2"
@@ -4338,9 +4338,9 @@ ci-info@^2.0.0:
  integrity sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ==
  
 ci-info@^3.2.0:
-  version "3.6.2"
-  resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-3.6.2.tgz#362ea15378f1c39378ba786affbc1c9ef015ecfd"
-  integrity sha512-lVZdhvbEudris15CLytp2u6Y0p5EKfztae9Fqa189MfNmln9F33XuH69v5fvNfiRN5/0eAUz2yJL3mo+nhaRKg==
+  version "3.7.0"
+  resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-3.7.0.tgz#6d01b3696c59915b6ce057e4aa4adfc2fa25f5ef"
+  integrity sha512-2CpRNYmImPx+RXKLq6jko/L07phmS9I02TyqkcNU20GCF/GgaWvc58hPtjxDX8lPpkdwc9sNh72V9k00S7ezog==
  
 cipher-base@^1.0.0, cipher-base@^1.0.1, cipher-base@^1.0.3:
  version "1.0.4"
@@ -6543,7 +6543,7 @@ file-loader@6.2.0:
    loader-utils "^2.0.0"
    schema-utils "^3.0.0"
  
-file-saver@eligrey/FileSaver.js#1.3.8:
+"file-saver@github:eligrey/FileSaver.js#1.3.8":
  version "1.3.8"
  resolved "https://codeload.github.com/eligrey/FileSaver.js/tar.gz/e865e37af9f9947ddcced76b549e27dc45c1cb2e"
  
@@ -10044,9 +10044,9 @@ minipass@^2.3.5, minipass@^2.6.0, minipass@^2.9.0:
    yallist "^3.0.0"
  
 minipass@^3.0.0, minipass@^3.1.0, minipass@^3.1.1, minipass@^3.1.3:
-  version "3.3.4"
-  resolved "https://registry.yarnpkg.com/minipass/-/minipass-3.3.4.tgz#ca99f95dd77c43c7a76bf51e6d200025eee0ffae"
-  integrity sha512-I9WPbWHCGu8W+6k1ZiGpPu0GkoKBeorkfKNuAFBNS1HNFJvke82sxvI5bzcCNpWPorkOO5QQ+zomzzwRxejXiw==
+  version "3.3.6"
+  resolved "https://registry.yarnpkg.com/minipass/-/minipass-3.3.6.tgz#7bba384db3a1520d18c9c0e5251c3444e95dd94a"
+  integrity sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==
  dependencies:
    yallist "^4.0.0"
  
@@ -13896,9 +13896,9 @@ terser@^4.1.2:
    source-map-support "~0.5.12"
  
 terser@^5.3.4:
-  version "5.15.1"
-  resolved "https://registry.yarnpkg.com/terser/-/terser-5.15.1.tgz#8561af6e0fd6d839669c73b92bdd5777d870ed6c"
-  integrity sha512-K1faMUvpm/FBxjBXud0LWVAGxmvoPbZbfTCYbSgaaYQaIXI3/TdI7a7ZGA73Zrou6Q8Zmz3oeUTsp/dj+ag2Xw==
+  version "5.16.0"
+  resolved "https://registry.yarnpkg.com/terser/-/terser-5.16.0.tgz#29362c6f5506e71545c73b069ccd199bb28f7f54"
+  integrity sha512-KjTV81QKStSfwbNiwlBXfcgMcOloyuRdb62/iLFPGBcVNF4EXjhdYBhYHmbJpiBrVxZhDvltE11j+LBQUxEEJg==
  dependencies:
    "@jridgewell/source-map" "^0.3.2"
    acorn "^8.5.0"
@@ -14604,7 +14604,7 @@ video.js@7.18.1:
    videojs-font "3.2.0"
    videojs-vtt.js "^0.15.3"
  
-"video.js@^6 || ^7", video.js@^7.0.0:
+"video.js@^6 || ^7", "video.js@^6 || ^7 || ^8", video.js@^7.0.0:
  version "7.20.3"
  resolved "https://registry.yarnpkg.com/video.js/-/video.js-7.20.3.tgz#5694741346dc683255993e5069daa15d4bacb646"
  integrity sha512-JMspxaK74LdfWcv69XWhX4rILywz/eInOVPdKefpQiZJSMD5O8xXYueqACP2Q5yqKstycgmmEKlJzZ+kVmDciw==
@@ -14632,12 +14632,12 @@ videojs-contrib-quality-levels@2.1.0:
    video.js "^6 || ^7"
  
 videojs-contrib-quality-levels@^2.0.4:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/videojs-contrib-quality-levels/-/videojs-contrib-quality-levels-2.2.0.tgz#f711cc78fd5e6559b68cb55537aba1a7e5ee931b"
-  integrity sha512-r4LFNhjyeBmlGk4Ul43xl+f7sNJ9vFyM6p4NcZNbPlvs1IvykEXCqxvsvaR6KTBjHoHGJnr26grXWcJiLFP+cA==
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/videojs-contrib-quality-levels/-/videojs-contrib-quality-levels-2.2.1.tgz#46bd7e1db25e6e45824dadf933b08f0c6ec724a1"
+  integrity sha512-cnF6OGGgoC/2nUrbdz54nzPm3BpEZQzMTpyekiX6AXs8imATX2sHbrUz97xXVSHITldk/+d7ZAUrdQYJJTyuug==
  dependencies:
    global "^4.3.2"
-    video.js "^6 || ^7"
+    video.js "^6 || ^7 || ^8"
  
 videojs-font@3.2.0:
  version "3.2.0"

--- a/src/app/helpers/environmentVariablesHelper.js
+++ b/src/app/helpers/environmentVariablesHelper.js
@@ -139,25 +139,41 @@ let envVariables = {
  SUNBIRD_PUBLIC_STORAGE_ACCOUNT_NAME: env.sunbird_azure_storage_account_name,
  PORTAL_CASSANDRA_CONSISTENCY_LEVEL: env.sunbird_cassandra_consistency_level || 'one',
  PORTAL_CASSANDRA_REPLICATION_STRATEGY: env.sunbird_cassandra_replication_strategy || '{"class":"SimpleStrategy","replication_factor":1}',
-  sunbird_azure_report_container_name: env.sunbird_azure_report_container_name || 'reports',
-  sunbird_azure_account_name: env.sunbird_azure_account_name,
-  sunbird_azure_account_key: env.sunbird_azure_account_key,
-  desktop_azure_crash_container_name: env.desktop_crash_container_name || 'desktopappcrashlogs',
+  
+  // ############# CSP Configuration #############
+  // Common key for Uploading Desktop Crash logs
+  desktop_azure_crash_container_name: env.cloud_storage_desktopCrash_bucketname || 'desktopappcrashlogs',
+
+  // Azure
+  sunbird_azure_account_name: env.cloud_private_storage_accountname,
+  sunbird_azure_account_key: env.cloud_private_storage_secret,
+  sunbird_azure_report_container_name: env.cloud_storage_privatereports_bucketname || 'reports',
+  sunbird_azure_resourceBundle_container_name: env.cloud_storage_resourceBundle_bucketname || 'label',
+
+  // AWS
+  sunbird_aws_access_key: env.cloud_private_storage_accountname || '',
+  sunbird_aws_secret_key: env.cloud_private_storage_secret || '',
+  sunbird_aws_region: env.cloud_private_storage_region || '',
+  sunbird_aws_reports: env.cloud_storage_privatereports_bucketname || 'reports',
+  sunbird_aws_labels: env.cloud_storage_resourceBundle_bucketname || 'label',
+
+  // deprecated - Folder structure changed
+  // sunbird_aws_bucket_name: env.sunbird_aws_bucket_name || 'sunbirded',
+
+  // GCP - gcloud
+  sunbird_gcloud_client_email: env.cloud_private_storage_accountname || '',
+  sunbird_gcloud_private_key: env.cloud_private_storage_secret || '',
+  sunbird_gcloud_projectId: env.cloud_private_storage_project || '',
+  sunbird_gcloud_reports: env.cloud_storage_privatereports_bucketname || 'reports',
+  sunbird_gcloud_labels: env.cloud_storage_resourceBundle_bucketname || 'label',
+
+  // deprecated - Folder structure changed
+  // sunbird_gcloud_bucket_name: env.sunbird_gcloud_bucket_name || 'sunbirded',
+
+  // ############# End of CSP Configuration #############
+
  sunbird_portal_cdn_blob_url: env.sunbird_portal_cdn_blob_url || '',
  sunbird_portal_video_max_size: env.sunbird_portal_video_max_size || '50',
-  sunbird_azure_resourceBundle_container_name: env.sunbird_azure_resourceBundle_container_name || 'label',
-  sunbird_aws_bucket_name: env.sunbird_aws_bucket_name || 'sunbirded',
-  sunbird_aws_reports: env.sunbird_aws_reports || 'reports',
-  sunbird_aws_labels: env.sunbird_aws_labels || 'labels',
-  sunbird_aws_access_key: env.sunbird_aws_access_key || '',
-  sunbird_aws_secret_key: env.sunbird_aws_secret_key || '',
-  sunbird_aws_region: env.sunbird_aws_region || '',
-  sunbird_gcloud_bucket_name: env.sunbird_gcloud_bucket_name || 'sunbirded',
-  sunbird_gcloud_reports: env.sunbird_gcloud_reports || 'reports',
-  sunbird_gcloud_labels: env.sunbird_gcloud_labels || 'labels',
-  sunbird_gcloud_client_email: env.sunbird_gcloud_client_email || '',
-  sunbird_gcloud_private_key: env.sunbird_gcloud_private_key || '',
-  sunbird_gcloud_projectId: env.sunbird_gcloud_projectId || '',

  // generic editor question set and coleections children contents limit
  SUNBIRD_QUESTIONSET_CHILDREN_LIMIT: env.sunbird_questionset_children_limit || 500,