Merge branch 'main' into nephelite-patch-3

Author: Nephelite

.env.example

@@ -16,6 +16,3 @@ PEERPREP_QUESTION_INITDB_NAME=peerprepQuestionServiceDB # must match question se
 PEERPREP_USER_INITDB_NAME=peerprepUserServiceDB # must match user service .env file and init-mongo.js
 PEERPREP_MATCHING_INITDB_NAME=peerprepMatchingServiceDB # must match user service .env file and init-mongo.js
 PEERPREP_COLLABORATION_INITDB_NAME=peerprepCollaborationServiceDB # must match collab service .env file and init-mongo.js
-
-REACT_APP_LOCAL_API_URL=http://localhost #http://52.221.131.145 for production
-REACT_APP_SOCKET_URL=http://localhost:3003 #http://52.221.131.145:3003 for production

backend/user-service/.env.example

@@ -13,6 +13,7 @@ ENV=production
 # Secrets for creating JWT signatures
 JWT_ACCESS_TOKEN_SECRET=<your-jwt-access-token-secret>
 JWT_REFRESH_TOKEN_SECRET=<your-jwt-refresh-token-secret>
+JWT_RESET_TOKEN_SECRET=<your-jwt-reset-token-secret>
 
 # If using mongoDB containerization, set to true. Else set to false (i.e local testing)
 DB_REQUIRE_AUTH=true

backend/user-service/controller/auth-controller.js

@@ -11,12 +11,12 @@ export async function handleLogin(req, res, next) {
     try {
       const user = await _findUserByEmail(email);
       if (!user) {
-        throw new UnauthorisedError("Wrong email");
+        throw new UnauthorisedError("Wrong email/password");
       }
 
       const match = await bcrypt.compare(password, user.password);
       if (!match) {
-        throw new UnauthorisedError("Wrong password");
+        throw new UnauthorisedError("Wrong email/password");
       }
 
       // Generate access and refresh token

backend/user-service/index.js

@@ -105,9 +105,5 @@ app.use((req, res, next) => {
 
 app.use(errorHandler);
 
-app.listen(port, async () => {
-  console.log(`Server is running at http://localhost:${port}`);
-});
-
 export default app;
 export { port };

docker-compose.yml

@@ -125,8 +125,6 @@ services:
             - CHOKIDAR_USEPOLLING=true
             - WATCHPACK_POLLING=true
             - WDS_SOCKET_PORT=0
-            - REACT_APP_LOCAL_API_URL=${REACT_APP_LOCAL_API_URL}
-            - REACT_APP_SOCKET_URL=${REACT_APP_SOCKET_URL}
 
     # Nginx API Gateway
     nginx:

frontend/.env.example

@@ -1,5 +1,6 @@
 REACT_APP_LOCAL_API_URL=http://localhost
 REACT_APP_SOCKET_URL=http://localhost:3003
+REACT_APP_COLLAB_SOCKET_URL=localhost:3004
 
 # Copy root .env
 # If using mongoDB containerization, set to true. Else set to false (i.e local testing)

frontend/src/data/users/UserImpl.ts

@@ -34,6 +34,17 @@ export class UserImpl implements IUser {
         return this.dataSource.getUser(userId);
     }
 
+    async getAllUsers(): Promise<any> {
+        return this.dataSource.getAllUsers();
+    }
+
+    async deleteUser(userId: string): Promise<any> {
+        return this.dataSource.deleteUser(userId);
+    }
+
+    async updateUserPrivilege(userId: string, isAdmin: boolean): Promise<any> {
+        return this.dataSource.updateUserPrivilege(userId, isAdmin);
+    }
     async forgetPassword(email: string): Promise<any> {
         return this.dataSource.forgetPassword(email);
     }

frontend/src/data/users/UserRemoteDataSource.ts

@@ -51,6 +51,17 @@ export class UserRemoteDataSource extends BaseApi {
         return await this.protectedGet<any>(`/users/${userId}`);
     }
 
+    async getAllUsers() {
+        return await this.protectedGet<any>("/users/");
+    }
+
+    async deleteUser(userId: string) {
+        return await this.protectedDelete<any>(`/users/${userId}`);
+    }
+
+    async updateUserPrivilege(userId: string, isAdmin: boolean) {
+        return await this.protectedPatch(`/users/${userId}/privilege`, { isAdmin });
+    }
     async forgetPassword(email: string) {
         return await this.post<any>("/users/forgetPassword", { email });
     }

frontend/src/data/users/mockUser.ts

@@ -2,7 +2,7 @@ import AuthClientStore from "data/auth/AuthClientStore";
 import { User } from "domain/entities/User";
 import { IUserRegisterInput, IUserLoginInput, IUserUpdateInput } from "domain/users/IUser";
 
-const users: User[] = [
+let users: User[] = [
     {
         _id: "1",
         username: "SampleUserName",
@@ -156,6 +156,31 @@ export class MockUser {
         });
     }
 
+    async getAllUsers(): Promise<any> {
+        return new Promise((resolve, reject) => ({ message: "Fetched all users", data: resolve(users) }));
+    }
+
+    async deleteUser(userId: string): Promise<any> {
+        return new Promise((resolve, reject) => {
+            users = users.filter((user) => user._id !== userId);
+        });
+    }
+
+    async updateUserPrivilege(userId: string, isAdmin: boolean): Promise<any> {
+        return new Promise((resolve, reject) => {
+            try {
+                const foundUser = this.users.find((u) => u._id === userId);
+                if (!foundUser) {
+                    resolve({ message: "User not found" });
+                } else {
+                    foundUser.isAdmin = isAdmin;
+                    resolve({ message: "User privileges updated", data: foundUser });
+                }
+            } catch (error) {
+                reject(error);
+            }
+        });
+    }
     async forgetPassword(email: string): Promise<any> {}
 
     async resetPassword(password: string, token: string): Promise<any> {}

frontend/src/domain/context/AuthContext.tsx

@@ -11,7 +11,8 @@ interface AuthContextType {
     login: (email: string, password: string) => Promise<void>;
     logout: () => Promise<void>;
     register: (email: string, password: string, username: string) => Promise<void>;
-    updateUser: (userUpdateInput: IUserUpdateInput) => Promise<void>;
+    updateUser: (userId: string, userUpdateInput: IUserUpdateInput) => Promise<User>;
+    deactivateUser: (userId: string) => Promise<void>;
 }
 
 const AuthContext = createContext<AuthContextType | undefined>(undefined);
@@ -70,11 +71,19 @@ export const AuthProvider = ({ children }: { children: ReactNode }) => {
         handleSuccessfulAuth(accessToken, user);
     };
 
-    const updateUser = async (userUpdateInput: IUserUpdateInput) => {
-        if (user) {
-            const updatedUser = await userUseCases.updateUser(user?._id, userUpdateInput);
+    const updateUser = async (userId: string, userUpdateInput: IUserUpdateInput) => {
+        const updatedUser = await userUseCases.updateUser(userId, userUpdateInput);
+        if (userId === user?._id) {
             setUser(updatedUser);
         }
+        return updatedUser;
+    };
+
+    const deactivateUser = async (userId: string) => {
+        await userUseCases.deleteUser(userId);
+        if (userId === user?._id) {
+            logout();
+        }
     };
 
     const handleSuccessfulAuth = (accessToken: string, user: User) => {
@@ -87,7 +96,9 @@ export const AuthProvider = ({ children }: { children: ReactNode }) => {
     const isUserAdmin = true;
 
     return (
-        <AuthContext.Provider value={{ user, isLoggedIn, isUserAdmin, login, logout, register, updateUser }}>
+        <AuthContext.Provider
+            value={{ user, isLoggedIn, isUserAdmin, login, logout, register, updateUser, deactivateUser }}
+        >
             {children}
         </AuthContext.Provider>
     );