fixed search and removed username from cookies

Author: dentonwong

app/src/components/marketplace/Searchbar.tsx

@@ -29,8 +29,12 @@ const SearchBar = ({marketplaceProjects, updateDisplayProjects }):JSX.Element =>
       //a-zA-Z letters (lowercase and uppercase) and underscore symbol
       //All together: match either the start/end of a line/string or any character that is not a letter.
       //Looks for anything that has the searchText in between non-letter characters
+      const patternString2 = '(?:^|.)' + searchText.toLowerCase() + '(?:$|.)';
+      //Only difference is that (?:^|.) (?:$|.) look for anything that matches the string in between any other characters for the username search
+      //test3 and 1test) would both match for string 'test'
+
       const searchResults = marketplaceProjects.reduce((results, curr) => {
-        if(curr.name.match(patternString) || curr.username.match(patternString))
+        if(curr.name.match(patternString) || curr.username.match(patternString2))
           results.push(curr)
         return results;
       }, [])

server/controllers/cookieController.ts

@@ -12,17 +12,6 @@ const cookieController: CookieController = {
     return next();
   }, 
 
-  /**
-   * Stores the current user's username in cookie (for use in cloning projects)
-   */
-  setUserCookie: (req, res, next) => {
-    res.cookie('username', res.locals.username, {
-      httpOnly: true, 
-      sameSite: 'none', 
-      secure: true
-    });
-    return next();
-  }
 };
 
 export default cookieController;

server/controllers/marketplaceController.ts

@@ -1,5 +1,5 @@
 import { MarketplaceController } from '../interfaces';
-import { Projects } from '../models/reactypeModels';
+import { Projects, Users } from '../models/reactypeModels';
 
 // array of objects, objects inside
 type Projects = { project: {} }[];
@@ -109,32 +109,45 @@ const marketplaceController: MarketplaceController = {
    * 
    */
   cloneProject: (req, res, next) => {
-    // pulls cookies from request
-    const userId = req.cookies.ssid;
-    const username = req.cookies.username;
     const { updatedProject } = req.body;
-    updatedProject.userId = userId;
-    updatedProject.username = username;
-    updatedProject.project.forked = true; // updated the forked tag
-    delete updatedProject._id; // removes the old project id from the object
-    updatedProject.createdAt = Date.now();
+ 
+    // pulls cookies from request
+    const currentuserID = req.cookies.ssid
+    //getting the username based on the cookies ssid
+    Users.findOne({ _id: currentuserID }, (err, user) => {
+      if (err) {
+        return next({
+          log: `Error in marketplaceController.cloneProjects findUser: ${err}`,
+          message: {
+            err: 'Error in marketplaceController.cloneProjects findUser, check server logs for details'
+          }
+        });
+      }
+      //adding the current user's username and userID since the project is now cloned
+      updatedProject.username = user.username;
+      updatedProject.userId = currentuserID;
+      updatedProject.project.forked = true; // updated the forked tag
+      delete updatedProject._id; // removes the old project id from the object
+      updatedProject.createdAt = Date.now();
+      updatedProject.published = false;
 
-    Projects.create(
-      // creates a copy of the project to the user's library
-      updatedProject,
-      (err, result) => {
-        if (err) {
-          return next({
-            log: `Error in marketplaceController.cloneProject: ${err}`,
-            message: {
-              err: 'Error in marketplaceController.cloneProject, check server logs for details'
-            }
-          });
+      Projects.create(
+        // creates a copy of the project to the user's library with a new generated _id
+        updatedProject,
+        (err, result) => {
+          if (err) {
+            return next({
+              log: `Error in marketplaceController.cloneProject: ${err}`,
+              message: {
+                err: 'Error in marketplaceController.cloneProject, check server logs for details'
+              }
+            });
+          }
+          res.locals.clonedProject = result;
+          return next();
         }
-        res.locals.clonedProject = result;
-        return next();
-      }
-    );
+      );
+    })
   },
 };
 export default marketplaceController;

server/interfaces.ts

@@ -3,7 +3,6 @@ import { Document, NativeError } from 'mongoose';
 
 export interface CookieController {
   setSSIDCookie: RequestHandler;
-  setUserCookie: RequestHandler;
 }
 
 export interface ProjectController {

server/server.ts

@@ -159,7 +159,6 @@ app.post(
   '/signup',
   userController.createUser,
   cookieController.setSSIDCookie,
-  cookieController.setUserCookie,
   sessionController.startSession,
   (req, res) => res.status(200).json({ sessionId: res.locals.ssid })
 );
@@ -168,7 +167,6 @@ app.post(
   '/login',
   userController.verifyUser,
   cookieController.setSSIDCookie,
-  cookieController.setUserCookie,
   sessionController.startSession,
   (req, res) => res.status(200).json({ sessionId: res.locals.ssid })
 );
@@ -222,6 +220,7 @@ app.get(
 // Clone from marketplace
 app.post(
   '/cloneProject',
+  sessionController.isLoggedIn,
   marketplaceController.cloneProject, 
   (req, res) => res.status(200).json(res.locals.clonedProject)
 );