Merge pull request #101 from CS3219-AY2324S1/clean-up-docker-files

Clean up docker files

Author: szelongq

ApiGatewayService/Dockerfile

@@ -17,4 +17,4 @@ COPY . .
 EXPOSE 3001
 
 # Define the command to start your API gateway
-CMD [ "npm", "run", "dev"]
+CMD [ "npm", "run", "dev" ]

ApiGatewayService/src/index.ts

@@ -1,39 +1,33 @@
 import express from "express";
 import httpProxy from "http-proxy";
 import cors from "cors";
-// import http from 'http';
-// import { Server } from 'socket.io';
 
 const app = express();
 const proxy = httpProxy.createProxyServer();
 app.use(cors());
 
-// // Create an HTTP server and attach Socket.IO to it
-// const server = http.createServer(app);
-// const io = new Server(server, {
-//     cors: {
-//       origin: '*',
-//     },
-//     path: 'ws'
-//   });
-
 // Define routes for each backend service for local development
+// app.use('/questionservice', (req, res) => {
+//     proxy.web(req, res, { target: 'http://localhost:3002' });
+// });
+// app.use('/authservice', (req, res) => {
+//     proxy.web(req, res, { target: 'http://localhost:3003' });
+// });
+// app.use('/userservice', (req, res) => {
+//     proxy.web(req, res, { target: 'http://localhost:3004' });
+// });
+
+// Define routes for each backend service for production/docker containers
 app.use("/questionservice", (req, res) => {
   proxy.web(req, res, { target: "http://question-service:3002" });
 });
-
 app.use("/authservice", (req, res) => {
   proxy.web(req, res, { target: "http://auth-service:3003" });
 });
-
 app.use("/userservice", (req, res) => {
   proxy.web(req, res, { target: "http://user-service:3004" });
 });
 
-app.use("/matchingservice", (req, res) => {
-  proxy.web(req, res, { target: "http://matching-service:3005" });
-});
-
 // Start the server
 app.listen(3001, () => {
   console.log("API Gateway listening on port 3001");

ChatService/Dockerfile

@@ -13,8 +13,8 @@ RUN npm install
 # Bundle your app source code into the container
 COPY . .
 
-# Expose the port on which your Auth service will run
+# Expose the port on which your Chat service will run
 EXPOSE 3007
 
-# Define the command to start your Auth service
+# Define the command to start your Chat service
 CMD [ "npm", "run", "dev"]

CollabService/Dockerfile

@@ -1,5 +1,6 @@
 # Use an official Node.js runtime as a parent image
 FROM node:14
+
 # Set the working directory in the container
 WORKDIR /usr/src/collab-service
 
@@ -12,8 +13,8 @@ RUN npm install
 # Bundle your app source code into the container
 COPY . .
 
-# Expose the port on which your Auth service will run
+# Expose the port on which your Collab service will run
 EXPOSE 3006
 
-# Define the command to start your Auth service
+# Define the command to start your Collab service
 CMD [ "npm", "run", "dev"]

MatchingService/Dockerfile

@@ -13,8 +13,8 @@ RUN npm install
 # Bundle your app source code into the container
 COPY . .
 
-# Expose the port on which your Auth service will run
+# Expose the port on which your Matching service will run
 EXPOSE 3005
 
-# Define the command to start your Auth service
+# Define the command to start your Matching service
 CMD [ "npm", "run", "dev"]

QuestionService/Dockerfile

@@ -13,8 +13,8 @@ RUN npm install
 # Bundle your app source code into the container
 COPY . .
 
-# Expose the port on which your Auth service will run
+# Expose the port on which your Question service will run
 # EXPOSE 3002
 
-# Define the command to start your Auth service
+# Define the command to start your Question service
 CMD [ "npm", "run", "dev"]

QuestionService/javascript/question/question.controller.js

@@ -15,8 +15,20 @@ const firestore_1 = require("firebase/firestore");
 function handleGetQuestions(req, res) {
     return __awaiter(this, void 0, void 0, function* () {
         try {
-            //   console.log(req.query.email);
-            //   const { email } = req.query;
+            console.log("getting questions");
+            const { token } = req.query;
+            if (!token) {
+                res.status(500).send("unauthorized access");
+            }
+            if (typeof token === "string") {
+                const response = yield (0, question_service_1.isValidToken)(token);
+                if (!response) {
+                    res.status(500).send("unauthorized access");
+                }
+            }
+            else {
+                res.status(500).send("invalid params");
+            }
             const query = yield (0, firestore_1.getDocs)((0, firestore_1.collection)(question_service_1.db, "questions"));
             const result = yield Promise.all(query.docs.map((d) => __awaiter(this, void 0, void 0, function* () {
                 const q = d.data();

QuestionService/javascript/question/question.service.js

@@ -9,7 +9,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.addQuestion = exports.updateQuestion = exports.deleteQuestion = exports.db = void 0;
+exports.isValidToken = exports.addQuestion = exports.updateQuestion = exports.deleteQuestion = exports.db = void 0;
 const app_1 = require("firebase/app");
 const firestore_1 = require("firebase/firestore");
 const firebase_config_1 = require("../firebase/firebase.config");
@@ -61,3 +61,24 @@ function addQuestion(question) {
     });
 }
 exports.addQuestion = addQuestion;
+function isValidToken(token) {
+    return __awaiter(this, void 0, void 0, function* () {
+        try {
+            const q = (0, firestore_1.query)((0, firestore_1.collection)(exports.db, "users"));
+            const querySnapshot = yield (0, firestore_1.getDocs)(q);
+            const tokens = new Set();
+            querySnapshot.forEach((doc) => {
+                const user = doc.data();
+                tokens.add(user.token);
+            });
+            if (tokens.has(token)) {
+                return Promise.resolve(true);
+            }
+            return Promise.resolve(false);
+        }
+        catch (error) {
+            return Promise.reject(error);
+        }
+    });
+}
+exports.isValidToken = isValidToken;

QuestionService/src/question/question.controller.ts

@@ -29,15 +29,18 @@ export async function handleGetQuestions(req: Request, res: Response) {
     console.log("getting questions");
     const { token } = req.query;
     if (!token) {
-      res.status(500).send("unauthorized access");
+      console.log("unauthorized access");
+      return res.status(401).send("unauthorized access");
     }
     if (typeof token === "string") {
       const response = await isValidToken(token);
       if (!response) {
-        res.status(500).send("unauthorized access");
+        console.log("unauthorized access");
+        return res.status(401).send("unauthorized access");
       }
     } else {
-      res.status(500).send("invalid params");
+      console.log("invalid params");
+      return res.status(500).send("invalid params");
     }
     const query = await getDocs(collection(db, "questions"));
     const result = await Promise.all(
@@ -59,13 +62,15 @@ export async function handleGetQuestions(req: Request, res: Response) {
     );
 
     if (result.length > 0) {
-      res.status(200).send(result);
+      console.log("questions retrieved");
+      return res.status(200).send(result);
     } else {
-      res.status(500).send("no questions");
+      console.log("no questions");
+      return res.status(500).send("no questions");
     }
   } catch (error) {
     console.error(error);
-    res.status(500).send(error);
+    return res.status(500).send(error);
   }
 }
 

README.md

@@ -0,0 +1,30 @@
+# Assignment 4
+Requirements:
+- Docker
+
+Steps:
+1. Open up your Terminal or command line
+2. Navigate to the project's base directory, where the docker-compose.yml is
+3. Run `docker-compose up --build`
+4. Wait for the containers to finish building and run
+5. Open up your Docker dashboard, the new images and containers should be visible:
+   1. frontend
+   2. api-gateway
+   3. question-service
+   4. user-service
+   5. auth-service
+6. Open your browser and go to the address `http://localhost:3000/`
+7. Login into the website using our admin account
+8. Feel free to test our Questions and User service features. For example:
+   1. Managing Questions
+      1. Click on the 'Manage Questions' button in the NavBar above
+      2. Click on 'Add Question' button
+      3. Type in a dummy question and click 'Submit'
+      4. Go back to the home page to and check that the new question is in the question table
+      5. Check the Terminal/command line/Logs in the question-service container in Docker dashboard to view the message logs
+   2. Managing User Profile
+      1. Click on the top right profile button
+      2. Select 'Profile'
+      3. Click on 'Edit Profile' button
+      4. Change any profile details, then click on 'Save'
+      5. Check the Terminal/command line/Logs in the user-service container in Docker dashboard to view the message logs