Merge branch 'develop' into feature/add-community-links-to-help-menu

raclim · web-flow · commit 73b9a2c49684 · 2025-09-23T10:12:27.000-04:00
diff --git a/client/components/RootPage.tsx b/client/components/RootPage.tsx
@@ -7,7 +7,7 @@ interface RootPageProps {
 
 export const RootPage = styled.div<RootPageProps>`
   min-height: 100vh;
-  height: ${({ fixedHeight }) => fixedHeight || '100vh'};
+  height: ${({ fixedHeight }) => fixedHeight || 'auto'};
   display: flex;
   justify-content: flex-start;
   flex-direction: column;
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -138,6 +138,7 @@
     "@types/friendly-words": "^1.2.2",
     "@types/jest": "^29.5.14",
     "@types/node": "^16.18.126",
+    "@types/passport": "^1.0.17",
     "@types/react": "^16.14.0",
     "@types/react-dom": "^16.9.25",
     "@types/react-router-dom": "^5.3.3",
diff --git a/server/routes/api.routes.ts b/server/routes/api.routes.ts
@@ -2,7 +2,7 @@ import { Router } from 'express';
 import passport from 'passport';
 import * as ProjectController from '../controllers/project.controller';
 
-const router = new Router();
+const router = Router();
 
 router.get(
   '/:username/sketches',
@@ -24,4 +24,5 @@ router.delete(
   ProjectController.deleteProject
 );
 
+// eslint-disable-next-line import/no-default-export
 export default router;
diff --git a/server/routes/asset.routes.ts b/server/routes/asset.routes.ts
@@ -2,7 +2,7 @@ import { Router } from 'express';
 import { getProjectAsset } from '../controllers/project.controller';
 import { getFileContent } from '../controllers/file.controller';
 
-const router = new Router();
+const router = Router();
 
 router.get('/:username/sketches/:project_id/*', getProjectAsset);
 router.get('/full/:project_id/*', getProjectAsset);
@@ -14,4 +14,5 @@ router.get('/:username/embed/:project_id/*', getProjectAsset);
 
 router.get('/sketches/:project_id/assets/*?', getFileContent);
 
+// eslint-disable-next-line import/no-default-export
 export default router;
diff --git a/server/routes/aws.routes.ts b/server/routes/aws.routes.ts
@@ -2,7 +2,7 @@ import { Router } from 'express';
 import * as AWSController from '../controllers/aws.controller';
 import isAuthenticated from '../utils/isAuthenticated';
 
-const router = new Router();
+const router = Router();
 
 router.post('/S3/sign', isAuthenticated, AWSController.signS3);
 router.post(
@@ -17,4 +17,5 @@ router.delete(
 );
 router.get('/S3/objects', AWSController.listObjectsInS3ForUserRequestHandler);
 
+// eslint-disable-next-line import/no-default-export
 export default router;
diff --git a/server/routes/collection.routes.ts b/server/routes/collection.routes.ts
@@ -2,7 +2,7 @@ import { Router } from 'express';
 import * as CollectionController from '../controllers/collection.controller';
 import isAuthenticated from '../utils/isAuthenticated';
 
-const router = new Router();
+const router = Router();
 
 // List collections
 router.get(
@@ -41,4 +41,5 @@ router.delete(
   CollectionController.removeProjectFromCollection
 );
 
+// eslint-disable-next-line import/no-default-export
 export default router;
diff --git a/server/routes/embed.routes.ts b/server/routes/embed.routes.ts
@@ -2,7 +2,7 @@ import { Router } from 'express';
 
 const editorUrl = process.env.EDITOR_URL;
 
-const router = new Router();
+const router = Router();
 
 // CAT redirecting these temporarily to editor URLS to prevent phishing
 // router.get('/:username/embed/:project_id', EmbedController.serveProject);
@@ -21,4 +21,5 @@ router.get('/embed/:project_id', (req, res) => {
   res.redirect(301, `${editorUrl}/full/${projectId}`);
 });
 
+// eslint-disable-next-line import/no-default-export
 export default router;
diff --git a/server/routes/file.routes.ts b/server/routes/file.routes.ts
@@ -2,7 +2,7 @@ import { Router } from 'express';
 import * as FileController from '../controllers/file.controller';
 import isAuthenticated from '../utils/isAuthenticated';
 
-const router = new Router();
+const router = Router();
 
 router.post(
   '/projects/:project_id/files',
@@ -15,4 +15,5 @@ router.delete(
   FileController.deleteFile
 );
 
+// eslint-disable-next-line import/no-default-export
 export default router;
diff --git a/server/routes/passport.routes.js b/server/routes/passport.routes.js
diff --git a/server/routes/passport.routes.ts b/server/routes/passport.routes.ts
@@ -0,0 +1,44 @@
+import { Router, Request, Response, NextFunction } from 'express';
+import passport from 'passport';
+
+const router = Router();
+
+const authenticateOAuth = (service: string) => (
+  req: Request,
+  res: Response,
+  next: NextFunction
+) => {
+  passport.authenticate(
+    service,
+    { failureRedirect: '/login' },
+    (err: any, user: any) => {
+      if (err) {
+        // use query string param to show error;
+        res.redirect(`/account?error=${service}`);
+        return;
+      }
+
+      if (!user) {
+        res.redirect(`/account?error=${service}NoUser`);
+        return;
+      }
+
+      req.logIn(user, (loginErr) => {
+        if (loginErr) {
+          next(loginErr);
+          return;
+        }
+        res.redirect('/');
+      });
+    }
+  )(req, res, next);
+};
+
+router.get('/auth/github', passport.authenticate('github'));
+router.get('/auth/github/callback', authenticateOAuth('github'));
+
+router.get('/auth/google', passport.authenticate('google'));
+router.get('/auth/google/callback', authenticateOAuth('google'));
+
+// eslint-disable-next-line import/no-default-export
+export default router;
diff --git a/server/routes/project.routes.ts b/server/routes/project.routes.ts
@@ -2,7 +2,7 @@ import { Router } from 'express';
 import * as ProjectController from '../controllers/project.controller';
 import isAuthenticated from '../utils/isAuthenticated';
 
-const router = new Router();
+const router = Router();
 
 router.post('/projects', isAuthenticated, ProjectController.createProject);
 
@@ -28,4 +28,5 @@ router.get('/projects/:project_id/zip', ProjectController.downloadProjectAsZip);
 
 router.patch('/project/visibility', ProjectController.changeProjectVisibility);
 
+// eslint-disable-next-line import/no-default-export
 export default router;
diff --git a/server/routes/redirectEmbed.routes.ts b/server/routes/redirectEmbed.routes.ts
@@ -1,6 +1,6 @@
 import { Router } from 'express';
 
-const router = new Router();
+const router = Router();
 
 router.get('/:username/embed/:project_id', (req, res) => {
   const { username, project_id: projectId } = req.params;
@@ -23,4 +23,5 @@ router.get('/embed/:project_id', (req, res) => {
   res.redirect(301, `/full/${projectId}`);
 });
 
+// eslint-disable-next-line import/no-default-export
 export default router;
diff --git a/server/routes/server.routes.js b/server/routes/server.routes.js
@@ -8,13 +8,7 @@ import {
 } from '../controllers/project.controller';
 import { collectionForUserExists } from '../controllers/collection.controller';
 
-const router = new Router();
-
-// const fallback404 = (res) => (exists) =>
-//   exists ? res.send(renderIndex()) : get404Sketch((html) => res.send(html));
-
-// this is intended to be a temporary file
-// until i figure out isomorphic rendering
+const router = Router();
 
 router.get('/', (req, res) => {
   res.send(renderIndex());
@@ -159,4 +153,5 @@ router.get('/code-of-conduct', (req, res) => {
   res.send(renderIndex());
 });
 
+// eslint-disable-next-line import/no-default-export
 export default router;
diff --git a/server/routes/session.routes.ts b/server/routes/session.routes.ts
@@ -1,12 +1,13 @@
 import { Router } from 'express';
 import * as SessionController from '../controllers/session.controller';
 
-const router = new Router();
+const router = Router();
 
 router.post('/login', SessionController.createSession);
 
 router.get('/session', SessionController.getSession);
 
 router.get('/logout', SessionController.destroySession);
 
+// eslint-disable-next-line import/no-default-export
 export default router;
diff --git a/server/routes/user.routes.ts b/server/routes/user.routes.ts
@@ -2,7 +2,7 @@ import { Router } from 'express';
 import * as UserController from '../controllers/user.controller';
 import isAuthenticated from '../utils/isAuthenticated';
 
-const router = new Router();
+const router = Router();
 
 router.post('/signup', UserController.createUser);
 
@@ -39,4 +39,5 @@ router.get('/verify', UserController.verifyEmail);
 router.delete('/auth/github', UserController.unlinkGithub);
 router.delete('/auth/google', UserController.unlinkGoogle);
 
+// eslint-disable-next-line import/no-default-export
 export default router;
