Merge pull request #24 from oslabs-beta/denton/fixdev

fixed the dev branch issue of cookie.username

Author: liamroh

app/src/components/marketplace/MarketplaceCard.tsx

@@ -49,7 +49,7 @@ const MarketplaceCard = ({proj} :{proj: Project}) => {
   };
   const handleClone = async () => { // creates a copy of the project 
     const docId = proj._id;
-    const response = await axios.get(`/cloneProject/${docId}`);
+    const response = await axios.get(`/cloneProject/${docId}`, { params: { username: window.localStorage.getItem('username') } });//passing in username as a query param is query params
     const project = response.data.project;
     alert('Project cloned!');
     setAnchorEl(null);

app/src/components/right/LoginButton.tsx

@@ -10,12 +10,8 @@ const { API_BASE_URL, API_BASE_URL2 } = config;
 export default function LoginButton() {
   const state = useSelector((store:RootState) => store.appState);
   const dispatch = useDispatch();
-  // console.log('doc cookie 1', Cookies.get())
   const handleLogout = () => {
-    // console.log('doc cookie 2', Cookies.get('ssid'))
-    // // document.cookie = 'ssid' + '=; Max-Age=0';
-    // console.log('doc cookie 3', Cookies.get())
-
+  
     window.localStorage.clear();
 
     if (state.isLoggedIn) {

server/controllers/cookieController.ts

@@ -12,6 +12,7 @@ const cookieController: CookieController = {
     return next();
   }, 
 
+
 };
 
 export default cookieController;

server/controllers/marketplaceController.ts

@@ -116,7 +116,7 @@ const marketplaceController: MarketplaceController = {
   cloneProject: async (req, res, next) => {
     // pulls cookies from request
     const userId = req.cookies.ssid;
-    const username = req.cookies.username;
+    const username = req.query.username;
     try { // trying to find project, update its userId and username to a new project, then save it
       const originalProject = await Projects.findOne({ _id: req.params.docId }).exec();
       const updatedProject = originalProject.toObject({ minimize: false }); // minimize false makes sure Mongoose / MongoDB does not remove nested properties with values of empty objects {}

server/server.ts

@@ -67,17 +67,19 @@ const passportSetup = require('./routers/passport-setup');
 const session = require('express-session');
 import authRoutes from './routers/auth';
 
-app.use(
-  session({
-    secret: process.env.SESSION_SECRET,
-    resave: false,
-    saveUninitialized: true,
-    cookie: { maxAge: 24 * 60 * 60 * 1000 }
-  })
-);
-
-app.use(passport.initialize());
-app.use(passport.session());
+//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+//I don't believe this portion of the code is being used. It just creates a session cookie, but majority of the controllers right now use mongodb as a sessionController, not passport.
+// app.use(
+//   session({
+//     secret: process.env.SESSION_SECRET,
+//     resave: false,
+//     saveUninitialized: true,
+//     cookie: { maxAge: 24 * 60 * 60 * 1000 }
+//   })
+// );
+// app.use(passport.initialize());
+// app.use(passport.session());
+//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
 // go to other files
 // 8080 only for the container