Merge pull request #23 from oslabs-beta/lorenc-ci

Merge branch 'main' into lorenc-ci

Author: PVeazie951

server/auth.js

@@ -1,18 +1,23 @@
+//Module for managin OAuth state tokens to prevent CSRF attacks and track redirect targets during OAuth flows
 import crypto from 'node:crypto';
 
 const stateStore = new Map();
 const STATE_TTL_MS = 10 * 60 * 1000;
 
+// Create a random OAuth state token and store metadata
 export function createState(redirectTo = '/') {
   const state = crypto.randomBytes(16).toString('hex');
   stateStore.set(state, { createdAt: Date.now(), redirectTo });
   return state;
 }
 
+// Validate and consume a previously generated state token
 export function consumeState(state) {
   const item = stateStore.get(state);
+
   if (!item) return null;
   stateStore.delete(state);
+
   if (Date.now() - item.createdAt > STATE_TTL_MS) return null;
   return item;
 }

server/db.js

@@ -1,13 +1,19 @@
-// definitely periodically run Prettier or some other formatter on your codebase!
-
 import 'dotenv/config';
 import pkg from 'pg';
 const { Pool } = pkg;
 
+// Central Postgres connection pool for the entire backend.
+//
+// Why a pool?
+// - Reuses TCP connections instead of opening a new one per query.
+// - Limits max concurrent connections so we don’t overload the DB.
+// - Handles idle timeouts & connection timeouts for us.
+
 console.log(
   '🔐 DB SSL rejectUnauthorized:',
   process.env.DB_SSL_REJECT_UNAUTHORIZED
 );
+
 export const pool = new Pool({
   connectionString: process.env.DATABASE_URL,
   max: parseInt(process.env.DB_POOL_MAX || '8', 10),
@@ -25,10 +31,19 @@ pool.on('error', (err) =>
   console.error('[DB] Unexpected error on idle client', err)
 );
 
+// Tiny helper to run a parameterized query using the shared pool.
+//
+// Example:
+//   const { rows } = await query('select * from users where id = $1', [userId]);
+//
+// It also logs query duration in non‑production environments to help
+// track slow queries during development.
+
 export async function query(sql, params = []) {
   const start = Date.now();
   const res = await pool.query(sql, params);
   const ms = Date.now() - start;
+
   if (process.env.NODE_ENV !== 'production') {
     console.log(`SQL ${ms}ms: `, sql, params);
   }

server/lib/github-oauth.js

@@ -1,5 +1,4 @@
-// this file is great, and organized.
-
+// Build the GitHub OAuth authorization URL
 export function buildAuthorizeUrl({ clientId, redirectUri, scopes, state }) {
   const params = new URLSearchParams({
     client_id: clientId,
@@ -11,6 +10,7 @@ export function buildAuthorizeUrl({ clientId, redirectUri, scopes, state }) {
   return `https://github.com/login/oauth/authorize?${params}`;
 }
 
+// Exchange OAuth authorization code for an access token
 export async function exchangeCodeForToken({
   clientId,
   clientSecret,
@@ -40,6 +40,7 @@ export async function exchangeCodeForToken({
   return json;
 }
 
+// Fetch the authenticated GitHub user profile
 export async function fetchGithubUser(accessToken) {
   const res = await fetch('https://api.github.com/user', {
     headers: {
@@ -56,6 +57,7 @@ export async function fetchGithubUser(accessToken) {
   return json;
 }
 
+// Fetch the user's primary email address from GitHub
 export async function fetchPrimaryEmail(accessToken) {
   const res = await fetch('https://api.github.com/user/emails', {
     headers: {

server/lib/github-token.js

@@ -1,5 +1,6 @@
 import { query } from '../db.js';
 
+// Get the GitHub access token for the user
 export async function getGithubAccessTokenForUser(userId) {
   if (process.env.GITHUB_PAT_OVERRIDE) {
     return process.env.GITHUB_PAT_OVERRIDE;

server/lib/pipelineVersions.js

@@ -1,6 +1,8 @@
+// Helper for storing versioned copies of workflow YAML files
 import crypto from 'crypto';
 import { query } from '../db.js';
 
+// Save a new pipeline YAML version with a SHA-256 hash for change tracking
 export async function savePipelineVersion({
   userId,
   repoFullName,

server/lib/requireSession.js

@@ -1,32 +1,15 @@
-// import jwt from 'jsonwebtoken';
-
-// const SESSION_SECRET = process.env.SESSION_SECRET || 'dev-secret';
-
-// export function requireSession(req, res, next) {
-//   let token = req.cookies?.mcp_session;
-//   if (!token && req.headers.authorization && req.headers.authorization.startsWith('Bearer ')) {
-//     token = req.headers.authorization.slice(7);
-//   }
-//   if (!token) return res.status(401).json({ error: 'No session token' });
-
-//   try {
-//     const decoded = jwt.verify(token, SESSION_SECRET);
-//     req.user = decoded;
-//     next();
-//   } catch (err) {
-//     console.error('Session verify failed', err);
-//     return res.status(401).json({ error: 'Invalid or expired session' });
-//   }
-// }
-
+// Middleware to validate the user's JWT session cookie
 import jwt from 'jsonwebtoken';
 
+// Ensures a valid mcp_session JWT is present; attaches decoded user to req
 export function requireSession(req, res, next) {
   const raw = req.cookies?.mcp_session;
+
   if (!raw) return res.status(401).json({ error: 'No session' });
+
   try {
-    const user = jwt.verify(raw, process.env.JWT_SECRET); // MUST match the signer
-    req.user = user; // { user_id, github_username, email, iat, exp }
+    const user = jwt.verify(raw, process.env.JWT_SECRET);
+    req.user = user;
     return next();
   } catch (e) {
     console.error('[requireSession] verify failed:', e.message);

server/lib/state.js

@@ -1,14 +1,17 @@
+// Simple in-memory OAuth state manager
 import crypto from 'node:crypto';
 
 const stateStore = new Map();
 const STATE_TTL_MS = 10 * 60 * 1000; // 10 minutes
 
+// Generate a state token and store its metadata
 export function createState(redirectTo = '/') {
   const state = crypto.randomBytes(16).toString('hex');
   stateStore.set(state, { createdAt: Date.now(), redirectTo });
   return state;
 }
 
+// Validate and consume a previously issued state token
 export function consumeState(state) {
   const item = stateStore.get(state);
   if (!item) return null;

server/routes/agent.js

@@ -15,7 +15,12 @@ router.post('/wizard', async (req, res) => {
   try {
     const { repoUrl, provider, branch } = req.body;
     if (!repoUrl || !provider || !branch) {
-      return res.status(400).json({ success: false, error: 'Missing required fields: repoUrl, provider, branch' });
+      return res
+        .status(400)
+        .json({
+          success: false,
+          error: 'Missing required fields: repoUrl, provider, branch',
+        });
     }
     const result = await runWizardAgent({ repoUrl, provider, branch });
     res.json({ success: true, data: result });
@@ -30,12 +35,14 @@ router.post('/pipeline', async (req, res) => {
   try {
     const { repoUrl } = req.body;
     if (!repoUrl) {
-      return res.status(400).json({ success: false, error: 'Missing required field: repoUrl' });
+      return res
+        .status(400)
+        .json({ success: false, error: 'Missing required field: repoUrl' });
     }
     const yaml = await pipeline_generator.handler({
       repo: repoUrl,
       provider: 'aws',
-      template: 'node_app'
+      template: 'node_app',
     });
     res.json({ success: true, data: yaml });
   } catch (err) {
@@ -48,7 +55,9 @@ router.post('/analyze', async (req, res) => {
   try {
     const { repoUrl } = req.body;
     if (!repoUrl) {
-      return res.status(400).json({ success: false, error: 'Missing required field: repoUrl' });
+      return res
+        .status(400)
+        .json({ success: false, error: 'Missing required field: repoUrl' });
     }
     const summary = await repo_reader.handler({ repo: repoUrl });
     res.json({ success: true, data: summary });
@@ -62,7 +71,9 @@ router.post('/deploy', async (req, res) => {
   try {
     const { provider } = req.body;
     if (!provider) {
-      return res.status(400).json({ success: false, error: 'Missing required field: provider' });
+      return res
+        .status(400)
+        .json({ success: false, error: 'Missing required field: provider' });
     }
     const deployLog = await oidc_adapter.handler({ provider });
     res.json({ success: true, data: deployLog });
@@ -76,4 +87,4 @@ router.get('/status', (_req, res) => {
   res.json({ success: true, data: { ok: true, uptime: process.uptime() } });
 });
 
-export default router;
+export default router;