From 05cd4694609b4f91c9e0ccab1eed7adba0cdc3f0 Mon Sep 17 00:00:00 2001
From: shatfield4 <seanhatfield5@gmail.com>
Date: Tue, 25 Feb 2025 17:45:58 -0800
Subject: [PATCH 1/6] add bio to users table

---
 .../UserMenu/AccountModal/index.jsx           | 21 ++++++++++++++++++-
 server/endpoints/system.js                    |  6 +++++-
 server/models/user.js                         |  1 +
 .../20250226005538_init/migration.sql         |  2 ++
 server/prisma/schema.prisma                   |  1 +
 5 files changed, 29 insertions(+), 2 deletions(-)
 create mode 100644 server/prisma/migrations/20250226005538_init/migration.sql

diff --git a/frontend/src/components/UserMenu/AccountModal/index.jsx b/frontend/src/components/UserMenu/AccountModal/index.jsx
index 9de86893486..d4a6e4da2d7 100644
--- a/frontend/src/components/UserMenu/AccountModal/index.jsx
+++ b/frontend/src/components/UserMenu/AccountModal/index.jsx
@@ -52,11 +52,16 @@ export default function AccountModal({ user, hideModal }) {
       let storedUser = JSON.parse(localStorage.getItem(AUTH_USER));
 
       if (storedUser) {
-        storedUser.username = data.username;
+        Object.keys(data).forEach(key => {
+          if (key !== 'password') {
+            storedUser[key] = data[key];
+          }
+        });
         localStorage.setItem(AUTH_USER, JSON.stringify(storedUser));
       }
       showToast("Profile updated.", "success", { clear: true });
       hideModal();
+      window.location.reload();
     } else {
       showToast(`Failed to update user: ${error}`, "error");
     }
@@ -164,6 +169,20 @@ export default function AccountModal({ user, hideModal }) {
                   Password must be at least 8 characters long
                 </p>
               </div>
+              <div>
+                <label
+                  htmlFor="bio"
+                  className="block mb-2 text-sm font-medium text-white"
+                >
+                  Bio
+                </label>
+                <textarea
+                  name="bio"
+                  className="border-none bg-theme-settings-input-bg placeholder:text-theme-settings-input-placeholder border-gray-500 text-white text-sm rounded-lg focus:outline-primary-button active:outline-primary-button outline-none block w-full p-2.5 min-h-[100px] resize-y"
+                  placeholder="Tell us about yourself..."
+                  defaultValue={user.bio}
+                />
+              </div>
               <div className="flex flex-row gap-x-8">
                 <ThemePreference />
                 <LanguagePreference />
diff --git a/server/endpoints/system.js b/server/endpoints/system.js
index 3b578f94a21..75b11223e26 100644
--- a/server/endpoints/system.js
+++ b/server/endpoints/system.js
@@ -1082,7 +1082,7 @@ function systemEndpoints(app) {
   app.post("/system/user", [validatedRequest], async (request, response) => {
     try {
       const sessionUser = await userFromSession(request, response);
-      const { username, password } = reqBody(request);
+      const { username, password, bio } = reqBody(request);
       const id = Number(sessionUser.id);
 
       if (!id) {
@@ -1098,6 +1098,10 @@ function systemEndpoints(app) {
         updates.password = String(password);
       }
 
+      if (bio) {
+        updates.bio = String(bio);
+      }
+
       if (Object.keys(updates).length === 0) {
         response
           .status(400)
diff --git a/server/models/user.js b/server/models/user.js
index e6915d9dcd4..9bb25b79191 100644
--- a/server/models/user.js
+++ b/server/models/user.js
@@ -22,6 +22,7 @@ const User = {
     "role",
     "suspended",
     "dailyMessageLimit",
+    "bio",
   ],
   validations: {
     username: (newValue = "") => {
diff --git a/server/prisma/migrations/20250226005538_init/migration.sql b/server/prisma/migrations/20250226005538_init/migration.sql
new file mode 100644
index 00000000000..4902fbc6859
--- /dev/null
+++ b/server/prisma/migrations/20250226005538_init/migration.sql
@@ -0,0 +1,2 @@
+-- AlterTable
+ALTER TABLE "users" ADD COLUMN "bio" TEXT DEFAULT '';
diff --git a/server/prisma/schema.prisma b/server/prisma/schema.prisma
index 37c82d4ddfc..8372d33a478 100644
--- a/server/prisma/schema.prisma
+++ b/server/prisma/schema.prisma
@@ -68,6 +68,7 @@ model users {
   createdAt                   DateTime                      @default(now())
   lastUpdatedAt               DateTime                      @default(now())
   dailyMessageLimit           Int?
+  bio                         String?                       @default("")
   workspace_chats             workspace_chats[]
   workspace_users             workspace_users[]
   embed_configs               embed_configs[]

From 53f4fd424ad9b2ae73c6a6f7253e5762f4b166e1 Mon Sep 17 00:00:00 2001
From: shatfield4 <seanhatfield5@gmail.com>
Date: Tue, 25 Feb 2025 17:46:28 -0800
Subject: [PATCH 2/6] lint

---
 frontend/src/components/UserMenu/AccountModal/index.jsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/frontend/src/components/UserMenu/AccountModal/index.jsx b/frontend/src/components/UserMenu/AccountModal/index.jsx
index d4a6e4da2d7..47c06665035 100644
--- a/frontend/src/components/UserMenu/AccountModal/index.jsx
+++ b/frontend/src/components/UserMenu/AccountModal/index.jsx
@@ -52,8 +52,8 @@ export default function AccountModal({ user, hideModal }) {
       let storedUser = JSON.parse(localStorage.getItem(AUTH_USER));
 
       if (storedUser) {
-        Object.keys(data).forEach(key => {
-          if (key !== 'password') {
+        Object.keys(data).forEach((key) => {
+          if (key !== "password") {
             storedUser[key] = data[key];
           }
         });

From d3f4b2f091c4aaf4d9e400c3d5cbff8e84df4dcf Mon Sep 17 00:00:00 2001
From: shatfield4 <seanhatfield5@gmail.com>
Date: Tue, 25 Feb 2025 18:05:02 -0800
Subject: [PATCH 3/6] add bio field to edit user admin page

---
 .../pages/Admin/Users/NewUserModal/index.jsx  | 15 +++++++++
 .../Users/UserRow/EditUserModal/index.jsx     | 31 ++++++++++++++++++-
 2 files changed, 45 insertions(+), 1 deletion(-)

diff --git a/frontend/src/pages/Admin/Users/NewUserModal/index.jsx b/frontend/src/pages/Admin/Users/NewUserModal/index.jsx
index 54dab87ee4d..8b11c1a1128 100644
--- a/frontend/src/pages/Admin/Users/NewUserModal/index.jsx
+++ b/frontend/src/pages/Admin/Users/NewUserModal/index.jsx
@@ -95,6 +95,21 @@ export default function NewUserModal({ closeModal }) {
                   Password must be at least 8 characters long
                 </p>
               </div>
+              <div>
+                <label
+                  htmlFor="bio"
+                  className="block mb-2 text-sm font-medium text-white"
+                >
+                  Bio
+                </label>
+                <textarea
+                  name="bio"
+                  className="border-none bg-theme-settings-input-bg w-full text-white placeholder:text-theme-settings-input-placeholder text-sm rounded-lg focus:outline-primary-button active:outline-primary-button outline-none block w-full p-2.5"
+                  placeholder="User's bio"
+                  autoComplete="off"
+                  rows={3}
+                />
+              </div>
               <div>
                 <label
                   htmlFor="role"
diff --git a/frontend/src/pages/Admin/Users/UserRow/EditUserModal/index.jsx b/frontend/src/pages/Admin/Users/UserRow/EditUserModal/index.jsx
index 8908b17e644..df0e37fc76b 100644
--- a/frontend/src/pages/Admin/Users/UserRow/EditUserModal/index.jsx
+++ b/frontend/src/pages/Admin/Users/UserRow/EditUserModal/index.jsx
@@ -2,6 +2,7 @@ import React, { useState } from "react";
 import { X } from "@phosphor-icons/react";
 import Admin from "@/models/admin";
 import { MessageLimitInput, RoleHintDisplay } from "../..";
+import { AUTH_USER } from "@/utils/constants";
 
 export default function EditUserModal({ currentUser, user, closeModal }) {
   const [role, setRole] = useState(user.role);
@@ -27,7 +28,19 @@ export default function EditUserModal({ currentUser, user, closeModal }) {
     }
 
     const { success, error } = await Admin.updateUser(user.id, data);
-    if (success) window.location.reload();
+    if (success) {
+      // Update local storage if we're editing our own user
+      const storedUser = JSON.parse(localStorage.getItem(AUTH_USER));
+      if (storedUser && storedUser.id === user.id) {
+        Object.keys(data).forEach((key) => {
+          if (key !== "password") {
+            storedUser[key] = data[key];
+          }
+        });
+        localStorage.setItem(AUTH_USER, JSON.stringify(storedUser));
+      }
+      window.location.reload();
+    }
     setError(error);
   };
 
@@ -92,6 +105,22 @@ export default function EditUserModal({ currentUser, user, closeModal }) {
                   Password must be at least 8 characters long
                 </p>
               </div>
+              <div>
+                <label
+                  htmlFor="bio"
+                  className="block mb-2 text-sm font-medium text-white"
+                >
+                  Bio
+                </label>
+                <textarea
+                  name="bio"
+                  className="border-none bg-theme-settings-input-bg w-full text-white placeholder:text-theme-settings-input-placeholder text-sm rounded-lg focus:outline-primary-button active:outline-primary-button outline-none block w-full p-2.5"
+                  placeholder="User's bio"
+                  defaultValue={user.bio}
+                  autoComplete="off"
+                  rows={3}
+                />
+              </div>
               <div>
                 <label
                   htmlFor="role"

From 82413ab36633fbb10991c611778ec1f6939f1335 Mon Sep 17 00:00:00 2001
From: shatfield4 <seanhatfield5@gmail.com>
Date: Tue, 25 Feb 2025 18:11:25 -0800
Subject: [PATCH 4/6] fix bio saving on new user

---
 server/models/user.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/server/models/user.js b/server/models/user.js
index 9bb25b79191..f544d8f22d5 100644
--- a/server/models/user.js
+++ b/server/models/user.js
@@ -78,6 +78,7 @@ const User = {
     password,
     role = "default",
     dailyMessageLimit = null,
+    bio = "",
   }) {
     const passwordCheck = this.checkPasswordComplexity(password);
     if (!passwordCheck.checkedOK) {
@@ -100,6 +101,7 @@ const User = {
           role: this.validations.role(role),
           dailyMessageLimit:
             this.validations.dailyMessageLimit(dailyMessageLimit),
+          bio,
         },
       });
       return { user: this.filterFields(user), error: null };

From d7369ea3eb7b95d2cc3ba06d49a2dcce6454d317 Mon Sep 17 00:00:00 2001
From: shatfield4 <seanhatfield5@gmail.com>
Date: Wed, 26 Feb 2025 13:06:04 -0800
Subject: [PATCH 5/6] simplify updating localstorage user

---
 frontend/src/components/UserMenu/AccountModal/index.jsx   | 8 ++------
 .../src/pages/Admin/Users/UserRow/EditUserModal/index.jsx | 8 +++-----
 2 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/frontend/src/components/UserMenu/AccountModal/index.jsx b/frontend/src/components/UserMenu/AccountModal/index.jsx
index 47c06665035..d36c2b33189 100644
--- a/frontend/src/components/UserMenu/AccountModal/index.jsx
+++ b/frontend/src/components/UserMenu/AccountModal/index.jsx
@@ -50,13 +50,9 @@ export default function AccountModal({ user, hideModal }) {
     const { success, error } = await System.updateUser(data);
     if (success) {
       let storedUser = JSON.parse(localStorage.getItem(AUTH_USER));
-
       if (storedUser) {
-        Object.keys(data).forEach((key) => {
-          if (key !== "password") {
-            storedUser[key] = data[key];
-          }
-        });
+        storedUser.username = data.username;
+        storedUser.bio = data.bio;
         localStorage.setItem(AUTH_USER, JSON.stringify(storedUser));
       }
       showToast("Profile updated.", "success", { clear: true });
diff --git a/frontend/src/pages/Admin/Users/UserRow/EditUserModal/index.jsx b/frontend/src/pages/Admin/Users/UserRow/EditUserModal/index.jsx
index df0e37fc76b..3dd61f6fade 100644
--- a/frontend/src/pages/Admin/Users/UserRow/EditUserModal/index.jsx
+++ b/frontend/src/pages/Admin/Users/UserRow/EditUserModal/index.jsx
@@ -32,11 +32,9 @@ export default function EditUserModal({ currentUser, user, closeModal }) {
       // Update local storage if we're editing our own user
       const storedUser = JSON.parse(localStorage.getItem(AUTH_USER));
       if (storedUser && storedUser.id === user.id) {
-        Object.keys(data).forEach((key) => {
-          if (key !== "password") {
-            storedUser[key] = data[key];
-          }
-        });
+        storedUser.username = data.username;
+        storedUser.bio = data.bio;
+        storedUser.role = data.role;
         localStorage.setItem(AUTH_USER, JSON.stringify(storedUser));
       }
       window.location.reload();

From 15922e4d869f1c3098d481cc362aefb32bad50e9 Mon Sep 17 00:00:00 2001
From: timothycarambat <rambat1010@gmail.com>
Date: Wed, 26 Feb 2025 15:21:52 -0800
Subject: [PATCH 6/6] linting

---
 .../src/components/UserMenu/AccountModal/index.jsx   |  1 -
 .../Admin/Users/UserRow/EditUserModal/index.jsx      | 12 ++++++------
 server/endpoints/system.js                           | 12 +++---------
 server/models/user.js                                |  8 +++++++-
 4 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/frontend/src/components/UserMenu/AccountModal/index.jsx b/frontend/src/components/UserMenu/AccountModal/index.jsx
index d36c2b33189..a77c5145756 100644
--- a/frontend/src/components/UserMenu/AccountModal/index.jsx
+++ b/frontend/src/components/UserMenu/AccountModal/index.jsx
@@ -57,7 +57,6 @@ export default function AccountModal({ user, hideModal }) {
       }
       showToast("Profile updated.", "success", { clear: true });
       hideModal();
-      window.location.reload();
     } else {
       showToast(`Failed to update user: ${error}`, "error");
     }
diff --git a/frontend/src/pages/Admin/Users/UserRow/EditUserModal/index.jsx b/frontend/src/pages/Admin/Users/UserRow/EditUserModal/index.jsx
index 3dd61f6fade..5a88e4d898d 100644
--- a/frontend/src/pages/Admin/Users/UserRow/EditUserModal/index.jsx
+++ b/frontend/src/pages/Admin/Users/UserRow/EditUserModal/index.jsx
@@ -30,13 +30,13 @@ export default function EditUserModal({ currentUser, user, closeModal }) {
     const { success, error } = await Admin.updateUser(user.id, data);
     if (success) {
       // Update local storage if we're editing our own user
-      const storedUser = JSON.parse(localStorage.getItem(AUTH_USER));
-      if (storedUser && storedUser.id === user.id) {
-        storedUser.username = data.username;
-        storedUser.bio = data.bio;
-        storedUser.role = data.role;
-        localStorage.setItem(AUTH_USER, JSON.stringify(storedUser));
+      if (currentUser && currentUser.id === user.id) {
+        currentUser.username = data.username;
+        currentUser.bio = data.bio;
+        currentUser.role = data.role;
+        localStorage.setItem(AUTH_USER, JSON.stringify(currentUser));
       }
+
       window.location.reload();
     }
     setError(error);
diff --git a/server/endpoints/system.js b/server/endpoints/system.js
index 75b11223e26..3aabb7ebe52 100644
--- a/server/endpoints/system.js
+++ b/server/endpoints/system.js
@@ -1091,16 +1091,10 @@ function systemEndpoints(app) {
       }
 
       const updates = {};
-      if (username) {
+      if (username)
         updates.username = User.validations.username(String(username));
-      }
-      if (password) {
-        updates.password = String(password);
-      }
-
-      if (bio) {
-        updates.bio = String(bio);
-      }
+      if (password) updates.password = String(password);
+      if (bio) updates.bio = String(bio);
 
       if (Object.keys(updates).length === 0) {
         response
diff --git a/server/models/user.js b/server/models/user.js
index f544d8f22d5..5979de34788 100644
--- a/server/models/user.js
+++ b/server/models/user.js
@@ -55,6 +55,12 @@ const User = {
       }
       return limit;
     },
+    bio: (bio = "") => {
+      if (!bio || typeof bio !== "string") return "";
+      if (bio.length > 1000)
+        throw new Error("Bio cannot be longer than 1,000 characters");
+      return String(bio);
+    },
   },
   // validations for the above writable fields.
   castColumnValue: function (key, value) {
@@ -99,9 +105,9 @@ const User = {
           username: this.validations.username(username),
           password: hashedPassword,
           role: this.validations.role(role),
+          bio: this.validations.bio(bio),
           dailyMessageLimit:
             this.validations.dailyMessageLimit(dailyMessageLimit),
-          bio,
         },
       });
       return { user: this.filterFields(user), error: null };