Merge branch 'master' into 88-allow-master-to-view-normal-users

Author: KJunWei

frontend/workflows/pullrequest.yml renamed to .github/workflows/pullrequest.yml

@@ -19,7 +19,11 @@ jobs:
           node-version: "18" # You can specify the Node.js version you need
 
       - name: Install dependencies
-        run: npm install
+        run: |
+          cd frontend
+          npm install
 
-      - name: Build
-        run: npm run build
+      - name: Build and lint
+        run: |
+          cd frontend
+          npm run build

.gitignore

@@ -1,24 +1,8 @@
 # See https://help.github.com/articles/ignoring-files/ for more about ignoring files.
 
 # dependencies
-/node_modules
-/frontend/node_modules
-/backend/node_modules
-/QuestionService/node_modules
-/QuestionService/javascript
-/AuthService/javascript
-/AuthService/node_modules
-/MatchingService/javascript
-/MatchingService/node_modules
-/UserService/node_modules
-/UserService/javascript
-/ApiGatewayService/javascript
-/ApiGatewayService/node_modules
-/backend/javascript
-/CollabService/javascript
-/CollabService/node_modules
-/ChatService/node_modules
-/ChatService/javascript
+node_modules
+javascript
 /.pnp
 .pnp.js
 
@@ -27,11 +11,8 @@
 /coverage
 
 # production
-/frontend/build
-/backend/build
-/QuestionService/build
-/CollabService/build
-/ChatService/build
+build
+
 # misc
 .DS_Store
 .env

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,82 +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' });
 // });
 
-// app.use('/matchingservice', (req, res) => {
-//     proxy.web(req, res, { target: 'http://localhost:3005' });
-// });
-
-//Define routes for each backend service for production/docker containers
+// Define routes for each backend service for production/docker containers
 app.use("/questionservice", (req, res) => {
-  proxy.web(req, res, { target: "http://localhost:3002" });
-  //http://question-service:3002
-  //http://localhost:3002
+  proxy.web(req, res, { target: "http://question-service:3002" });
 });
-
 app.use("/authservice", (req, res) => {
-  proxy.web(req, res, { target: "http://localhost:3003" });
-  //http://auth-service:3003
-  //http://localhost:3003
+  proxy.web(req, res, { target: "http://auth-service:3003" });
 });
-
 app.use("/userservice", (req, res) => {
-  proxy.web(req, res, { target: "http://localhost:3004" });
-  // http://user-service:3004
-  //http://localhost:3004
-});
-
-app.use("/matchingservice", (req, res) => {
-  proxy.web(req, res, { target: "http://localhost:3005" });
-  //http://matching-service:3005
-  //http://localhost:3005
+  proxy.web(req, res, { target: "http://user-service: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");

AuthService/package-lock.json

@@ -14,7 +14,8 @@
     "dotenv": "^16.3.1",
     "express": "~4.16.1",
     "firebase": "^10.4.0",
-    "http-errors": "~1.6.3"
+    "http-errors": "~1.6.3",
+    "mime": "^1.6.0"
   },
   "devDependencies": {
     "@types/express": "^4.17.18",

AuthService/package.json

@@ -8,8 +8,13 @@ export async function handleSignUp(req: Request, res: Response) {
     const signedUp = await signUp(email, password);
     res.status(200).send(signedUp);
   } catch (error) {
-    console.error(error);
-    res.status(500).send(error);
+    if (error instanceof Error) {
+      console.error(error.message);
+      res.status(500).send(error.message);
+    } else {
+      console.error(error);
+      res.status(500).send(error);
+    }
   }
 }
 
@@ -20,8 +25,13 @@ export async function handleLogin(req: Request, res: Response) {
     const loggedIn = await login(email, password);
     res.status(200).send(loggedIn);
   } catch (error) {
-    console.error(error);
-    res.status(500).send(error);
+    if (error instanceof Error) {
+      console.error(error.message);
+      res.status(500).send(error.message);
+    } else {
+      console.error(error);
+      res.status(500).send(error);
+    }
   }
 }
 

AuthService/src/auth/auth.controller.ts

@@ -12,17 +12,26 @@ import { firebaseConfig } from "../firebase/firebase.config";
 initializeApp(firebaseConfig);
 const auth = getAuth();
 
+interface SignupCredential {
+  user: UserCredential;
+  token: string;
+}
+
 export async function signUp(
   email: string,
   password: string
-): Promise<UserCredential> {
+): Promise<SignupCredential> {
   try {
     const user: UserCredential = await createUserWithEmailAndPassword(
       auth,
       email,
       password
     );
-    return Promise.resolve(user);
+    const token: string = await user.user.getIdToken();
+    return Promise.resolve({
+      user: user,
+      token: token,
+    });
   } catch (error: any) {
     return Promise.reject(error);
   }

AuthService/src/auth/auth.service.ts

@@ -4,35 +4,19 @@ import {
   handleLogin,
   handleLogout,
   handleSignUp,
-  handleDelete
+  handleDelete,
 } from "./auth/auth.controller";
-// import { Socket, Server } from 'socket.io';
-// import { initializeApp } from 'firebase/app';
-// import { getFirestore } from 'firebase/firestore';
-// import { firebaseConfig } from "./firebase/firebase.config";
-// import { Server as ServerHttp } from 'http';
 
 const app = express();
 const port = 3003;
 app.use(cors());
 app.use(express.json());
 
-app.get("/", (req, res) => {
-  res.send("Hello World!");
-});
-
-
 app.post("/signup", handleSignUp);
 app.post("/login", handleLogin);
 app.delete("/logout", handleLogout);
 app.delete("/delete", handleDelete);
 
-
-
-// httpServer.listen(socketPort, () => {
-//   console.log(`socket listening on port ${socketPort}`);
-// });
-
 app.listen(port, () => {
   console.log(`Auth Service listening on port ${port}`);
 });

AuthService/src/index.ts

@@ -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"]