From e74756abf03b4522aeb207426df7f215be0ed260 Mon Sep 17 00:00:00 2001
From: Bradley Shellnut <bradleyshellnut@protonmail.com>
Date: Tue, 7 Jan 2025 16:44:36 -0800
Subject: [PATCH] Allow saving username when it is the same as your current
 username. Fixing message on success.

---
 src/lib/server/api/users/users.controller.ts  |  1 -
 src/lib/server/api/users/users.service.ts     | 18 ++--
 .../(protected)/settings/+page.server.ts      | 10 ++-
 .../settings/update-profile-card.svelte       | 90 ++++++++++---------
 4 files changed, 67 insertions(+), 52 deletions(-)

diff --git a/src/lib/server/api/users/users.controller.ts b/src/lib/server/api/users/users.controller.ts
index 38cf87e..a931f79 100644
--- a/src/lib/server/api/users/users.controller.ts
+++ b/src/lib/server/api/users/users.controller.ts
@@ -70,7 +70,6 @@ export class UsersController extends Controller {
         }
       })
       .put('/me/profile', authState('session'), zValidator('json', updateProfileDto), async (c) => {
-        c.var.logger.debug(`Update profile: ${JSON.stringify(c.req.valid('json'))}`);
         await this.usersService.update(c.var.session.userId, c.req.valid('json'));
         const user = await this.usersRepository.findOneByIdOrThrow(c.var.session.userId);
         return c.json(user);
diff --git a/src/lib/server/api/users/users.service.ts b/src/lib/server/api/users/users.service.ts
index 114d274..e363fb2 100644
--- a/src/lib/server/api/users/users.service.ts
+++ b/src/lib/server/api/users/users.service.ts
@@ -25,13 +25,19 @@ export class UsersService {
   ) {}
 
   async update(userId: string, updateUserDto: UpdateProfileDto) {
-    let key: string | null = null;
-    if (updateUserDto?.avatar) {
-      const response = await this.storageService.upload({ file: updateUserDto.avatar });
-      key = response?.key;
+    // let key: string | null = null;
+    // if (updateUserDto?.avatar) {
+    //   const response = await this.storageService.upload({ file: updateUserDto.avatar });
+    //   key = response?.key;
+    // }
+    const currentUser = await this.usersRepository.findOneByIdOrThrow(userId);
+    if (currentUser?.username !== updateUserDto?.username) {
+      const existingUserWithUsername = await this.usersRepository.findOneByUsername(updateUserDto.username);
+      if (existingUserWithUsername) {
+        throw BadRequest('Username already exists');
+      }
     }
-    this.loggerService.log.info(`Updating user ${userId}, with avatar: ${key}, first_name: ${updateUserDto?.first_name}, last_name: ${updateUserDto?.last_name}`);
-    await this.usersRepository.update(userId, { avatar: key, first_name: updateUserDto?.first_name ?? '', last_name: updateUserDto?.last_name ?? '' });
+    await this.usersRepository.update(userId, { avatar: null, first_name: updateUserDto?.first_name ?? '', last_name: updateUserDto?.last_name ?? '' });
   }
 
   async createEmail(email: string) {
diff --git a/src/routes/(app)/(protected)/settings/+page.server.ts b/src/routes/(app)/(protected)/settings/+page.server.ts
index d9ceabe..85df877 100644
--- a/src/routes/(app)/(protected)/settings/+page.server.ts
+++ b/src/routes/(app)/(protected)/settings/+page.server.ts
@@ -51,9 +51,15 @@ export const actions: Actions = {
     const { error } = await locals.api.users.me.profile.$put({ json: form.data }).then(locals.parseApiResponse);
 
     if (error) {
-      return setError(form, 'username', error);
+			console.log('error', error);
+      return setError(form, 'username', error.message);
     }
 
-    return message(form, { text: 'Profile updated', type: 'success' });
+		const profileUpdatedMessage = {
+			type: 'success',
+			message: 'Profile updated! 🎊',
+		};
+
+    return message(form, profileUpdatedMessage);
   },
 };
diff --git a/src/routes/(app)/(protected)/settings/update-profile-card.svelte b/src/routes/(app)/(protected)/settings/update-profile-card.svelte
index 7239a9b..fd66b90 100644
--- a/src/routes/(app)/(protected)/settings/update-profile-card.svelte
+++ b/src/routes/(app)/(protected)/settings/update-profile-card.svelte
@@ -1,17 +1,21 @@
 <script lang="ts">
-	import * as Card from '$lib/components/ui/card';
-	import * as Form from '$lib/components/ui/form';
-	import { Input } from '$lib/components/ui/input';
-	import { updateProfileDto, type UpdateProfileDto } from '$lib/dtos/settings/profile/update-profile.dto.js';
-	import { fileProxy, superForm } from 'sveltekit-superforms/client';
-	import { zodClient } from 'sveltekit-superforms/adapters';
-
+	import * as Card from "$lib/components/ui/card";
+	import * as Form from "$lib/components/ui/form";
+	import { Input } from "$lib/components/ui/input";
+	import { updateProfileDto, type UpdateProfileDto } from "$lib/dtos/settings/profile/update-profile.dto.js";
+	import { fileProxy, superForm } from "sveltekit-superforms/client";
+	import { zodClient } from "sveltekit-superforms/adapters";
+	import * as flashModule from "sveltekit-flash-message/client";
 
 	const { updateProfileForm }: { updateProfileForm: UpdateProfileDto } = $props();
 
 	const sf_update_profile = superForm(updateProfileForm, {
 		validators: zodClient(updateProfileDto),
 		resetForm: false,
+		syncFlashMessage: true,
+		flashMessage: {
+			module: flashModule,
+		},
 	});
 
 	const {
@@ -20,7 +24,7 @@
 		submit: updateProfileFormSubmit,
 	} = sf_update_profile;
 
-	const avatar = fileProxy(updateProfileFormData, 'avatar')
+	const avatar = fileProxy(updateProfileFormData, "avatar");
 </script>
 
 <svelte:head>
@@ -32,40 +36,40 @@
 		<Card.Title>Update Profile</Card.Title>
 	</Card.Header>
 	<Card.Content>
-	<form method="POST" action="?/updateProfile" use:updateProfileEnhance>
-		<h3>Your Profile</h3>
-		<hr class="!border-t-2 mt-2 mb-6" />
-		<Form.Field form={sf_update_profile} name="username">
-			<Form.Control>
-				{#snippet children({ props })}
-					<Form.Label for="username">Username</Form.Label>
-					<Input autocomplete="username" {...props} bind:value={$updateProfileFormData.username} />
-				{/snippet}
-			</Form.Control>
-			<Form.Description />
-			<Form.FieldErrors />
-		</Form.Field>
-		<Form.Field form={sf_update_profile} name="first_name">
-			<Form.Control>
-				{#snippet children({ props })}
-					<Form.Label for="first_name">First Name</Form.Label>
-					<Input {...props} bind:value={$updateProfileFormData.first_name} />
-				{/snippet}
-			</Form.Control>
-			<Form.Description />
-			<Form.FieldErrors />
-		</Form.Field>
-		<Form.Field form={sf_update_profile} name="last_name">
-			<Form.Control>
-				{#snippet children({ props })}
-					<Form.Label for="last_name">Last Name</Form.Label>
-					<Input {...props} bind:value={$updateProfileFormData.last_name} />
-				{/snippet}
-			</Form.Control>
-			<Form.Description />
-			<Form.FieldErrors />
-		</Form.Field>
-		<!-- <Form.Field form={sf_update_profile} name="avatar">
+		<form method="POST" action="?/updateProfile" use:updateProfileEnhance>
+			<h3>Your Profile</h3>
+			<hr class="!border-t-2 mt-2 mb-6" />
+			<Form.Field form={sf_update_profile} name="username">
+				<Form.Control>
+					{#snippet children({ props })}
+						<Form.Label for="username">Username</Form.Label>
+						<Input autocomplete="username" {...props} bind:value={$updateProfileFormData.username} />
+					{/snippet}
+				</Form.Control>
+				<Form.Description />
+				<Form.FieldErrors />
+			</Form.Field>
+			<Form.Field form={sf_update_profile} name="first_name">
+				<Form.Control>
+					{#snippet children({ props })}
+						<Form.Label for="first_name">First Name</Form.Label>
+						<Input {...props} bind:value={$updateProfileFormData.first_name} />
+					{/snippet}
+				</Form.Control>
+				<Form.Description />
+				<Form.FieldErrors />
+			</Form.Field>
+			<Form.Field form={sf_update_profile} name="last_name">
+				<Form.Control>
+					{#snippet children({ props })}
+						<Form.Label for="last_name">Last Name</Form.Label>
+						<Input {...props} bind:value={$updateProfileFormData.last_name} />
+					{/snippet}
+				</Form.Control>
+				<Form.Description />
+				<Form.FieldErrors />
+			</Form.Field>
+			<!-- <Form.Field form={sf_update_profile} name="avatar">
 			<Form.Control>
 				{#snippet children({ props })}
 					<Form.Label for="avatar">Avatar</Form.Label>
@@ -75,7 +79,7 @@
 			<Form.Description />
 			<Form.FieldErrors />
 		</Form.Field> -->
-	</form>
+		</form>
 	</Card.Content>
 	<Card.Footer class="border-t px-6 py-4">
 		<Form.Button onclick={() => updateProfileFormSubmit()}>Update Profile</Form.Button>