Merge pull request #251 from CS3219-AY2425S1/wheatgrassmc/more-fixes

Wheatgrassmc/more fixes

Author: tingkai-mai

backend/user/controller/user-controller.js

@@ -380,6 +380,47 @@ export async function resetPasswordUsingCode(req, res) {
   }
 }
 
+export async function resetPasswordFromProfile(req, res) {
+  try {
+    const { password } = req.body;
+    const userId = req.params.id;
+    console.log(req.body);
+    if (password) {
+      const user = await _findUserById(userId);
+      if (!user) {
+        console.log("ERROR");
+        return res
+          .status(404)
+          .json({ message: `User not found with user ID ${code}` });
+      }
+
+      const salt = bcrypt.genSaltSync(10);
+      const hashedPassword = bcrypt.hashSync(password, salt);
+
+      const updatedUser = await _updateUserById(
+        user.id,
+        user.username,
+        user.email,
+        hashedPassword,
+        user.bio,
+        user.linkedin,
+        user.github
+      );
+      return res.status(200).json({
+        message: `Reset password for user ${user.username}`,
+        data: formatUserResponse(updatedUser),
+      });
+    } else {
+      return res.status(400).json({ message: "password is missing!" });
+    }
+  } catch (err) {
+    console.error(err);
+    return res
+      .status(500)
+      .json({ message: "Unknown error when resetting password!" });
+  }
+}
+
 export function formatUserResponse(user) {
   return {
     id: user.id,

backend/user/routes/user-routes.js

@@ -12,6 +12,7 @@ import {
   updateUserPrivilege,
   getFileUrl,
   verifyUser,
+  resetPasswordFromProfile,
 } from "../controller/user-controller.js";
 import {
   verifyAccessToken,
@@ -32,6 +33,8 @@ router.patch(
 
 router.get("/verify", verifyUser);
 
+router.post("/:id/reset-password-from-profile", resetPasswordFromProfile);
+
 router.post("/request-password-reset", requestPasswordReset);
 
 router.post("/check-password-reset-code", checkPasswordResetCode);

frontend/src/api/user.tsx

@@ -4,7 +4,7 @@ import { AuthStatus, UploadProfilePictureResponse } from "@/types/user";
 import Cookie from "js-cookie";
 import Swal from "sweetalert2";
 
-const toast = Swal.mixin({
+export const ToastComponent = Swal.mixin({
   toast: true,
   position: "top-end",
   showConfirmButton: false,
@@ -88,7 +88,7 @@ export const verifyToken = async (token: string) => {
 };
 
 export const login = async (email: string, password: string) => {
-  toast.fire({
+  ToastComponent.fire({
     icon: "info",
     title: "Logging in...",
   });
@@ -105,7 +105,7 @@ export const login = async (email: string, password: string) => {
   const data = await response.json();
 
   if (response.status !== 200) {
-    toast.fire({
+    ToastComponent.fire({
       icon: "error",
       title: data.message,
     });
@@ -134,7 +134,7 @@ export const register = async (
   password: string,
   username: string
 ) => {
-  toast.fire({
+  ToastComponent.fire({
     icon: "info",
     title: "Registering...",
   });
@@ -152,7 +152,7 @@ export const register = async (
   const data = await response.json();
 
   if (response.status !== 201) {
-    toast.fire({
+    ToastComponent.fire({
       icon: "error",
       title: data.message,
     });
@@ -175,7 +175,7 @@ export const getUser = async (userId = "") => {
   const data = await response.json();
 
   if (response.status !== 200) {
-    toast.fire({
+    ToastComponent.fire({
       icon: "error",
       title: data.message,
     });
@@ -185,10 +185,38 @@ export const getUser = async (userId = "") => {
   return data;
 };
 
+export const resetPasswordFromProfile = async (newPassword: string) => {
+  const userId = getUserId();
+  const token = getToken();
+  const url = `${NEXT_PUBLIC_IAM_USER_SERVICE}/${userId}/reset-password-from-profile`;
+  const response = await fetch(url, {
+    method: "POST",
+    headers: {
+      "Content-Type": "application/json",
+      Authorization: `Bearer ${token}`,
+    },
+    body: JSON.stringify({ password: newPassword }),
+  });
+
+  const data = await response.json();
+  if (response.status === 400) {
+    ToastComponent.fire({
+      icon: "error",
+      title: data.message,
+    });
+    return false;
+  } else if (response.status === 200) {
+    ToastComponent.fire({
+      icon: "success",
+      title: data.message,
+    });
+    return true;
+  }
+};
+
 export const updateUser = async (userData: {
   username?: string;
   email?: string;
-  password?: string;
   bio?: string;
   linkedin?: string;
   github?: string;
@@ -208,14 +236,14 @@ export const updateUser = async (userData: {
   console.log(data);
 
   if (response.status !== 200) {
-    toast.fire({
+    ToastComponent.fire({
       icon: "error",
       title: data.message,
     });
     return false;
   }
 
-  toast.fire({
+  ToastComponent.fire({
     icon: "success",
     title: "Profile updated successfully",
   });
@@ -241,7 +269,7 @@ export const getFileUrl = async (
   const data: UploadProfilePictureResponse = await res.json();
 
   if (res.status !== 200) {
-    toast.fire({
+    ToastComponent.fire({
       icon: "error",
       title: res.statusText,
     });
@@ -251,7 +279,7 @@ export const getFileUrl = async (
 };
 
 export const requestPasswordReset = async (email: string) => {
-  toast.fire({
+  ToastComponent.fire({
     icon: "info",
     title: "Requesting password reset...",
   });
@@ -269,14 +297,14 @@ export const requestPasswordReset = async (email: string) => {
   console.log(data);
 
   if (response.status !== 200) {
-    toast.fire({
+    ToastComponent.fire({
       icon: "error",
       title: data.message,
     });
     return false;
   }
 
-  toast.fire({
+  ToastComponent.fire({
     icon: "success",
     title: "Password reset requested. Please check your email.",
   });
@@ -298,7 +326,7 @@ export const checkPasswordResetCode = async (code: string) => {
   const data = await response.json();
 
   if (response.status !== 200) {
-    toast.fire({
+    ToastComponent.fire({
       icon: "error",
       title: data.message,
     });
@@ -322,7 +350,7 @@ export const resetPasswordWithCode = async (code: string, password: string) => {
   const data = await response.json();
 
   if (response.status !== 200) {
-    toast.fire({
+    ToastComponent.fire({
       icon: "error",
       title: data.message,
     });