Merge pull request #80 from SachiniSiriwardene/test-M1

Add error page when routing to settings page without user login

Author: DivyaPremanantha

package.json

@@ -1,6 +1,6 @@
 {
   "name": "devportal-webapp",
-  "version": "1.0.68",
+  "version": "1.0.70",
   "description": "devportal-webapp",
   "main": "index.js",
   "scripts": {

src/controllers/settingsController.js

@@ -35,6 +35,14 @@ const loadSettingPage = async (req, res) => {
     //retrieve orgID from the user object
     if (req.user) {
         orgID = req.user[constants.ORG_ID];
+    } else {
+        let orgName = req.params.orgName;
+        orgID = await adminDao.getOrgId(orgName);
+        const templatePath = path.join(require.main.filename, '..', 'pages', 'error-page', 'page.hbs');
+        const templateResponse = fs.readFileSync(templatePath, constants.CHARSET_UTF8);
+        const layoutResponse = await loadLayoutFromAPI(orgID);
+        let html = await renderGivenTemplate(templateResponse, layoutResponse, {});
+        return res.send(html);
     }
 
     let templateContent = {
@@ -43,15 +51,14 @@ const loadSettingPage = async (req, res) => {
         orgContent: true
     }
     let layoutResponse = "";
+    let views;
     try {
         if (config.mode === constants.DEV_MODE) {
             const retrievedIDP = await getMockIdentityProvider();
             templateContent.idp = retrievedIDP;
             views = [{
                 'name': 'Default'
             }]
-        }
-        if (views && views.length > 0) {
             templateContent.content = true;
             templateContent.orgContent = false;
             templateContent.views = views;
@@ -64,7 +71,6 @@ const loadSettingPage = async (req, res) => {
             }
             //TODO: fetch view names from DB
             const file = await adminService.getOrgContent(orgID, 'layout', 'main.hbs', 'layout');
-            let views;
             if (file !== null) {
                 views = [{
                     'name': 'Default'