From 66f8ff0e509245c2c92781de5a20f2a54aec494b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Tr=C3=A1vn=C3=ADk?= Date: Tue, 16 Dec 2025 12:47:20 +0100 Subject: [PATCH] few missing corrections related to all users export instead of just admin --- app/client/api-client/types.gen.ts | 18 +++++++++++------- app/client/components/export-dialog.tsx | 2 +- .../modules/lifecycle/config-export.dto.ts | 6 +++--- 3 files changed, 15 insertions(+), 11 deletions(-) diff --git a/app/client/api-client/types.gen.ts b/app/client/api-client/types.gen.ts index efb9bb73..d196feef 100644 --- a/app/client/api-client/types.gen.ts +++ b/app/client/api-client/types.gen.ts @@ -2631,7 +2631,7 @@ export type ExportFullConfigData = { export type ExportFullConfigErrors = { /** - * Password required for sensitive export options + * Password required for export or authentication failed */ 401: { error: string; @@ -2651,16 +2651,20 @@ export type ExportFullConfigResponses = { * Full configuration export */ 200: { - admin?: { - username: string; - passwordHash?: string; - recoveryKey?: string; - } | null; + version: number; backupSchedules?: Array; exportedAt?: string; notificationDestinations?: Array; + recoveryKey?: string; repositories?: Array; - version?: number; + users?: Array<{ + username: string; + createdAt?: number; + hasDownloadedResticPassword?: boolean; + id?: number; + passwordHash?: string; + updatedAt?: number; + }>; volumes?: Array; }; }; diff --git a/app/client/components/export-dialog.tsx b/app/client/components/export-dialog.tsx index 36c5cdd8..00db200b 100644 --- a/app/client/components/export-dialog.tsx +++ b/app/client/components/export-dialog.tsx @@ -224,7 +224,7 @@ export function ExportDialog({

- Include the hashed admin password for seamless migration. The password is already securely + Include the hashed user passwords for seamless migration. The passwords are already securely hashed (argon2).

diff --git a/app/server/modules/lifecycle/config-export.dto.ts b/app/server/modules/lifecycle/config-export.dto.ts index 0d4399d1..f7a57561 100644 --- a/app/server/modules/lifecycle/config-export.dto.ts +++ b/app/server/modules/lifecycle/config-export.dto.ts @@ -10,9 +10,9 @@ export const fullExportBodySchema = type({ "secretsMode?": secretsModeSchema, /** Password required for authentication */ password: "string", - /** Include the recovery key (requires password) */ + /** Include the recovery key */ "includeRecoveryKey?": "boolean", - /** Include the admin password hash */ + /** Include the user password hash */ "includePasswordHash?": "boolean", }); @@ -55,7 +55,7 @@ export const fullExportDto = describeRoute({ }, }, 401: { - description: "Password required for sensitive export options", + description: "Password required for export or authentication failed", content: { "application/json": { schema: resolver(errorResponseSchema),