Scrum 75 darkmode

backend/.env.me

@@ -0,0 +1,6 @@
+#/!!!!!!!!!!!!!!!!!!!!.env.me!!!!!!!!!!!!!!!!!!!!!!!/
+#/ credential file. DO NOT commit to source control /
+#/    [how it works](https://dotenv.org/env-me)     /
+#/--------------------------------------------------/
+
+DOTENV_ME="me_2876f4651cca3df3e9bad1256d77c64b7fe75eb300047597538726fbdc0680e8"

backend/.env.vault

@@ -0,0 +1,25 @@
+#/-------------------.env.vault---------------------/
+#/         cloud-agnostic vaulting standard         /
+#/   [how it works](https://dotenv.org/env-vault)   /
+#/--------------------------------------------------/
+
+# development
+DOTENV_VAULT_DEVELOPMENT="CMIx45zMeUvOZgr36iRsrH4Du2UirHqfgfbvaZhn5KB9qr/CxlXwqnbJttXmFNye3XwFcZyoGKG6I6lfjBbzKNlNFGfzCu1jJ+y44iIbZqcZswwyhgYP5BvAir9+a1pTwtmIp2suZ9ofSs9nTwRmTpi4/75bwNG9wBm/5xGY++fJ5qacM+zOEAnvfeb6Wl/b3Adq7sBTjtiXTK4ByMmLFeOwm6nE7InNG665EBmdQE+UVd7GXpxCTsGZrWDxyLfUvbL15iF03vL3GkG2I+C+SkCOuGGkBN8Rv5RnNFXi9yUeG2eNCRYXGTEKyXYEC4LGT8Infq7RRAWvsJxe59aDPHdGyiHHa21EDMi63sEHTSdrXiqq9PwMu0SUg/NNx9xaANBWtvKMLAW0zmclq7lua3ewUHTQQoe8fDlWmviVCfPumG5K+QnwJQP9i8c77kdKZQHhkKG3IfAO06s8cMOFJ+25Md5JbgFXiz05GOdxRW4AFEHATG+yEIfe0rWWaNlGAXr4Ws4em2NOML6ULthGEbaOZt/w6JxNsrQkZYrqFu/LxZdp/+QlcXeYbcT4TVs0lK0B26H4O/Lly3GN3luvnM6/c8IXyhoz0Ytp5zqQISo/RK//JXA+VrM9y6fa536y4nKHboGOMr83NR7wz7WFWBsjuFD66Zob23S0AmRQLXr9/rnZYYRpeMo9yOtluWiVAP6bh91OGziUHHh+03MWOP/rgz7CVT55jDQbAL1wMkJxfZnlx2uu9GQXHo8GNeK/7uN0V693TGU9emu3JDpwszyjwvNd7ujP4VzP6xSn0dHix1Pox7GZlzE6C0Gxzcj/i8VGIg7LBo8vXZGTodRT6eRITrqmvG/bZ5ztlDbAwvv3BG/HFbEZijrlvPTOpFaeZC1SWYnYTPKcrV1O71zBdGP/xXrluCdYKv/GRPGDJnwLVLJ+iESS5xtm9Eh+++7F1BSgdIf0pmFQcUeZiN6lPwq17jTCQ/1d7ENZVyeEmYEDtu5cwm9ktESc1V0vef9nUVwg7XFoz1nLiz8+VWbtG+W+h2h6tuw472oUAXgpYkO1WnfMA4TKDyIgYzaje3R68PGwkiAIWFkubHZU4NqOzvNE2BnF6pLB4aF9hdLnDWze0PCXkGHXuJJrUeJCHpUUgs40w6n7w+uZ+zgfEvwtYuefwD/Nj5SKqmUT0lH9uCNrhhPeM1AAh7uDF3l2+Z6qeibQlNpOfPUCijVEQ1pX1LFaVoZ/TIPn9TTCcIZNSh4h2dtj1wFtEhxMGdQIeMxoIkoHJdXlG1zd3MY1qfyy44bmaYg0esM6c+tiCMB5+rSxJXZwpYXBcCPIeYJKH97CSvg14d0HcDzCa5+TUbuuQ9EJRAhBb4xvFDo8XuYMcTRzL+o1OjnfvydTJZ06dmmgQyOQ5VdXzUS7DmUyYCW7NV4l0Svqs9DUAF2JKKiU4Iz12YJX49IOBvPJ1MIIl4+INFHLiqVgced+0wrY+vVz/nTwJUCsO/9z"
+DOTENV_VAULT_DEVELOPMENT_VERSION=2
+
+# ci
+DOTENV_VAULT_CI="LgVgNuEBUkhGG8ZdRxFBtT7441hP6L8QuODgG+h9DSIbylay"
+DOTENV_VAULT_CI_VERSION=1
+
+# staging
+DOTENV_VAULT_STAGING="nNtpwQWUo3tAcPwZdhHb2kh2HmeOeIprqrawLNhRveIZYiEc"
+DOTENV_VAULT_STAGING_VERSION=1
+
+# production
+DOTENV_VAULT_PRODUCTION="gvtiPWYriQIELI6JOjJcbETIpYToWW9hsPKzzx+ytrfl4dHk"
+DOTENV_VAULT_PRODUCTION_VERSION=1
+
+#/----------------settings/metadata-----------------/
+DOTENV_VAULT="vlt_b7c9def2e36a7ec5674985772e9f60c1ef0b75063e493d0136b80bcc17ed11ca"
+DOTENV_API_URL="https://vault.dotenv.org"
+DOTENV_CLI="npx dotenv-vault@latest"

backend/app.js

@@ -7,6 +7,7 @@ const multer = require('multer');
 require('dotenv').config();
 const { createServer } = require('http');
 const { Server } = require('socket.io');
+const enforce = require('express-sslify');
 
 const app = express();
 const port = process.env.PORT || 5001;
@@ -25,6 +26,7 @@ const io = new Server(server, {
 });
 
 if (process.env.NODE_ENV === 'production') {
+    app.use(enforce.HTTPS({ trustProtoHeader: true }));
     const corsOptions = {
         origin: ['https://www.study-compass.com', 'https://studycompass.com'],
         optionsSuccessStatus: 200 // for legacy browser support
@@ -65,17 +67,32 @@ const classroomChangeRoutes = require('./routes/classroomChangeRoutes.js');
 const ratingRoutes = require('./routes/ratingRoutes.js');
 const searchRoutes = require('./routes/searchRoutes.js');
 const eventRoutes = require('./routes/eventRoutes.js');
+const oieRoutes = require('./routes/oie-routes.js');
+const orgRoutes = require('./routes/orgRoutes.js');
 
 app.use(authRoutes);
 app.use(dataRoutes);
 app.use(friendRoutes);
 app.use(userRoutes);
-app.use(analyticsRoutes);app.use(eventRoutes);
+app.use(analyticsRoutes);
+app.use(eventRoutes);
 
 app.use(classroomChangeRoutes);
 app.use(ratingRoutes);
 app.use(searchRoutes);
 app.use(eventRoutes);
+app.use(oieRoutes);
+app.use(orgRoutes);
+
+// Serve static files from the React app in production
+if (process.env.NODE_ENV === 'production') {
+    app.use(express.static(path.join(__dirname, '../frontend/build')));
+
+    // The "catchall" handler: for any request that doesn't match one above, send back React's index.html file.
+    app.get('*', (req, res) => {
+        res.sendFile(path.join(__dirname, '../frontend/build/index.html'));
+    });
+}
 
 //deprecated, should lowk invest in this
 // app.get('/update-database', (req, res) => {
@@ -129,15 +146,6 @@ app.post('/upload-image/:classroomName', upload.single('image'), async (req, res
     }
 });
 
-// Serve static files from the React app in production
-if (process.env.NODE_ENV === 'production') {
-    app.use(express.static(path.join(__dirname, '../frontend/build')));
-
-    // The "catchall" handler: for any request that doesn't match one above, send back React's index.html file.
-    app.get('*', (req, res) => {
-        res.sendFile(path.join(__dirname, '../frontend/build/index.html'));
-    });
-}
 
 // Socket.io functionality
 io.on('connection', (socket) => {

backend/middlewares/verifyToken.js

@@ -6,13 +6,30 @@ const verifyToken = (req, res, next) => {
 
     if (token == null) return res.sendStatus(401); // if there's no token
 
-    jwt.verify(token, process.env.JWT_SECRET, (err, user) => {
+    jwt.verify(token, process.env.JWT_SECRET, (err, decodedToken) => {
       if (err) return res.sendStatus(403); // if the token is not valid
-      req.user = user;
+    //   if (decodedToken && decodedToken.exp) {
+    //     const currentTime = Math.floor(Date.now() / 1000); // Current time in seconds
+    //     const timeLeft = decodedToken.exp - currentTime; // Time left in seconds
+    //     const hoursLeft = (timeLeft / 3600).toFixed(2); // Convert to hours and format to 2 decimal places
+
+    //     console.debug(`Token has ${hoursLeft} hours left until expiration.`);
+    //   }
+      req.user = decodedToken;
       next();
     });
 };
 
+function authorizeRoles(...allowedRoles) {
+    return (req, res, next) => {
+        const { roles } = req.user;
+        if (!roles || !allowedRoles.some(role => roles.includes(role))) {
+            return res.status(403).json({ message: 'Forbidden' });
+        }
+        next();
+    };
+}
+
 const verifyTokenOptional = (req, res, next) => {
   const authHeader = req.headers['authorization'];
   const token = authHeader && authHeader.split(' ')[1]; // Bearer TOKEN
@@ -22,13 +39,13 @@ const verifyTokenOptional = (req, res, next) => {
       return next();
   }
 
-  jwt.verify(token, process.env.JWT_SECRET, (err, user) => {
+  jwt.verify(token, process.env.JWT_SECRET, (err, decodedToken) => {
       if (!err) {
-          req.user = user; // Set the user if the token is valid
+          req.user = decodedToken; // Set the user if the token is valid
       }
       // Proceed regardless of token validity
       next();
   });
 };
 
-module.exports = { verifyToken, verifyTokenOptional };
+module.exports = { verifyToken, verifyTokenOptional, authorizeRoles };

backend/migrations/version1.10.py

@@ -0,0 +1,31 @@
+from pymongo.mongo_client import MongoClient
+from pymongo.server_api import ServerApi
+import os
+from dotenv import load_dotenv
+
+from helpers.datamigration import addNewField, updateVersion
+
+
+# ============================== starter code ==========================================
+
+VERSION = 1.10 # set version here
+
+load_dotenv()
+uri = os.environ.get('MONGO_URL_LOCAL')
+database = input("Indicate which database you would like to update (d for development or p for production): ").strip()
+if(database == "d"):
+    pass
+elif (database == "p"):
+    sure = input("WARNING: This will effect a production database, type 'studycompass' to proceed: ").strip()
+    if(sure.lower() == 'studycompass'):
+        uri = os.environ.get('MONGO_URL')
+    else:
+        exit(1)
+else: 
+    print(f"Improper usage: invalid input {database}")
+
+# =====================================================================================
+
+addNewField(uri, "users", {"roles" : ["user"]})
+
+updateVersion(uri, VERSION)

backend/migrations/version1.12.py

@@ -0,0 +1,31 @@
+from pymongo.mongo_client import MongoClient
+from pymongo.server_api import ServerApi
+import os
+from dotenv import load_dotenv
+
+from helpers.datamigration import addNewField, updateVersion
+
+
+# ============================== starter code ==========================================
+
+VERSION = 1.10 # set version here
+
+load_dotenv()
+uri = os.environ.get('MONGO_URL_LOCAL')
+database = input("Indicate which database you would like to update (d for development or p for production): ").strip()
+if(database == "d"):
+    pass
+elif (database == "p"):
+    sure = input("WARNING: This will effect a production database, type 'studycompass' to proceed: ").strip()
+    if(sure.lower() == 'studycompass'):
+        uri = os.environ.get('MONGO_URL')
+    else:
+        exit(1)
+else: 
+    print(f"Improper usage: invalid input {database}")
+
+# =====================================================================================
+
+addNewField(uri, "users", {"clubAssociations" : []})
+
+updateVersion(uri, VERSION)

backend/package.json

@@ -9,6 +9,7 @@
     "date-fns": "^4.1.0",
     "dotenv": "^16.3.2",
     "express": "^4.18.2",
+    "express-sslify": "^1.2.0",
     "google-auth-library": "^9.4.2",
     "googleapis": "^131.0.0",
     "jsonwebtoken": "^9.0.2",