Revert "[CHE 39] Create Registration Page And Routing"

__refactor_tests__/userController.tests.ts → __tests__/userController.tests.ts

@@ -29,9 +29,8 @@ describe("User Controller Tests", () => {
     };
   });
 
-  //TODO This test needs to be refactored to accomodate new controller code
   describe("registerUser function", () => {
-    xit("should handle user registration", async () => {
+    it("should handle user registration", async () => {
       (User.findOne as jest.Mock).mockResolvedValue(null);
       (User.create as jest.Mock).mockResolvedValue({
         _id: "someId",
@@ -67,7 +66,7 @@ describe("User Controller Tests", () => {
   });
 
   describe("authUser function", () => {
-    xit("should handle user authentication", async () => {
+    it("should handle user authentication", async () => {
       (User.findOne as jest.Mock).mockResolvedValue({
         _id: "someId",
         firstName: "John",
@@ -98,7 +97,7 @@ describe("User Controller Tests", () => {
   });
 
   describe("getUserById function", () => {
-    xit("should get a user by ID", async () => {
+    it("should get a user by ID", async () => {
       (User.findOne as jest.Mock).mockResolvedValue({
         _id: "someId",
         firstName: "John",
@@ -126,7 +125,7 @@ describe("User Controller Tests", () => {
   });
 
   describe("deleteUserByEmail function", () => {
-    xit("should delete a user by email", async () => {
+    it("should delete a user by email", async () => {
       (User.findOneAndRemove as jest.Mock).mockResolvedValue({
         _id: "someId",
         firstName: "John",

__refactor_tests__/userRoutes.test.ts → __tests__/userRoutes.test.ts

@@ -22,7 +22,7 @@ afterAll(async () => {
 
 describe("User Routes", () => {
   describe("POST /api/users/register", () => {
-    xit("should register a user", async () => {
+    it("should register a user", async () => {
       const mockNewUserData = {
         firstName: "John",
         lastName: "Doh",
@@ -40,7 +40,7 @@ describe("User Routes", () => {
   });
 
   describe("POST /api/users/login", () => {
-    xit("should login a user", async () => {
+    it("should login a user", async () => {
       const mockUserData = {
         email: "[email protected]",
         password: "testpassword",
@@ -56,7 +56,7 @@ describe("User Routes", () => {
   });
 
   describe("GET /api/users/:id", () => {
-    xit("should get a specific user", async () => {
+    it("should get a specific user", async () => {
       // Create a user first
       const newUser = {
         firstName: "Test",
@@ -82,7 +82,7 @@ describe("User Routes", () => {
   });
 
   describe("DELETE /api/users/:email", () => {
-    xit("should delete a specific user by email", async () => {
+    it("should delete a specific user by email", async () => {
       const email = "[email protected]";
 
       const res = await request(app).delete(`/api/users/${email}`);

client/src/App.tsx

@@ -2,15 +2,13 @@ import React from "react";
 import { BrowserRouter as Router, Route, Routes } from "react-router-dom";
 import LandingPage from "./pages/LandingPage";
 import NotFoundPage from "./pages/NotFoundPage/NotFoundPage";
-import AuthenticatedApp from "./AuthenticatedApp";
-import RegistrationPage from "./pages/RegistrationPage/RegistrationPage";
+import AuthenticatedApp from "./AuthenticatedApp"
 
 const App = (): JSX.Element => {
   return (
     <Router>
       <Routes>
         <Route path="/" element={<LandingPage />} />
-        <Route path="/registration/" element={<RegistrationPage />} />
         <Route path="/app/*" element={<AuthenticatedApp />} />
         <Route path="*" element={<NotFoundPage />} />
       </Routes>

server/controllers/userController.ts

@@ -2,7 +2,6 @@ import User from "../models/userModel";
 import generateToken from "../utils/generateToken";
 import { Request, Response, NextFunction } from "express";
 import { UserType } from "../types/user";
-import GraduateInvitation from "../models/graduateInvitationModel";
 
 // ENDPOINT  POST api/users/register
 // PURPOSE   Register a new user
@@ -13,27 +12,12 @@ const registerUser = async (
   next: NextFunction
 ) => {
   const { firstName, lastName, email, password } = req.body;
-  const { token } = req.query;
 
   try {
     const isValidEmail = email.match(/[\w\d\.]+@[a-z]+\.[\w]+$/gim);
     if (!isValidEmail) {
       return res.status(400).json("Invalid Email");
     }
-
-    const invitation = await GraduateInvitation.findOne({
-      email,
-      token,
-      tokenExpiry: { $gt: new Date() },
-      isRegistered: false,
-    });
-
-    //TODO Needs better error handling - this can trigger with situaions other than bad or missing token
-    if (!invitation) {
-      return res
-        .status(400)
-        .json({ message: "Invalid or expired registration token" });
-    }
     const userExists: UserType | null = await User.findOne({ email });
     if (userExists) {
       return res.status(400).json({ message: "User already exists!" });
@@ -46,8 +30,6 @@ const registerUser = async (
     });
 
     if (user) {
-      invitation.isRegistered = true;
-      await invitation?.save();
       res.locals.user = {
         _id: user._id,
         firstName: user.firstName,

server/index.ts

@@ -2,7 +2,6 @@ import path from "path";
 import express, { Request, Response, Application, NextFunction } from "express";
 import userRoutes from "./routes/userRoutes";
 import profileRoutes from "./routes/profileRoutes";
-import devRoutes from "./routes/devRoutes";
 import connectDB from "./config/db";
 import dotenv from "dotenv";
 import { notFound, errorHandler } from "./controllers/errorControllers";
@@ -17,7 +16,6 @@ connectDB();
 
 app.use("/api/users", userRoutes);
 app.use("/api/profiles", profileRoutes);
-app.use("/api/devRoutes", devRoutes);
 
 console.log(`ENV BEFORE CHECK: ${process.env.NODE_ENV}`);