Merge pull request #178 from mdenet:fix/correctly-report-activity-acc…

…ess-issues Correctly report activity access issues
mdenet · Feb 14, 2024 · 4f6b477 · 4f6b477
2 parents 2c58019 + c65cb90
commit 4f6b477
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 7 deletions.
diff --git a/platform/src/ActivityManager.js b/platform/src/ActivityManager.js
@@ -123,14 +123,12 @@ class ActivityManager {
         let errors = []; 
         let fileContent
 
-        try{
+        try {
             let file = this.fileHandler.fetchFile( this.activitiesUrl , urlParamPrivateRepo() );
             fileContent = file.content;
         } catch (e) {
-            if (e instanceof DOMException){
-                errors.push( new EducationPlatformError(`The activity configuration file was not accessible at: ${this.activitiesUrl}. 
-                                                        Check the activity file is available at the given url.`) );
-            }
+            errors.push( new EducationPlatformError(`The activity configuration file was not accessible at: ${this.activitiesUrl}. 
+                                                    Check the activity file is available at the given url and you have the correct access rights.`) );
         }
 
         if (fileContent != null){

diff --git a/tokenserver/src/middleware/ErrorHandlingMiddleware.js b/tokenserver/src/middleware/ErrorHandlingMiddleware.js
@@ -2,8 +2,8 @@
 
 const errorHandlingMiddleware = (err, req, res, next) => {
   if (err.status != null) {
-    res.status(err.statusCode).json({
-        msg: err.message,
+    res.status(err.status).json({
+        msg: err.response.data.message,
         success: false,
       });
   } else {