janis/shop-ejs-expressjs
1
0
Fork 0
mirror of https://github.com/DerTyp7/shop-ejs-expressjs.git synced 2025-10-30 04:47:11 +01:00
Code Issues Packages Projects Releases Wiki Activity

fixed cookies again

Browse Source
This commit is contained in:
Janis M
2022-03-31 10:41:39 +02:00
parent 109a95d2e7
commit 77a4416454
2 changed files with 28 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
index.js
View File

@@ -29,9 +29,11 @@ app.use(express.static(__dirname + "/static"));
function authNoRedirectHandler(req, res, next){ function authNoRedirectHandler(req, res, next){
const authcookie = req.cookies.authcookie; // Get authcookie from cookie const authcookie = req.cookies.authcookie; // Get authcookie from cookie
if(authcookie){
jwt.verify(authcookie, SECRET_KEY, (err, data) =>{ // Verify authcookie jwt.verify(authcookie, SECRET_KEY, (err, data) =>{ // Verify authcookie
if(err){ // If authcookie is invalid if(err){ // If authcookie is invalid
console.log(err); console.log(err);
req.user = false;
next(); next();
} else if(data.user){ // If authcookie is valid } else if(data.user){ // If authcookie is valid
req.user = data.user; // Set user to data.user req.user = data.user; // Set user to data.user
@@ -39,8 +41,7 @@ function authNoRedirectHandler(req, res, next){
if(err) console.log(err); if(err) console.log(err);
let user = JSON.parse(JSON.stringify(result))[0]; // Parse user from database let user = JSON.parse(JSON.stringify(result))[0]; // Parse user from database
try{ if(result.length > 0){
if(user.id){
// Set user to req.user // Set user to req.user
req.isAdmin = user.isAdmin; req.isAdmin = user.isAdmin;
req.username = user.username; req.username = user.username;
@@ -48,14 +49,15 @@ function authNoRedirectHandler(req, res, next){
req.lastname = user.lastname; req.lastname = user.lastname;
req.email = user.email; req.email = user.email;
} }
}catch{
res.redirect('/logout')
return;
}
next(); // Continue to next handler next(); // Continue to next handler
}); });
} }
}); });
}else{
console.log("No Redirect: Not autheticated")
req.user = false;
next();
}
} }
@@ -108,9 +110,11 @@ function notAuthenticatedHandler(req, res, next){
// Homepage // Homepage
app.get("/", authNoRedirectHandler, (req, res) => { app.get("/", authNoRedirectHandler, (req, res) => {
mysql_handler.con.query("SELECT * FROM products", function(err, result){ mysql_handler.con.query("SELECT * FROM products", function(err, result){
if(err) throw err; if(err) throw err;
let products = JSON.parse(JSON.stringify(result)); let products = JSON.parse(JSON.stringify(result));
mysql_handler.con.query("SELECT * FROM product_images", function(err, result){ mysql_handler.con.query("SELECT * FROM product_images", function(err, result){
if(err) throw err; if(err) throw err;
let dict = { let dict = {
@@ -176,7 +180,7 @@ app.get("/product/:productId", authNoRedirectHandler, (req, res) => {
mysql_handler.con.query(`SELECT title, content ,rating, u.username AS name FROM reviews AS r LEFT JOIN users AS u ON r.userId = u.id WHERE productId=${productId}`,function(err,result){ mysql_handler.con.query(`SELECT title, content ,rating, u.username AS name FROM reviews AS r LEFT JOIN users AS u ON r.userId = u.id WHERE productId=${productId}`,function(err,result){
if(err) throw err; if(err) throw err;
let reviews = JSON.parse(JSON.stringify(result)); let reviews = JSON.parse(JSON.stringify(result));
console.log(product)
mysql_handler.con.query(`SELECT * FROM categories WHERE id IN (SELECT category_id FROM product_categories WHERE product_id = ${product.id})`,function(err,result){ mysql_handler.con.query(`SELECT * FROM categories WHERE id IN (SELECT category_id FROM product_categories WHERE product_id = ${product.id})`,function(err,result){
if(err) throw err; if(err) throw err;
let categories = JSON.parse(JSON.stringify(result)); let categories = JSON.parse(JSON.stringify(result));

4
views/index.ejs
View File

@@ -35,6 +35,10 @@
} }
.grid-item img{
cursor:pointer;
}
.grid-item p { .grid-item p {
display: block; display: block;
height: 50px; height: 50px;