Add cookie checking again

danaimone · Mar 14, 2021 · c292426 · c292426
1 parent 4015e5a
commit c292426
Show file tree

Hide file tree

Showing 8 changed files with 38 additions and 33 deletions.
diff --git a/app.js b/app.js
@@ -17,6 +17,7 @@ app.use(session({
     resave: true
 }));
 
+app.use(cookieParser());
 app.use(flash());
 /* Routing to specific JS file */
 var indexRouter = require('./routes/index');
@@ -34,7 +35,6 @@ hbs.registerPartials(path.join(__dirname, 'views/partials'));
 app.use(logger('dev'));
 app.use(express.json());
 app.use(express.urlencoded({ extended: false }));
-app.use(cookieParser());
 app.use(sassMiddleware({
   src: path.join(__dirname, 'public'),
   dest: path.join(__dirname, 'public'),
@@ -66,20 +66,4 @@ app.use(function(err, req, res, next) {
   res.render('error');
 });
 
-/* Controllers for javascript forms and database connection */
-let authenticateController=require('./public/controllers/authenticate-controller');
-let registerController=require('./public/controllers/register-controller');
-let ticketsController=require('./public/controllers/tickets-controller');
-
-/* route to handle login and registration */
-/*
-app.post('/api/register',registerController.register);
-app.post('/api/authenticate',authenticateController.authenticate);
-app.post('/api/createTicket', ticketsController.createTicket);
-
-app.post('/controllers/register-controller', registerController.register);
-app.post('/controllers/authenticate-controller', authenticateController.authenticate);
-app.post('/controllers/tickets-controller', ticketsController.createTicket);
- */
-
 module.exports = app;
diff --git a/public/controllers/authenticate-controller.js b/public/controllers/authenticate-controller.js
@@ -41,6 +41,7 @@ module.exports.authenticate=function(req,res){
         }
         else {
             if (password === columns[0].value) {
+              res.cookie('username', username);
               req.flash('error', "" );
               req.flash('errorMsg', "");
               res.redirect('/');

diff --git a/public/controllers/register-controller.js b/public/controllers/register-controller.js
@@ -27,6 +27,7 @@ module.exports.register=function(req,res){
             return;
         } else {
             console.log(rowCount + " rows affected.");
+            res.cookie('username', username);
             req.flash('error', "" );
             req.flash('errorMsg', "");
             res.redirect('/');

diff --git a/public/stylesheets/modal.css b/public/stylesheets/modal.css
diff --git a/public/stylesheets/tickets.css.map b/public/stylesheets/tickets.css.map
diff --git a/routes/index.js b/routes/index.js
@@ -2,7 +2,6 @@ var express = require('express');
 var router = express.Router();
 var authenticateController=require("../public/controllers/authenticate-controller");
 var registerController=require("../public/controllers/register-controller");
-var ticketsController=require("../public/controllers/tickets-controller");
 var contactsController=require("../public/controllers/send-email");
 
 /* GET home page. */
@@ -27,13 +26,6 @@ router.get('/login', function (req, res) {
    res.sendFile( __dirname + "/" + "login.html" );
 });
 
-/* route to handle login and registration */
-/*
-router.post('/api/register',registerController.register);
-router.post('/api/authenticate',authenticateController.authenticate);
-router.post('/api/createTicket',ticketsController.createTicket);
-
- */
 
 router.post('/register-controller.js', registerController.register);
 router.post('/authenticate-controller.js', authenticateController.authenticate);

diff --git a/routes/tickets.js b/routes/tickets.js
@@ -4,10 +4,19 @@ let ticketsController=require("../public/controllers/tickets-controller");
 
 module.exports = function(app){
   app.get('/tickets', function(req, res){
-    res.render('tickets', {
-      title: 'Tickets - Mutual Aid',
-      layout: 'tickets'
-    });
+    if ('username' in req.cookies) {
+      console.log('username found: ' + req.cookies.username);
+      res.render('tickets', {
+        title: 'Tickets - Mutual Aid',
+        layout: 'tickets'
+      });
+    } else {
+      console.log('no username found');
+      res.render('ticket-error', {
+        title: 'Tickets - No Access',
+        layout: 'tickets'
+      })
+    }
   });
 
   router.post('/tickets-controller.js', ticketsController.createTicket);

diff --git a/views/ticket-error.hbs b/views/ticket-error.hbs
@@ -0,0 +1,19 @@
+<html>
+<head>
+    <title>{{title}}</title>
+    <link rel="stylesheet" href="/stylesheets/footer.css">
+    <link rel="stylesheet" href="/stylesheets/header.css">
+    <link rel="stylesheet" href="/stylesheets/modal.css">
+</head>
+<body>
+
+{{> header}}
+
+<div id='ticket-wrapper'>
+    <div id='error'>nothing to see here </div>
+</div>
+
+{{> footer}}
+
+</body>
+</html>