diff --git a/database/socialbot.db b/database/socialbot.db index 5d8aa45..6c5902b 100644 Binary files a/database/socialbot.db and b/database/socialbot.db differ diff --git a/models/index.js b/models/index.js index c475401..0645cc5 100644 --- a/models/index.js +++ b/models/index.js @@ -26,8 +26,8 @@ fs db.User.belongsToMany(db.Message, {foreignKey: 'UserId', through: 'UserMessages'}); db.Message.belongsTo(db.User, {through: 'UserMessages'}); - db.User.belongsToMany(db.Session, {foreignKey: 'UserId', through: 'UserSessions'}); - db.Session.belongsTo(db.User, {through: 'UserSessions'}); + db.User.hasMany(db.Session); + db.Session.belongsTo(db.User); Object.keys(db).forEach(modelName => { if (db[modelName].associate) { diff --git a/routes/index.js b/routes/index.js index d0f44dd..4c06968 100644 --- a/routes/index.js +++ b/routes/index.js @@ -7,16 +7,25 @@ var Session = db.Session; /* GET home page. */ router.get('/', async function(req, res, next) { console.log(req.cookies.sessionid); - sessionId = req.cookies.sessionid; - var session = await Session.findAll({ - include: User - }); - - if(session) { - console.log(session); + var sessionId = req.cookies.sessionid; + var session; + var user; + if(sessionId != undefined) { + session = await Session.findOne({ + include: User, + where: { + sessionid: sessionId + } + }); + if(session) { + user = session.User; + res.render('index', { auth: user }); + } else { + res.redirect('/login'); + } + } else { + res.redirect('/login'); } - - res.render('index'); }); module.exports = router; diff --git a/views/index.ejs b/views/index.ejs index adfecaf..428fa16 100644 --- a/views/index.ejs +++ b/views/index.ejs @@ -34,8 +34,8 @@
john.doe@uplink.si
+<%= auth.name %>
Joined Dec 28, 2021
+Joined <%= auth.createdAt %>