From ec174fb1128bc3b21503b74e33d30f75163832a3 Mon Sep 17 00:00:00 2001
From: Kyle Slugg <kyle.slugg@gmail.com>
Date: Thu, 18 May 2023 10:37:20 -0400
Subject: [PATCH 1/3] a

---
 .../MainContainer/MainContainer.jsx           |  2 +-
 server/routes/authenticationRouter.js         | 23 +++++++++++++------
 server/routes/snippetsRouter.js               |  7 +++---
 webpack.config.js                             | 22 ++++++++----------
 4 files changed, 31 insertions(+), 23 deletions(-)

diff --git a/client/src/containers/MainContainer/MainContainer.jsx b/client/src/containers/MainContainer/MainContainer.jsx
index 1dfa4e2..e0e5465 100644
--- a/client/src/containers/MainContainer/MainContainer.jsx
+++ b/client/src/containers/MainContainer/MainContainer.jsx
@@ -35,7 +35,7 @@ const MainContainer = () => {
       });
 
     //Bypass login requirement:
-    setLogin(true);
+    //setLogin(true);
   };
   //functino to handle showing the signup page
   const handleHaveAccount = () => setHaveAccount(false);
diff --git a/server/routes/authenticationRouter.js b/server/routes/authenticationRouter.js
index da22d68..345e6b9 100644
--- a/server/routes/authenticationRouter.js
+++ b/server/routes/authenticationRouter.js
@@ -16,25 +16,34 @@ router.post(
   '/login',
   passport.authenticate('local', { session: false }),
   (req, res) => {
+    console.log(req.user);
     const token = jwt.sign({ userId: req.user.id }, secret, {
-      expiresIn: '1d',
+      expiresIn: '1d'
     });
     res.cookie('token', token, {
-      expires: new Date(Date.now() + 30 * 24 * 60 * 60 * 1000),// Expires in 30 days
-      httpOnly: true 
+      expires: new Date(Date.now() + 30 * 24 * 60 * 60 * 1000), // Expires in 30 days
+      httpOnly: true
     });
     res.cookie('test', 'test', {
       domain: 'localhost',
       path: '/'
     });
+    res.cookie('userID', req.user.id, {
+      expires: new Date(Date.now() + 30 * 24 * 60 * 60 * 1000), // Expires in 30 days
+      httpOnly: true
+    });
     return res.status(202).json({ token });
   }
 );
 
-router.get('/protected', passport.authenticate('jwt', {session: false }), (req, res) => {
-  console.log('at protected router, SUCCESS!');
-  res.send('Protected route accessed!');
-});
+router.get(
+  '/protected',
+  passport.authenticate('jwt', { session: false }),
+  (req, res) => {
+    console.log('at protected router, SUCCESS!');
+    res.send('Protected route accessed!');
+  }
+);
 
 router.get('/', authenticationController.getUserData, (req, res) => {
   res.status(200).json(res.locals.userData);
diff --git a/server/routes/snippetsRouter.js b/server/routes/snippetsRouter.js
index c6428f5..5cea86f 100644
--- a/server/routes/snippetsRouter.js
+++ b/server/routes/snippetsRouter.js
@@ -8,12 +8,13 @@ const router = express.Router();
 //In the future, this should be refactored as a route to explicitly load all user data
 //in the context of a separate user route and user controller
 
-router.get('/', snippetsController.getSnippetsByUser, (req, res) =>
+router.get('/', snippetsController.getSnippetsByUser, (req, res) => {
+  console.log(req.cookies);
   res.status(200).json({
     snippets: res.locals.allSnippets,
     tagsLangs: res.locals.userTagsLangs
-  })
-);
+  });
+});
 
 router.post(
   '/',
diff --git a/webpack.config.js b/webpack.config.js
index 57743ec..07cb8ec 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -14,7 +14,7 @@ module.exports = {
     rules: [
       {
         test: /\.(png|jp(e*)g|svg|gif)$/,
-        type: 'asset/resource',
+        type: 'asset/resource'
       },
       {
         test: /\.jsx?/,
@@ -24,27 +24,25 @@ module.exports = {
           options: {
             presets: [
               '@babel/preset-env',
-              ['@babel/preset-react', { runtime: 'automatic' }],
-            ],
-          },
-        },
+              ['@babel/preset-react', { runtime: 'automatic' }]
+            ]
+          }
+        }
       },
       {
         test: /\.s?css/,
-        use: [
-          'style-loader', 'css-loader', 'sass-loader'
-        ]
+        use: ['style-loader', 'css-loader', 'sass-loader']
       }
     ]
   },
   plugins: [
     new HtmlWebpackPlugin({
       title: 'Development',
-      template:'./public/index.html'
+      template: './public/index.html'
     })
   ],
   resolve: {
-    extensions: ['.js', '.jsx', '.scss'],
+    extensions: ['.js', '.jsx', '.scss']
   },
   devServer: {
     static: {
@@ -52,8 +50,8 @@ module.exports = {
       directory: path.resolve(__dirname, 'dist')
     },
     proxy: {
-      '/snippets': 'http://localhost:3000'
+      '/*': 'http://localhost:3000'
     }
   },
   devtool: 'eval-source-map'
-};
\ No newline at end of file
+};

From 5453e7e85d749c68f649187c3ae1c87414e95dec Mon Sep 17 00:00:00 2001
From: Kyle Slugg <kyle.slugg@gmail.com>
Date: Thu, 18 May 2023 11:06:29 -0400
Subject: [PATCH 2/3] Removed hardcoded user ID; now working with ID cookie

---
 client/src/components/AddSnippet/AddSnippet.jsx     |  6 +-----
 .../components/SnippetDisplay/SnippetDisplay.jsx    | 13 ++++---------
 client/src/containers/Sidebar/Sidebar.jsx           |  5 +----
 server/controllers/snippetsController.js            | 12 ++++++------
 server/routes/authenticationRouter.js               |  2 +-
 server/routes/snippetsRouter.js                     |  1 -
 webpack.config.js                                   |  2 +-
 7 files changed, 14 insertions(+), 27 deletions(-)

diff --git a/client/src/components/AddSnippet/AddSnippet.jsx b/client/src/components/AddSnippet/AddSnippet.jsx
index c92bfa8..c1aa27b 100644
--- a/client/src/components/AddSnippet/AddSnippet.jsx
+++ b/client/src/components/AddSnippet/AddSnippet.jsx
@@ -28,10 +28,6 @@ const AddSnippet = ({ closeModal, getUserData }) => {
   const [error, setError] = useState(false);
   const [openModal, setOpenModal] = useState(false);
 
-  //TODO: Pull user info from global state
-  //FIXME: HARCODING USER INFO FOR NOW
-  const userId = '6463eb52ab99bf89a84a3ebd';
-
   function handleSubmit(e) {
     e.preventDefault();
     if (title === '') {
@@ -42,7 +38,7 @@ const AddSnippet = ({ closeModal, getUserData }) => {
       setError(false);
     }
 
-    fetch('/snippets?' + new URLSearchParams({ userId }), {
+    fetch('/snippets', {
       method: 'POST',
       headers: {
         'Content-Type': 'application/json'
diff --git a/client/src/components/SnippetDisplay/SnippetDisplay.jsx b/client/src/components/SnippetDisplay/SnippetDisplay.jsx
index be5818a..85d5f40 100644
--- a/client/src/components/SnippetDisplay/SnippetDisplay.jsx
+++ b/client/src/components/SnippetDisplay/SnippetDisplay.jsx
@@ -25,18 +25,13 @@ const SnippetDisplay = ({ selectedSnippet, getSnippet }) => {
   const [copied, setCopied] = useState(false);
   const [editButtonState, setEditButtonState] = useState(false);
   const [currentDisplay, setCurrentDisplay] = useState(defaultDisplayValues);
-  //TODO: Pull userId from global state
-  //FIXME: HARDCODING USER ID FOR NOW
-  const userId = '6463eb52ab99bf89a84a3ebd';
-  // indSnippet = this.props
-  // create delete method using fetch request
 
   useEffect(() => {
     setCurrentDisplay(selectedSnippet);
   }, [selectedSnippet, getSnippet]);
 
-  const deleteSnippet = (snippetId, userId) => {
-    fetch('/snippets?' + new URLSearchParams({ snippetId, userId }), {
+  const deleteSnippet = (snippetId) => {
+    fetch('/snippets?' + new URLSearchParams({ snippetId }), {
       method: 'DELETE'
     })
       .then((response) => {
@@ -55,7 +50,7 @@ const SnippetDisplay = ({ selectedSnippet, getSnippet }) => {
   };
 
   const editSnippet = (snippetId) => {
-    fetch(`/snippets?${new URLSearchParams({ snippetId, userId })}`, {
+    fetch(`/snippets?${new URLSearchParams({ snippetId })}`, {
       method: 'PUT',
       headers: { 'Content-type': 'application/json' },
       body: JSON.stringify(currentDisplay)
@@ -174,7 +169,7 @@ const SnippetDisplay = ({ selectedSnippet, getSnippet }) => {
           <Button
             className="deleteButton"
             onClick={() => {
-              deleteSnippet(selectedSnippet._id, userId);
+              deleteSnippet(selectedSnippet._id);
             }}
           >
             Delete Snippet
diff --git a/client/src/containers/Sidebar/Sidebar.jsx b/client/src/containers/Sidebar/Sidebar.jsx
index 8abb0ee..979cab1 100644
--- a/client/src/containers/Sidebar/Sidebar.jsx
+++ b/client/src/containers/Sidebar/Sidebar.jsx
@@ -34,13 +34,10 @@ const Sidebar = ({ handleLogin }) => {
     getUserData();
   }, []);
   //Get all snippets stored under user's account
-  //TODO: Get user ID from global state to include in request
-  //FIXME: HARD CODING ID FOR NOW
-  const userId = '6463eb52ab99bf89a84a3ebd';
 
   const getUserData = () => {
     setLoading(true);
-    fetch('/snippets?' + new URLSearchParams({ userId: userId }))
+    fetch('/snippets')
       .then((res) => res.json())
       .then((data) => {
         //As structured in snippets route, should receive an array of snippet objects
diff --git a/server/controllers/snippetsController.js b/server/controllers/snippetsController.js
index 8295cc4..2549829 100644
--- a/server/controllers/snippetsController.js
+++ b/server/controllers/snippetsController.js
@@ -14,7 +14,8 @@ const createError = (method, log, status, message = log) => {
 //Retrieves all snippets associated with a user by looking up user (by ID) and referencing all snippets in the associated list
 //NOTE: WE SHOULD REALLY SEPARATE OUT STUFF LIKE THIS INTO A SEPARATE USER ROUTE AND USER CONTROLLER
 snippetsController.getSnippetsByUser = (req, res, next) => {
-  const { userId } = req.query;
+  const { userId } = req.cookies;
+  console.log(userId);
   //const userId = '645fee9104d1f0acef95a002';
 
   User.findById(userId)
@@ -49,7 +50,7 @@ snippetsController.createSnippet = (req, res, next) => {
 
 //Associates snippet with a particular user
 snippetsController.saveSnippetToUser = (req, res, next) => {
-  const { userId } = req.query;
+  const { userId } = req.cookies;
   User.findById(userId)
     .then((user) => {
       user.snippets.push(res.locals.newSnippet._id);
@@ -83,8 +84,6 @@ snippetsController.saveSnippetToUser = (req, res, next) => {
 
 //Updates snippet with provided properties
 snippetsController.updateSnippet = (req, res, next) => {
-  console.log(req.query);
-  console.log(req.body);
   const { snippetId } = req.query;
   const { title, comments, storedCode, tags, language } = req.body;
   const updatedSnippet = { title, comments, storedCode, tags, language };
@@ -127,7 +126,8 @@ snippetsController.updateSnippet = (req, res, next) => {
 
 //Deletes snippet with provided ID and removes from users with associated ID
 snippetsController.deleteSnippet = (req, res, next) => {
-  const { userId, snippetId } = req.query;
+  const { userId } = req.cookies;
+  const { snippetId } = req.query;
   Snippet.findByIdAndDelete(snippetId)
     .exec()
     .then((result) => {
@@ -181,7 +181,7 @@ snippetsController.recalcTagsAndLang = (req, res, next) => {
     return next();
   }
 
-  const { userId } = req.query;
+  const { userId } = req.cookies;
   const tagList = new Set();
   const languageList = new Set();
   console.log(userId);
diff --git a/server/routes/authenticationRouter.js b/server/routes/authenticationRouter.js
index 57b5205..be5249b 100644
--- a/server/routes/authenticationRouter.js
+++ b/server/routes/authenticationRouter.js
@@ -24,7 +24,7 @@ router.post(
       expires: new Date(Date.now() + 30 * 24 * 60 * 60 * 1000), // Expires in 30 days
       httpOnly: true
     });
-    res.cookie('userID', req.user.id, {
+    res.cookie('userId', req.user.id, {
       expires: new Date(Date.now() + 30 * 24 * 60 * 60 * 1000), // Expires in 30 days
       httpOnly: true
     });
diff --git a/server/routes/snippetsRouter.js b/server/routes/snippetsRouter.js
index 5cea86f..52b3d70 100644
--- a/server/routes/snippetsRouter.js
+++ b/server/routes/snippetsRouter.js
@@ -9,7 +9,6 @@ const router = express.Router();
 //in the context of a separate user route and user controller
 
 router.get('/', snippetsController.getSnippetsByUser, (req, res) => {
-  console.log(req.cookies);
   res.status(200).json({
     snippets: res.locals.allSnippets,
     tagsLangs: res.locals.userTagsLangs
diff --git a/webpack.config.js b/webpack.config.js
index 07cb8ec..aa87539 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -50,7 +50,7 @@ module.exports = {
       directory: path.resolve(__dirname, 'dist')
     },
     proxy: {
-      '/*': 'http://localhost:3000'
+      '/': 'http://localhost:3000'
     }
   },
   devtool: 'eval-source-map'

From a7e2b901e2fd32f1634c1fbf8b70a66136c224e0 Mon Sep 17 00:00:00 2001
From: Kyle Slugg <kyle.slugg@gmail.com>
Date: Thu, 18 May 2023 11:52:59 -0400
Subject: [PATCH 3/3] Removed hard-coded userId; fetching user info from
 Passport middleware

---
 server/controllers/snippetsController.js | 11 +++++++----
 server/routes/snippetsRouter.js          |  7 ++++++-
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/server/controllers/snippetsController.js b/server/controllers/snippetsController.js
index cc93cf0..5d6ff8b 100644
--- a/server/controllers/snippetsController.js
+++ b/server/controllers/snippetsController.js
@@ -14,7 +14,10 @@ const createError = (method, log, status, message = log) => {
 //Retrieves all snippets associated with a user by looking up user (by ID) and referencing all snippets in the associated list
 //NOTE: WE SHOULD REALLY SEPARATE OUT STUFF LIKE THIS INTO A SEPARATE USER ROUTE AND USER CONTROLLER
 snippetsController.getSnippetsByUser = (req, res, next) => {
-  const { userId } = req.user._id;
+  console.log('In get snippets...');
+  const userId = req.user._id.toString();
+  console.log('Logging ID...');
+  console.log(userId);
 
   User.findById(userId)
     .populate('snippets')
@@ -48,7 +51,7 @@ snippetsController.createSnippet = (req, res, next) => {
 
 //Associates snippet with a particular user
 snippetsController.saveSnippetToUser = (req, res, next) => {
-  const { userId } = req.user._id;
+  const userId = req.user._id.toString();
   User.findById(userId)
     .then((user) => {
       user.snippets.push(res.locals.newSnippet._id);
@@ -124,7 +127,7 @@ snippetsController.updateSnippet = (req, res, next) => {
 
 //Deletes snippet with provided ID and removes from users with associated ID
 snippetsController.deleteSnippet = (req, res, next) => {
-  const { userId } = req.user._id;
+  const userId = req.user._id.toString();
   const { snippetId } = req.query;
   Snippet.findByIdAndDelete(snippetId)
     .exec()
@@ -179,7 +182,7 @@ snippetsController.recalcTagsAndLang = (req, res, next) => {
     return next();
   }
 
-  const { userId } = req.user._id;
+  const userId = req.user._id.toString();
   const tagList = new Set();
   const languageList = new Set();
   console.log(userId);
diff --git a/server/routes/snippetsRouter.js b/server/routes/snippetsRouter.js
index e50e782..c23a306 100644
--- a/server/routes/snippetsRouter.js
+++ b/server/routes/snippetsRouter.js
@@ -10,7 +10,12 @@ router.get(
   passport.authenticate('jwt', { session: false }),
   snippetsController.getSnippetsByUser,
   (req, res) => {
-    return res.status(200).json(res.locals.allSnippets);
+    return res
+      .status(200)
+      .json({
+        snippets: res.locals.allSnippets,
+        tagsLangs: res.locals.userTagsLangs
+      });
   }
 );