Fixed issue with oauth lastname decoding. Ui fixes.

lib/ministries.js

@@ -42,7 +42,6 @@ async function getMinisters(ministries) {
       }
     }
   }
-  console.log(ministers);
   return ministers;
 }
 

package.json

@@ -21,6 +21,7 @@
     "express-session": "^1.17.1",
     "express-validator": "^6.7.0",
     "fast-xml-parser": "^4.0.8",
+    "html-entities": "^2.3.3",
     "html-to-pdfmake": "^2.2.6",
     "jsdom": "^16.6.0",
     "multer": "^1.4.2",

routes/edit_user.js

@@ -22,6 +22,7 @@ routes.get("/:taxId", authUser, authAdmin, async (req, res, next) => {
 
     res.render("user_views/edit_user", {
       user: entry.dataValues,
+      authUser: req.session.user,
       ministries: ministriesResult,
     }); // TODO: fix bug where user here is referenced in frontend as logged in user and not as to-be-edited user, which results in bugs with permissions
   } else {

routes/login.js

@@ -2,12 +2,11 @@ const routes = require("express").Router();
 let database = require("../services/database");
 const { body, check, validationResult } = require("express-validator");
 const bcrypt = require("bcrypt");
-const { user } = require("../services/database");
 
 routes.get("/", async function (req, res, next) {
-  const valid_errors = req.session.errors;
+  const validation_errors = req.session.errors;
   delete req.session.errors;
-  res.render("login", { errors: valid_errors });
+  res.render("login", { errors: validation_errors });
 });
 
 routes.post(

routes/logout.js

@@ -6,7 +6,7 @@ routes.get("/", async function (req, res, next) {
     req.session.destroy();
     if (!req.session) {
       res.send({
-        redirect: `https://${process.env.SITE}/login`,
+        redirect: `${process.env.SITE}/login`,
       });
     }
   } else {

routes/oauth2.js

@@ -3,6 +3,7 @@ const fetch = (...args) =>
   import("node-fetch").then(({ default: fetch }) => fetch(...args)); // consider upgrage nodejs to use internal fetch
 const fxmlparser = require("fast-xml-parser");
 let database = require("../services/database");
+const entities = require("html-entities");
 
 let debug = process.env.DEBUG || false;
 
@@ -298,7 +299,7 @@ const gsispa = async (req, res) => {
     } else {
       await database.user.create({
         fname: userinfo.firstname,
-        lname: userinfo.lastname,
+        lname: entities.decode(userinfo.lastname),
         taxId: userinfo.taxid,
       });
       req.session.errors = {

views/user_views/dashboard.ejs

@@ -60,7 +60,7 @@
   <script>
     const user = JSON.parse(' <%- JSON.stringify(user) %> ');
 
-    let isAdmin = user.isAdmin;
+    const isAdmin = user.isAdmin;
 
     setUserRestrictions(user.role);
   </script>

views/user_views/edit_user.ejs

@@ -216,9 +216,9 @@
         <script type="text/javascript" src="/js/nav_scripts.js"></script>
         <script type="text/javascript" src="/js/enums.js"></script>
         <script>
-            const user = JSON.parse(' <%- JSON.stringify(user) %> ');
+            const user = JSON.parse(' <%- JSON.stringify(authUser) %> ');
             setUserRestrictions(user.role);
-            const isAdmin = '<%= user.isAdmin %>';
+            const isAdmin = user.isAdmin;
 
             let username = $("#username").val();
             $("#delete_user").on("click", function (ev) {
@@ -288,7 +288,9 @@
                 $("#agency").append(`<option value="${ministries[i]}">${ministries[i]}</option>`);
             }
             $("#agency").append('<option value="Άλλος">Άλλος</option>');
-            $("#agency").val(user.agency);
+            let agency = "<%= user.agency %>";
+            console.log(agency);
+            $("#agency").val(agency);
             if (!$("#agency").val()) {
                 $('#other_agency_div').show();
                 $("#agency").val('Άλλος');

views/user_views/profile.ejs

@@ -175,8 +175,9 @@
         <script type="text/javascript" src="/js/enums.js"></script>
         <script>
             const user = JSON.parse(' <%- JSON.stringify(user) %> ');
+            const lname = user.lname;
             setUserRestrictions(user.role);
-            let isAdmin = '<%= user.isAdmin %>';
+            const isAdmin = user.isAdmin;
 
             let username = $("#username").val();
             let validationErrors;

views/user_views/search_user.ejs

@@ -13,7 +13,7 @@
             <th class="govgr-table__header" scope="col">Όνομα</th>
             <th class="govgr-table__header" scope="col">Επώνυμο</th>
             <th class="govgr-table__header" scope="col">Ρόλος</th>
-            <th class="govgr-table__header" scope="col">Υπουργείο</th>
+            <th class="govgr-table__header" scope="col">Φορέας</th>
           </tr>
         </thead>
         <tbody class="govgr-table__body">