Merge branch 'newapi' of https://github.com/Expand-sys/ccashfrontend into newapi

config/auth.js

@@ -3,7 +3,8 @@ module.exports = {
     if (req.session.user != undefined) {
       return next();
     }
-    req.flash("error_msg", "please login to view this resource");
+    req.session.errors = [];
+    req.session.errors.push({ msg: "please login to view this resource" });
     res.redirect("/login");
   },
 };

helpers/functions.js

@@ -3,13 +3,15 @@ const got = require("got");
 async function postUser(name, password) {
   console.log(process.env.BANKAPIURL);
   try {
-    const { body } = await got.post(process.env.BANKAPIURL + "BankF/user", {
+    const { body } = await got.post(
-      json: {
+      process.env.BANKAPIURL + "BankF/user/" + name,
-        name: name,
+      {
-        init_pass: password,
+        headers: {
+          Password: password,
         },
         responseType: "json",
-    });
+      }
+    );
     return body;
   } catch (err) {
     console.log(err);

index.js

@@ -194,11 +194,11 @@ app.get("/BankF", ensureAuthenticated, async function (req, res) {
   let logsent;
   console.log("start " + Date.now());
   try {
-    logsent = await got.post(
+    logsent = await got(
       process.env.BANKAPIURL + "BankF/" + req.session.user + "/log",
       {
-        json: {
+        headers: {
-          attempt: req.session.password,
+          Password: req.session.password,
         },
         responseType: "json",
       }
@@ -206,16 +206,22 @@ app.get("/BankF", ensureAuthenticated, async function (req, res) {
   } catch (e) {
     console.log(e);
   }
+  console.log(logsent.body);
   console.log("query finished " + Date.now());
-  logsent = logsent.body.value;
+  logsent = logsent.body;
+  logsent = logsent.value;
   let logrec = logsent;
   let graphlog = logsent;
   if (graphlog != null) {
     graphlog = graphlog.reverse();
   }
+<<<<<<< HEAD
+=======
+  console.log(graphlog);
+>>>>>>> 0632ce5d3013197f52c2a2ffa69b5bd940da7817
   let graphdata = "";
   let currentbal = balance.value;
-  if (graphlog) {
+  if (graphlog != null) {
     for (i = graphlog.length - 1; i > -1; i--) {
       if (graphlog[i].from == req.session.user) {
         currentbal = parseInt(currentbal) + parseInt(graphlog[i].amount);
@@ -225,9 +231,15 @@ app.get("/BankF", ensureAuthenticated, async function (req, res) {
         graphdata = graphdata + ", [" + parseInt(i) + "," + currentbal + "]";
       }
     }
+    graphdata =
+      ", [" + parseInt(graphlog.length) + "," + balance.value + "]" + graphdata;
+    console.log(balance);
+    graphdata = '["transaction", "balance"]' + graphdata;
+    console.log(JSON.stringify(graphdata));
   } else {
     graphlog = undefined;
   }
+<<<<<<< HEAD
   if (graphdata != "") {
     graphdata =
       ", [" + parseInt(graphlog.length) + "," + balance.value + "]" + graphdata;
@@ -237,6 +249,9 @@ app.get("/BankF", ensureAuthenticated, async function (req, res) {
   console.log(balance);
 
   console.log(JSON.stringify(graphdata));
+=======
+
+>>>>>>> 0632ce5d3013197f52c2a2ffa69b5bd940da7817
   if (logsent == 1 || logsent == -1 || logsent == null) {
     logsent = undefined;
   } else {
@@ -353,61 +368,56 @@ app.post("/login", async function (req, res) {
   if (req.session.user) {
     res.redirect("/");
   }
+  req.session.regenerate(function (err) {});
   let { name, password } = req.body;
   let adminTest;
-  let errors = [];
+  req.session.errors = [];
-  try {
-    adminTest = await got.post(process.env.BANKAPIURL + "BankF/admin/vpass", {
-      json: {
-        attempt: password,
-      },
-      responseType: "json",
-    });
-  } catch (err) {
-    console.log(err);
-  }
-  req.session.password = password;
-  if (adminTest.body.value == undefined) {
-    res.redirect("/");
-  } else {
-    req.session.admin = adminTest.body.value;
-    req.session.adminp = password;
   let verified;
   try {
-      verified = await got.post(process.env.BANKAPIURL + "BankF/vpass", {
+    verified = await got(
-        json: {
+      process.env.BANKAPIURL + "BankF/" + name + "/pass/verify",
-          name: name,
+      {
-          attempt: password,
+        headers: {
+          Password: password,
         },
         responseType: "json",
-      });
+      }
+    );
   } catch (err) {
     console.log(err);
   } finally {
-      console.log(verified.body.value);
+    if (verified.body.value == -2) {
-      if (verified.body.value == 0) {
+      req.session.errors.push({ msg: "Password wrong" });
-        errors.push({ msg: "Password wrong" });
+      res.redirect("/login");
-        res.render("login", {
-          errors: errors,
-          marketplace: process.env.MARKETPLACE,
-          random: papy(),
-        });
     } else if (verified.body.value == 1) {
+      console.log(name);
       req.session.user = name;
       req.session.password = password;
       res.redirect("/BankF");
-      } else {
+    } else if (verified.body.value == -1) {
-        errors.push({ msg: "User not found" });
+      req.session.errors = [];
-        res.render("login", {
+      req.session.errors.push({ msg: "User not found" });
-          errors: errors,
+      res.redirect("/login");
-          marketplace: process.env.MARKETPLACE,
+    } else if (verified.body.value == 0) {
-          random: papy(),
+      console.log(verified.body.value + " Error on verified");
+      try {
+        adminTest = await got(process.env.BANKAPIURL + "BankF/admin/verify", {
+          headers: {
+            Password: password,
+          },
+          responseType: "json",
         });
+      } catch (err) {
+        console.log(err);
+      }
+      console.log(adminTest.body);
+      if (adminTest.body) {
+        req.session.admin = adminTest.body.value;
+        req.session.adminp = password;
+        res.redirect("/BankF");
       }
     }
   }
-
-  //res.redirect('/login')
 });
 
 let admin = require("./routes/admin");