fix: fix merge bugs

TritonSE · Apr 10, 2024 · 9bb897f · 9bb897f
1 parent 6af0829
commit 9bb897f
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 7 deletions.
diff --git a/backend/src/controllers/user.ts b/backend/src/controllers/user.ts
@@ -92,10 +92,15 @@ export const loginUser = async (
     if (!user) {
       throw ValidationError.USER_NOT_FOUND;
     }
-
-    res
-      .status(200)
-      .json({ uid: user._id, role: user.accountType, approvalStatus: user.approvalStatus });
+    res.status(200).json({
+      uid: user._id,
+      role: user.accountType,
+      approvalStatus: user.approvalStatus,
+      profilePicture: user.profilePicture,
+      name: user.name,
+      email: user.email,
+      lastChangedPassword: user.lastChangedPassword,
+    });
     return;
   } catch (e) {
     nxt();

diff --git a/frontend/src/pages/profile.tsx b/frontend/src/pages/profile.tsx
@@ -31,9 +31,7 @@ export default function Profile() {
     if (!piaUser) return;
     if (piaUser.profilePicture === "default") {
       setBasicInfoData((prev) => ({ ...prev, image: "default" }));
-      return;
-    }
-    if (piaUser.profilePicture) {
+    } else if (piaUser.profilePicture) {
       getPhoto(piaUser.profilePicture).then(
         (result) => {
           if (result.success) {