refactor loadData

administration.js

@@ -4,9 +4,60 @@
 var connection = require('../Pw-manager-nodejs/Database/database');
 var languageImport = require('../Pw-manager-nodejs/language');
 var language = languageImport.getEnglish();
+const dateLib = require('date-and-time');
 var escape = require('lodash.escape');
+const { decrypt } = require('./crypto/crypto');
+var customer = require('../Pw-manager-nodejs/customer');
+const crypto = require('crypto');
+const dateObject = new Date();
+// current date
+const date = (`0 ${dateObject.getDate()}`).slice(-2);
+// current month
+const month = (`0 ${dateObject.getMonth() + 1}`).slice(-2);
+// current year
+const year = dateObject.getFullYear();
 let encryptArray = []; // Darf nicht in die function rein.
 
+async function loadData(req, res) {
+
+    try {
+
+        if(req.session.loggedIn != true){
+            return res.render("login", { errormsg: "" });
+        }
+        console.log("LoadDate Username= " + req.session.username);
+
+        let pwItemList = await connection.getAllPwFromUser(req);
+
+        if (req.session.loggedIn) {
+
+            pwItemList.forEach(row => {
+                try {
+
+                    row.Name = decrypt(row.Name, req.session.pw);
+
+                    if (row.Loginname != null) {
+
+                        row.Loginname = decrypt(row.Loginname, req.session.pw);
+                    }
+
+                    row.Pw = decrypt(row.Pw.toString(), req.session.pw);                    
+
+                } catch (err) {
+                    console.log(err);
+                }
+            });
+
+            return res.render("index", { pwDatas: pwItemList, userData: customer.getUserFromSession(req), date: dateLib, currentDate: `${month}/${date}/${year}` });
+
+        } else {
+            return res.render("login", { errormsg: "" });
+        }   
+
+    } catch (err) {
+        console.log("Error on load: " + err);
+    }
+};
 
 async function getCustomers(req,res) {
 
@@ -150,5 +201,6 @@ module.exports = {
     showPw, 
     deletePw, 
     addNewPw,
-    getCustomers 
+    getCustomers ,
+    loadData
 }

index.js

@@ -61,51 +61,6 @@ app.post(function(req, res, next) {
 });
 
 
-
-// Why does this function get called 11 Times?
-async function loadData(req, res) {
-
-    try {
-
-        if(req.session.loggedIn != true){
-            return res.render("login", { errormsg: "" });
-        }
-        console.log("LoadDate Username= " + req.session.username);
-
-        let pwItemList = await connection.getAllPwFromUser(req);
-
-        if (req.session.loggedIn) {
-
-            pwItemList.forEach(row => {
-                try {
-
-                    row.Name = decrypt(row.Name, req.session.pw);
-
-                    if (row.Loginname != null) {
-
-                        row.Loginname = decrypt(row.Loginname, req.session.pw);
-                    }
-
-                    row.Pw = decrypt(row.Pw.toString(), req.session.pw);                    
-
-                } catch (err) {
-                    console.log(err);
-                }
-            });
-
-            return res.render("index", { pwDatas: pwItemList, userData: customer.getUserFromSession(req), date: dateLib, currentDate: `${month}/${date}/${year}` });
-
-        } else {
-            return res.render("login", { errormsg: "" });
-        }   
-
-    } catch (err) {
-        console.log("Error on load: " + err);
-    }
-};
-
-
-
 // routing
 app.get("/", async function(req, res) {
     console.log("redirect to / (loadData)");
@@ -115,7 +70,7 @@ app.get("/", async function(req, res) {
         return res.render("login", { errormsg: "" });
     }
 
-    await loadData(req, res);
+    await administration.loadData(req, res);
 });
 
 /*app.get("/test", async function (req, res) {