Merge pull request #8373 from rajeshkumaravel/release-5.1.0

Issue ED-521 fix: client cloud services updated

README.md

@@ -211,10 +211,10 @@ Installing Sunbird requires two primary software components:
   <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      	|
+| Plugin Name                                                                                                  	| Plugin Repository                                                	| npm version 	| NG Version 	|
+|--------------------------------------------------------------------------------------------------------------	|------------------------------------------------------------------	|-------------	|------------	|
+| [@project-sunbird/chatbot-client](https://www.npmjs.com/package/@project-sunbird/chatbot-client)             	| https://github.com/project-sunbird/sunbird-bot-client            	| 3.0.3       	| NG 11      	|
+| [@project-sunbird/common-consumption](https://www.npmjs.com/package/@project-sunbird/common-consumption)     	| https://github.com/Sunbird-Ed/SunbirdEd-consumption-ngcomponents 	| 4.12.0      	| NG 11      	|
+| [@project-sunbird/common-form-elements](https://www.npmjs.com/package/@project-sunbird/common-form-elements) 	| https://github.com/Sunbird-Ed/SunbirdEd-forms                    	| 5.1.1       	| NG 11      	|
+| [@project-sunbird/sb-content-section](https://www.npmjs.com/package/@project-sunbird/sb-content-section)     	| https://github.com/Sunbird-Ed/sb-content-module                  	| 5.1.0       	| NG 11      	|
+| [@project-sunbird/sb-notification](https://www.npmjs.com/package/@project-sunbird/sb-notification)           	| https://github.com/Sunbird-Ed/sb-notification                    	| 5.0.7       	| NG 11      	|
\ No newline at end of file

src/app/helpers/resourceBundleHelper.js

@@ -10,10 +10,10 @@ const getGeneralisedResourcesBundles = (req, res) => {
         container = envHelper.sunbird_azure_resourceBundle_container_name;
     }
     if (envHelper.sunbird_cloud_storage_provider === 'aws') {
-        container = envHelper.sunbird_aws_labels + '/';
+        container = envHelper.sunbird_aws_labels;
     }
     if (envHelper.sunbird_cloud_storage_provider === 'gcloud') {
-        container = envHelper.sunbird_gcloud_labels + '/';
+        container = envHelper.sunbird_gcloud_labels;
     }
     StorageService.CLOUD_CLIENT.getFileAsText(container, blobName, function (error, result, response) {
         if (error && error.statusCode === 404) {

src/app/package.json

@@ -79,7 +79,7 @@
     "azure-storage": "2.10.2",
     "body-parser": "1.17.2",
     "cassandra-session-store": "1.0.6",
-    "client-cloud-services": "1.0.3",
+    "client-cloud-services": "2.0.0",
     "compare-versions": "3.5.1",
     "compression": "1.7.2",
     "connect-redis": "4.0.4",

src/app/routes/reportRoutes.js

@@ -6,6 +6,7 @@ const {REPORT_SERVICE_URL, sunbird_api_request_timeout, DATASERVICE_URL,CONTENT_
 const reqDataLimitOfContentUpload = '50mb';
 const _ = require('lodash');
 const {getUserDetailsV2} = require('../helpers/userHelper');
+const envHelper = require('../helpers/environmentVariablesHelper');
 const StorageService = require('../helpers/cloudStorage/index');
 
 module.exports = function (app) {
@@ -133,31 +134,31 @@ module.exports = function (app) {
     app.get('/courseReports/:slug/:filename',
         proxyUtils.verifyToken(),
         reportHelper.validateRoles(['CONTENT_CREATOR']),
-        StorageService.CLOUD_CLIENT.fileReadStream());
+        StorageService.CLOUD_CLIENT.fileReadStream(envHelper.sunbird_aws_reports));
 
     app.get('/course-reports/metadata',
         proxyUtils.verifyToken(),
         reportHelper.validateRoles(['CONTENT_CREATOR', 'REPORT_VIEWER', 'REPORT_ADMIN', 'ORG_ADMIN']),
-        StorageService.CLOUD_CLIENT.getFileProperties()
+        StorageService.CLOUD_CLIENT.getFileProperties(envHelper.sunbird_aws_reports)
         );
 
     app.get(`/reports/fetch/:slug/:filename`,
         proxyUtils.verifyToken(),
         reportHelper.validateRoles(['REPORT_VIEWER', 'REPORT_ADMIN','PROGRAM_DESIGNER','PROGRAM_MANAGER']),
-        StorageService.CLOUD_CLIENT.fileReadStream());
+        StorageService.CLOUD_CLIENT.fileReadStream(envHelper.sunbird_aws_reports));
 
     app.get('/reports/:slug/:filename',
         proxyUtils.verifyToken(),
         reportHelper.validateSlug(['public']),
         reportHelper.validateRoles(['ORG_ADMIN', 'REPORT_VIEWER', 'REPORT_ADMIN','PROGRAM_DESIGNER','PROGRAM_MANAGER']),
-        StorageService.CLOUD_CLIENT.fileReadStream());
+        StorageService.CLOUD_CLIENT.fileReadStream(envHelper.sunbird_aws_reports));
 
     app.get('/admin-reports/:slug/:filename',
         proxyUtils.verifyToken(),
         reportHelper.validateSlug(['geo-summary', 'geo-detail', 'geo-summary-district', 'user-summary', 'user-detail',
             'validated-user-summary', 'validated-user-summary-district', 'validated-user-detail', 'declared_user_detail']),
         reportHelper.validateRoles(['ORG_ADMIN']),
-        StorageService.CLOUD_CLIENT.fileReadStream());
+        StorageService.CLOUD_CLIENT.fileReadStream(envHelper.sunbird_aws_reports));
 
     app.get(`${BASE_REPORT_URL}/dataset/get/:datasetId`,
         proxyUtils.verifyToken(),