Skip to content

Modern Docker Management, Designed for Everyone

feat: allow changing user usernames

Kyle Mendell74321b52e891
diff --git a/src/lib/components/dialogs/user-form-dialog.svelte b/src/lib/components/dialogs/user-form-dialog.svelte
index 3025ac6ac..9bd87b7e5 100644
--- a/src/lib/components/dialogs/user-form-dialog.svelte
+++ b/src/lib/components/dialogs/user-form-dialog.svelte
@@ -13,13 +13,15 @@
userToEdit = $bindable<User | null>(null),
roles = [],
isLoading = $bindable(false),
- onSubmit = $bindable(() => {})
+ onSubmit = $bindable(() => {}),
+ allowUsernameEdit = false
}: {
open?: boolean;
userToEdit?: User | null;
roles: { id: string; name: string }[];
isLoading?: boolean;
onSubmit?: (data: { user: Partial<User> & { password?: string }; isEditMode: boolean; userId?: string }) => void;
+ allowUsernameEdit?: boolean;
} = $props();
let username = $state('');
@@ -33,6 +35,7 @@
let dialogTitle = $derived(isEditMode ? 'Edit User' : 'Create User');
let submitButtonText = $derived(isEditMode ? 'Save Changes' : 'Create User');
let SubmitIcon = $derived(isEditMode ? Save : UserPlus);
+ let canEditUsername = $derived(!isEditMode || allowUsernameEdit);
$effect(() => {
if (open) {
@@ -89,7 +92,7 @@
<form class="grid gap-4 py-4" onsubmit={preventDefault(handleSubmit)} autocomplete="off">
<div class="grid grid-cols-4 items-center gap-4">
<Label for="username" class="text-right">Username</Label>
- <Input autocomplete="off" id="username" bind:value={username} required class="col-span-3" disabled={isEditMode} />
+ <Input autocomplete="off" id="username" bind:value={username} required class="col-span-3" disabled={!canEditUsername} />
</div>
<div class="grid grid-cols-4 items-center gap-4">
<Label for="password" class="text-right">Password</Label>
diff --git a/src/routes/api/users/[id]/+server.ts b/src/routes/api/users/[id]/+server.ts
index c54fd9715..a746e13ef 100644
--- a/src/routes/api/users/[id]/+server.ts
+++ b/src/routes/api/users/[id]/+server.ts
@@ -11,88 +11,55 @@ import { tryCatch } from '$lib/utils/try-catch';
const USER_DIR = path.join(BASE_PATH, 'users');
-export const PUT: RequestHandler = async ({ params, request, locals }) => {
- if (!locals.user) {
- const response: ApiErrorResponse = {
- success: false,
- error: 'Unauthorized',
- code: ApiErrorCode.UNAUTHORIZED
- };
- return json(response, { status: 401 });
- }
+export const PUT: RequestHandler = async ({ request, params, locals }) => {
+ try {
+ const userId = params.id;
+ if (!userId) {
+ return json({ success: false, error: 'User ID is required' }, { status: 400 });
+ }
- const userIdToUpdate = params.id;
- const requestingUser = locals.user as User;
+ const bodyResult = await tryCatch(request.json());
+ if (bodyResult.error) {
+ return json({ success: false, error: 'Invalid JSON payload' }, { status: 400 });
+ }
- if (!requestingUser.roles.includes('admin') && requestingUser.id !== userIdToUpdate) {
- const response: ApiErrorResponse = {
- success: false,
- error: 'Forbidden',
- code: ApiErrorCode.FORBIDDEN
- };
- return json(response, { status: 403 });
- }
+ const { username, displayName, email, roles, password } = bodyResult.data;
- const existingUserResult = await tryCatch(getUserById(userIdToUpdate));
- if (existingUserResult.error || !existingUserResult.data) {
- const response: ApiErrorResponse = {
- success: false,
- error: 'User not found',
- code: ApiErrorCode.NOT_FOUND
- };
- return json(response, { status: 404 });
- }
- const existingUser = existingUserResult.data;
+ // Get existing user
+ const existingUser = await getUserById(userId);
+ if (!existingUser) {
+ return json({ success: false, error: 'User not found' }, { status: 404 });
+ }
- const updateDataResult = await tryCatch(request.json());
- if (updateDataResult.error) {
- const response: ApiErrorResponse = {
- success: false,
- error: 'Invalid JSON payload',
- code: ApiErrorCode.BAD_REQUEST
+ // Create updated user object
+ const updatedUser: User = {
+ ...existingUser,
+ ...(username !== undefined && { username }), // Make sure this line is included
+ ...(displayName !== undefined && { displayName }),
+ ...(email !== undefined && { email }),
+ ...(roles !== undefined && { roles })
};
- return json(response, { status: 400 });
- }
- const { password, displayName, email, roles } = updateDataResult.data;
-
- const updatedUser: User = { ...existingUser };
- if (displayName !== undefined) updatedUser.displayName = displayName;
- if (email !== undefined) updatedUser.email = email;
- if (roles !== undefined && requestingUser.roles.includes('admin')) {
- const ALLOWED = ['admin', 'user', 'viewer'];
- updatedUser.roles = Array.isArray(roles) ? roles.filter((r) => ALLOWED.includes(r)) : updatedUser.roles;
- }
-
- if (password) {
- const hashResult = await tryCatch(hashPassword(password));
- if (hashResult.error) {
- const response: ApiErrorResponse = {
- success: false,
- error: 'Failed to hash password',
- code: ApiErrorCode.INTERNAL_SERVER_ERROR,
- details: hashResult.error
- };
- return json(response, { status: 500 });
+ // Handle password update if provided
+ if (password) {
+ updatedUser.passwordHash = await hashPassword(password);
}
- updatedUser.passwordHash = hashResult.data;
- updatedUser.requirePasswordChange = false;
- }
- const saveResult = await tryCatch(saveUser(updatedUser));
- if (saveResult.error) {
- console.error('Error saving user:', saveResult.error);
- const response: ApiErrorResponse = {
- success: false,
- error: 'Failed to update user',
- code: ApiErrorCode.INTERNAL_SERVER_ERROR,
- details: saveResult.error
- };
- return json(response, { status: 500 });
+ // Save the updated user
+ await saveUser(updatedUser);
+
+ // Return success response
+ return json({
+ success: true,
+ user: {
+ ...updatedUser,
+ passwordHash: undefined // Don't return password hash
+ }
+ });
+ } catch (error) {
+ console.error('Error updating user:', error);
+ return json({ success: false, error: 'Failed to update user' }, { status: 500 });
}
-
- const { passwordHash: _unused, ...sanitizedUser } = saveResult.data;
- return json({ success: true, user: sanitizedUser });
};
export const DELETE: RequestHandler = async ({ params, locals }) => {
diff --git a/src/routes/settings/users/+page.svelte b/src/routes/settings/users/+page.svelte
index a4aa6f81b..1e658bdcf 100644
--- a/src/routes/settings/users/+page.svelte
+++ b/src/routes/settings/users/+page.svelte
@@ -95,7 +95,7 @@
<title>User Management - Arcane</title>
</svelte:head>
-<UserFormDialog bind:open={userPageStates.isUserDialogOpen} bind:userToEdit={userPageStates.userToEdit} {roles} onSubmit={handleDialogSubmit} bind:this={userDialogRef} isLoading={isLoading.saving} />
+<UserFormDialog bind:open={userPageStates.isUserDialogOpen} bind:userToEdit={userPageStates.userToEdit} {roles} onSubmit={handleDialogSubmit} bind:this={userDialogRef} isLoading={isLoading.saving} allowUsernameEdit={true} />
<div class="space-y-6">
<div>