Merge branch 'main' into fix-password-validation

Author: mehul-m-prajapati

README.md

@@ -63,6 +63,16 @@ $ npm i
 $ npm start
 ```
 
+### Backend Environment Variables
+
+Create `backend/.env` for local backend runs:
+
+| Variable | Required | Purpose |
+| --- | --- | --- |
+| `MONGO_URI` | Yes | MongoDB connection string used by Mongoose and the persistent session store |
+| `SESSION_SECRET` | Yes | Secret used to sign Express session cookies |
+| `NODE_ENV` | No | Set to `production` to send session cookies only over HTTPS |
+
 ## 🧪 Backend Unit & Integration Testing with Jasmine
 
 This project uses the Jasmine framework for backend unit and integration tests. The tests cover:

backend/config/passportConfig.js

@@ -38,7 +38,11 @@ passport.serializeUser((user, done) => {
 passport.deserializeUser(async (id, done) => {
     try {
         const user = await User.findById(id);
-        done(null, user);
+        done(null, user ? {
+            id: user._id.toString(),
+            username: user.username,
+            email: user.email
+        } : null);
     } catch (err) {
         done(err, null);
     }

backend/config/session.js

@@ -0,0 +1,32 @@
+const MongoStore = require('connect-mongo');
+
+const SESSION_TTL_SECONDS = 14 * 24 * 60 * 60;
+
+function createSessionConfig({
+  mongoUrl = process.env.MONGO_URI,
+  sessionSecret = process.env.SESSION_SECRET,
+  nodeEnv = process.env.NODE_ENV,
+  storeFactory = MongoStore,
+} = {}) {
+  if (!mongoUrl) {
+    throw new Error('MONGO_URI is required to configure the session store');
+  }
+
+  return {
+    secret: sessionSecret,
+    resave: false,
+    saveUninitialized: false,
+    store: storeFactory.create({
+      mongoUrl,
+      ttl: SESSION_TTL_SECONDS,
+    }),
+    cookie: {
+      secure: nodeEnv === 'production',
+    },
+  };
+}
+
+module.exports = {
+  SESSION_TTL_SECONDS,
+  createSessionConfig,
+};

backend/package.json

@@ -14,6 +14,7 @@
   "dependencies": {
     "bcryptjs": "^2.4.3",
     "body-parser": "^1.20.3",
+    "connect-mongo": "^5.1.0",
     "cors": "^2.8.5",
     "dotenv": "^16.4.5",
     "express": "^4.21.1",

backend/routes/auth.js

@@ -9,7 +9,7 @@ const router = express.Router();
 router.post("/signup", validateRequest(signupSchema), async (req, res) => {
 
     const { username,  email, password } = req.body;
-
+                                   
     try {
         const existingUser = await User.findOne({
             $or: [{ email }, { username }],
@@ -30,6 +30,17 @@ router.post("/signup", validateRequest(signupSchema), async (req, res) => {
     }
 });
 
+// Session status route
+router.get("/me", (req, res) => {
+    const isAuthenticated = typeof req.isAuthenticated === "function" && req.isAuthenticated();
+
+    if (!isAuthenticated) {
+        return res.status(200).json({ authenticated: false, user: null });
+    }
+
+    return res.status(200).json({ authenticated: true, user: req.user });
+});
+
 // Login route
 router.post("/login", validateRequest(loginSchema), passport.authenticate('local'), (req, res) => {
     res.status(200).json( { message: 'Login successful', user: req.user } );
@@ -40,10 +51,18 @@ router.get("/logout", (req, res) => {
 
     req.logout((err) => {
 
-        if (err)
+        if (err) {
             return res.status(500).json({ message: 'Logout failed', error: err.message });
-        else
-            res.status(200).json({ message: 'Logged out successfully' });
+        }
+
+        req.session.destroy((sessionErr) => {
+            if (sessionErr) {
+                return res.status(500).json({ message: 'Logout failed', error: sessionErr.message });
+            }
+
+            res.clearCookie('connect.sid');
+            return res.status(200).json({ message: 'Logged out successfully' });
+        });
     });
 });
 

backend/server.js

@@ -5,6 +5,7 @@ const passport = require('passport');
 const bodyParser = require('body-parser');
 require('dotenv').config();
 const cors = require('cors');
+const { createSessionConfig } = require('./config/session');
 
 // Passport configuration
 require('./config/passportConfig');
@@ -28,11 +29,10 @@ app.use(cors({
 
 // Middleware
 app.use(bodyParser.json());
-app.use(session({
-    secret: process.env.SESSION_SECRET,
-    resave: false,
-    saveUninitialized: false,
-}));
+if (process.env.NODE_ENV === 'production') {
+    app.set('trust proxy', 1);
+}
+app.use(session(createSessionConfig()));
 app.use(passport.initialize());
 app.use(passport.session());
 

package.json

@@ -23,6 +23,7 @@
     "@primer/octicons-react": "^19.25.0",
     "@vitejs/plugin-react": "^4.3.3",
     "axios": "^1.7.7",
+    "connect-mongo": "^5.1.0",
     "express": "^5.2.1",
     "framer-motion": "^12.23.12",
     "lucide-react": "^0.525.0",
@@ -31,6 +32,7 @@
     "postcss": "^8.4.47",
     "react": "^18.3.1",
     "react-dom": "^18.3.1",
+    "react-github-calendar": "^5.0.6",
     "react-hot-toast": "^2.4.1",
     "react-icons": "^5.3.0",
     "react-router-dom": "^6.28.0",

spec/session.config.spec.cjs

@@ -0,0 +1,115 @@
+const express = require('express');
+const request = require('supertest');
+const session = require('express-session');
+
+const { SESSION_TTL_SECONDS, createSessionConfig } = require('../backend/config/session');
+
+class TestSessionStore extends session.Store {
+  constructor() {
+    super();
+    this.sessions = new Map();
+  }
+
+  get(sid, callback) {
+    const sessionData = this.sessions.get(sid);
+    callback(null, sessionData ? JSON.parse(sessionData) : null);
+  }
+
+  set(sid, sessionData, callback) {
+    this.sessions.set(sid, JSON.stringify(sessionData));
+    callback(null);
+  }
+
+  destroy(sid, callback) {
+    this.sessions.delete(sid);
+    callback(null);
+  }
+}
+
+function createStoreFactory(store = new TestSessionStore()) {
+  const calls = [];
+
+  return {
+    calls,
+    store,
+    create(options) {
+      calls.push(options);
+      return store;
+    },
+  };
+}
+
+describe('Session configuration', () => {
+  it('initializes connect-mongo with the configured Mongo URL and TTL', () => {
+    const storeFactory = createStoreFactory();
+
+    const config = createSessionConfig({
+      mongoUrl: 'mongodb://127.0.0.1:27017/github_tracker_test',
+      sessionSecret: 'test-secret',
+      storeFactory,
+    });
+
+    expect(storeFactory.calls).toEqual([{
+      mongoUrl: 'mongodb://127.0.0.1:27017/github_tracker_test',
+      ttl: SESSION_TTL_SECONDS,
+    }]);
+    expect(config.store).toBe(storeFactory.store);
+    expect(SESSION_TTL_SECONDS).toBe(14 * 24 * 60 * 60);
+  });
+
+  it('does not fall back to express-session MemoryStore', () => {
+    const config = createSessionConfig({
+      mongoUrl: 'mongodb://127.0.0.1:27017/github_tracker_test',
+      sessionSecret: 'test-secret',
+      storeFactory: createStoreFactory(),
+    });
+
+    expect(config.store).toBeDefined();
+    expect(config.store instanceof session.MemoryStore).toBeFalse();
+  });
+
+  it('uses secure cookies in production only', () => {
+    const productionConfig = createSessionConfig({
+      mongoUrl: 'mongodb://127.0.0.1:27017/github_tracker_test',
+      sessionSecret: 'test-secret',
+      nodeEnv: 'production',
+      storeFactory: createStoreFactory(),
+    });
+    const developmentConfig = createSessionConfig({
+      mongoUrl: 'mongodb://127.0.0.1:27017/github_tracker_test',
+      sessionSecret: 'test-secret',
+      nodeEnv: 'development',
+      storeFactory: createStoreFactory(),
+    });
+
+    expect(productionConfig.cookie.secure).toBeTrue();
+    expect(developmentConfig.cookie.secure).toBeFalse();
+  });
+
+  it('requires MongoDB configuration for persistent sessions', () => {
+    expect(() => createSessionConfig({
+      mongoUrl: '',
+      sessionSecret: 'test-secret',
+      storeFactory: createStoreFactory(),
+    })).toThrowError(/MONGO_URI/);
+  });
+
+  it('persists session data through the configured store', async () => {
+    const app = express();
+
+    app.use(session(createSessionConfig({
+      mongoUrl: 'mongodb://127.0.0.1:27017/github_tracker_test',
+      sessionSecret: 'test-secret',
+      storeFactory: createStoreFactory(),
+    })));
+    app.get('/count', (req, res) => {
+      req.session.views = (req.session.views || 0) + 1;
+      res.json({ views: req.session.views });
+    });
+
+    const agent = request.agent(app);
+
+    await agent.get('/count').expect(200, { views: 1 });
+    await agent.get('/count').expect(200, { views: 2 });
+  });
+});

src/App.css

@@ -11,9 +11,11 @@
   will-change: filter;
   transition: filter 300ms;
 }
+
 .logo:hover {
   filter: drop-shadow(0 0 2em #646cffaa);
 }
+
 .logo.react:hover {
   filter: drop-shadow(0 0 2em #61dafbaa);
 }
@@ -22,6 +24,7 @@
   from {
     transform: rotate(0deg);
   }
+
   to {
     transform: rotate(360deg);
   }
@@ -40,3 +43,11 @@
 .read-the-docs {
   color: #888;
 }
+
+.calendar-container svg text {
+  fill: #1f2937 !important;
+}
+
+.dark .calendar-container svg text {
+  fill: #d1d5db !important;
+}

src/App.tsx

@@ -2,6 +2,7 @@ import { useLocation } from "react-router-dom";
 import Navbar from "./components/Navbar";
 import Footer from "./components/Footer";
 import ScrollProgressBar from "./components/ScrollProgressBar";
+import ScrollNavigator from "./components/ScrollNavigator";
 import { Toaster } from "react-hot-toast";
 import Router from "./Routes/Router";
 
@@ -16,6 +17,7 @@ function App() {
         {!isFullscreen && <ScrollProgressBar />}
 
         {!isFullscreen && <Navbar />}
+        <ScrollNavigator />
 
         <main className={`flex justify-center items-center ${isFullscreen ? "flex-1" : "flex-grow bg-gray-50 dark:bg-gray-800"}`}>
           <Router />