Skip to content

⚡️⚡️⚡️ Self-hosted collaborative bookmark manager to collect, read, annotate, and fully preserve what matters, all in one place.

minor error handling

Daniel2bd9a97d2f83
diff --git a/components/Modal/User/ProfileSettings.tsx b/components/Modal/User/ProfileSettings.tsx
index 1591738d..57e81c4a 100644
--- a/components/Modal/User/ProfileSettings.tsx
+++ b/components/Modal/User/ProfileSettings.tsx
@@ -78,28 +78,25 @@ export default function ProfileSettings({
if (response.ok) {
toast.success("Settings Applied!");
toggleSettingsModal();
- } else toast.error(response.data as string);
- setSubmitLoader(false);
+ if (
+ user.username !== account.username ||
+ user.name !== account.name ||
+ user.email !== account.email
+ ) {
+ update({
+ username: user.username,
+ email: user.username,
+ name: user.name,
+ });
- if (
- user.username !== account.username ||
- user.name !== account.name ||
- user.email !== account.email
- ) {
- update({
- username: user.username,
- email: user.username,
- name: user.name,
- });
-
- signOut();
- }
+ signOut();
+ }
- if (response.ok) {
setUser({ ...user, newPassword: undefined });
toggleSettingsModal();
- }
+ } else toast.error(response.data as string);
+ setSubmitLoader(false);
};
return (
diff --git a/lib/api/controllers/users/updateUser.ts b/lib/api/controllers/users/updateUser.ts
index f6f8131e..064dd84e 100644
--- a/lib/api/controllers/users/updateUser.ts
+++ b/lib/api/controllers/users/updateUser.ts
@@ -20,6 +20,26 @@ export default async function updateUser(
status: 400,
};
+ const userIsTaken = await prisma.user.findFirst({
+ where: {
+ id: { not: sessionUser.id },
+ OR: [
+ {
+ username: user.username.toLowerCase(),
+ },
+ {
+ email: user.email.toLowerCase(),
+ },
+ ],
+ },
+ });
+
+ if (userIsTaken)
+ return {
+ response: "Username/Email is taken.",
+ status: 400,
+ };
+
// Avatar Settings
const profilePic = user.profilePic;