Skip to content

Modern Docker Management, Designed for Everyone

fix: keep first-login password dialog open and clear the flag on admin password change (#3831)

Kyle Mendell6f90da73f360
diff --git a/backend/internal/user/handler.go b/backend/internal/user/handler.go
index c9fa0b2fd..a370aa424 100644
--- a/backend/internal/user/handler.go
+++ b/backend/internal/user/handler.go
@@ -276,6 +276,7 @@ func (h *UserHandler) UpdateUser(ctx context.Context, input *UpdateUserInput) (*
return nil, huma.Error500InternalServerError("Failed to hash password")
}
userModel.PasswordHash = hashedPassword
+ userModel.RequiresPasswordChange = false
}
updatedUser, err := h.userService.UpdateUser(ctx, userModel, callerPerms)
diff --git a/backend/resources/migrations/postgres/080_drop_legacy_require_password_change.sql b/backend/resources/migrations/postgres/080_drop_legacy_require_password_change.sql
new file mode 100644
index 000000000..6e1fa6e43
--- /dev/null
+++ b/backend/resources/migrations/postgres/080_drop_legacy_require_password_change.sql
@@ -0,0 +1,5 @@
+-- +goose Up
+ALTER TABLE users DROP COLUMN IF EXISTS require_password_change;
+
+-- +goose Down
+ALTER TABLE users ADD COLUMN IF NOT EXISTS require_password_change BOOLEAN NOT NULL DEFAULT false;
diff --git a/backend/resources/migrations/sqlite/080_drop_legacy_require_password_change.sql b/backend/resources/migrations/sqlite/080_drop_legacy_require_password_change.sql
new file mode 100644
index 000000000..874cd44bb
--- /dev/null
+++ b/backend/resources/migrations/sqlite/080_drop_legacy_require_password_change.sql
@@ -0,0 +1,5 @@
+-- +goose Up
+ALTER TABLE users DROP COLUMN require_password_change;
+
+-- +goose Down
+ALTER TABLE users ADD COLUMN require_password_change BOOLEAN NOT NULL DEFAULT 0;
diff --git a/frontend/src/lib/components/dialogs/first-login-password-dialog.svelte b/frontend/src/lib/components/dialogs/first-login-password-dialog.svelte
index fe6bc0ccd..c940ab4ce 100644
--- a/frontend/src/lib/components/dialogs/first-login-password-dialog.svelte
+++ b/frontend/src/lib/components/dialogs/first-login-password-dialog.svelte
@@ -59,14 +59,10 @@
<ResponsiveDialog
{open}
- onOpenChange={(isOpen) => {
- if (!isOpen) {
- open = true;
- }
- }}
+ dismissible={false}
title={m.first_login_title()}
description={m.first_login_description()}
- contentClass="sm:max-w-[425px] [&>button]:hidden"
+ contentClass="sm:max-w-[425px]"
>
<form
onsubmit={(e) => {
diff --git a/frontend/src/lib/components/ui/responsive-dialog/responsive-dialog.svelte b/frontend/src/lib/components/ui/responsive-dialog/responsive-dialog.svelte
index a89821c9a..d90dda2ed 100644
--- a/frontend/src/lib/components/ui/responsive-dialog/responsive-dialog.svelte
+++ b/frontend/src/lib/components/ui/responsive-dialog/responsive-dialog.svelte
@@ -19,12 +19,14 @@
class: className,
contentClass,
showCloseButton = true,
+ dismissible = true,
variant = 'dialog'
}: ResponsiveDialogProps = $props();
const isDesktop = new MediaQuery('(min-width: 768px)');
function handleOpenChange(newOpen: boolean) {
+ if (!newOpen && !dismissible) return;
open = newOpen;
onOpenChange?.(newOpen);
}
@@ -46,7 +48,11 @@
{@render trigger()}
</Sheet.Trigger>
{/if}
- <Sheet.Content class={cn('flex flex-col overflow-hidden p-0', contentClass)}>
+ <Sheet.Content
+ class={cn('flex flex-col overflow-hidden p-0', contentClass)}
+ interactOutsideBehavior={dismissible ? 'close' : 'ignore'}
+ escapeKeydownBehavior={dismissible ? 'close' : 'ignore'}
+ >
{#if title || description}
<Sheet.Header class="shrink-0 px-6 pt-6">
{#if title}
@@ -81,7 +87,9 @@
'max-h-[calc(100vh-2rem)] grid-rows-[auto_minmax(0,1fr)_auto]! overflow-hidden p-0!',
contentClass ?? 'sm:max-w-[425px]'
)}
- {showCloseButton}
+ showCloseButton={showCloseButton && dismissible}
+ interactOutsideBehavior={dismissible ? 'close' : 'ignore'}
+ escapeKeydownBehavior={dismissible ? 'close' : 'ignore'}
>
{#if title || description}
<Dialog.Header class="shrink-0 px-6 pt-6">
@@ -105,7 +113,7 @@
</Dialog.Root>
{/if}
{:else}
- <Drawer.Root {open} onOpenChange={handleOpenChange}>
+ <Drawer.Root {open} {dismissible} onOpenChange={handleOpenChange}>
{#if trigger}
<Drawer.Trigger>
{@render trigger()}
diff --git a/frontend/src/lib/components/ui/responsive-dialog/responsive-dialog.type.ts b/frontend/src/lib/components/ui/responsive-dialog/responsive-dialog.type.ts
index 7e3d8819d..c3e80fac6 100644
--- a/frontend/src/lib/components/ui/responsive-dialog/responsive-dialog.type.ts
+++ b/frontend/src/lib/components/ui/responsive-dialog/responsive-dialog.type.ts
@@ -58,6 +58,12 @@ export interface ResponsiveDialogProps {
*/
showCloseButton?: boolean;
+ /**
+ * Whether the dialog can be closed by outside click, Escape, or the close button
+ * @default true
+ */
+ dismissible?: boolean;
+
/**
* The variant of the dialog on desktop
* @default 'dialog'
diff --git a/frontend/src/lib/types/auth.ts b/frontend/src/lib/types/auth.ts
index ae06d8b09..e6c0bf6a5 100644
--- a/frontend/src/lib/types/auth.ts
+++ b/frontend/src/lib/types/auth.ts
@@ -227,7 +227,6 @@ export type AuthenticationResponse = {
user?: User;
mfa?: MFAChallenge;
error?: string;
- requirePasswordChange?: boolean;
};
export type Passkey = {