merged conflicts

app.js

@@ -6,45 +6,76 @@ const methodOverride = require('method-override');
 const cookieParser = require('cookie-parser');
 const session = require('express-session');
 const MongoStore = require('connect-mongo');
+const passport = require('passport'); // Added passport for authentication
+const flash = require('connect-flash'); // Added flash for storing flash messages
 
 const connectDB = require('./server/config/db');
 const { isActiveRoute } = require('./server/helpers/routeHelpers');
 
+// Passport configuration
+require('./server/config/passport')(passport); // Passport config to be created separately
+
 const app = express();
 const PORT = process.env.PORT || 5000;
-
-// Connect to DB
+
+app.use(session({
+    secret: 'your_secret_key', // Change this to your secret key
+    resave: false,
+    saveUninitialized: true,
+}));
+
+app.use(flash());
+
+
+// Connect to MongoDB
 connectDB();
 
+// Middleware setup
 app.use(express.urlencoded({ extended: true }));
 app.use(express.json());
 app.use(cookieParser());
 app.use(methodOverride('_method'));
 
+// Session setup for storing user session data
 app.use(session({
-  secret: 'keyboard cat',
+  secret: process.env.SESSION_SECRET || 'keyboard cat', // Use SESSION_SECRET from .env
   resave: false,
   saveUninitialized: true,
   store: MongoStore.create({
-    mongoUrl: process.env.MONGODB_URI
+    mongoUrl: process.env.MONGODB_URI // Use MongoDB Atlas URI from .env
   }),
-  //cookie: { maxAge: new Date ( Date.now() + (3600000) ) } 
+  // cookie: { maxAge: new Date(Date.now() + 3600000) } // Uncomment if you want custom cookie expiry time
 }));
 
+// Passport middleware
+app.use(passport.initialize());
+app.use(passport.session()); // Persist user sessions
+
+
+// Global variables for flash messages
+app.use((req, res, next) => {
+  res.locals.success_msg = req.flash('success_msg');
+  res.locals.error_msg = req.flash('error_msg');
+  res.locals.error = req.flash('error'); // Error messages from Passport
+  next();
+});
+
+// Static files
 app.use(express.static('public'));
 
 // Templating Engine
 app.use(expressLayout);
 app.set('layout', './layouts/main');
 app.set('view engine', 'ejs');
 
-
+// Helper for active route
 app.locals.isActiveRoute = isActiveRoute; 
 
-
+// Routes
 app.use('/', require('./server/routes/main'));
 app.use('/', require('./server/routes/admin'));
 
-app.listen(PORT, ()=> {
+// Start the server
+app.listen(PORT, () => {
   console.log(`App listening on port ${PORT}`);
 });

example.env

@@ -0,0 +1,4 @@
+MONGODB_URI=mongodb://localhost:27017/bloglog
+EMAIL_USERNAME=test
+EMAIL_APP_PASSWORD=test@123
+JWT_SECRET= <- your jwt secret key ->