Skip to content

Commit 0e5f568

Browse files
ZhaoJiSenOmX
andcommitted
Keep the empty-password account fix scoped to issue 17614
The first PR commit mixed SFTP file-manager credential changes with the authorized account flow. Restore SFTP-specific files and behavior to dev while retaining password and SSH-key input for hosted accounts without stored secrets. The original SFTP implementation remains available on the local wip/sftp-temporary-credentials branch for a separate submission. Constraint: Issue jumpserver/jumpserver#17614 covers authorized empty-password account connections, not SFTP file-manager behavior Rejected: Keep SFTP changes in this PR | they belong in a separate follow-up Confidence: high Scope-risk: moderate Tested: 85 focused Vitest tests; pnpm test:web (995 passed, 14 skipped); pnpm typecheck:web; pnpm typecheck:electron; pnpm lint:check; git diff --cached --check Not-tested: Web Proxy tests, per user request Related: jumpserver/jumpserver#17614 Co-authored-by: OmX <omx@oh-my-codex.dev>
1 parent 9d6ce93 commit 0e5f568

26 files changed

Lines changed: 154 additions & 203 deletions

‎i18n/locales/en.json‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1177,7 +1177,6 @@
11771177
"UpdatePersonalCredential": "Update saved password",
11781178
"CancelPersonalCredentialUpdate": "Cancel password update",
11791179
"UseSavedPassword": "The saved password will be used",
1180-
"UseSavedSecret": "The saved credential will be used",
11811180
"LoadPersonalCredentialsFailed": "Saved credentials could not be loaded. You can still enter one manually.",
11821181
"ShowPassword": "Show password",
11831182
"HidePassword": "Hide password"

‎i18n/locales/es.json‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1177,7 +1177,6 @@
11771177
"UpdatePersonalCredential": "Actualizar la contraseña guardada",
11781178
"CancelPersonalCredentialUpdate": "Cancelar la actualización de contraseña",
11791179
"UseSavedPassword": "Se utilizará la contraseña guardada",
1180-
"UseSavedSecret": "The saved credential will be used",
11811180
"LoadPersonalCredentialsFailed": "No se pudieron cargar las credenciales guardadas. Aún puede introducir una manualmente.",
11821181
"ShowPassword": "Mostrar contraseña",
11831182
"HidePassword": "Ocultar contraseña"

‎i18n/locales/fr.json‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1177,7 +1177,6 @@
11771177
"UpdatePersonalCredential": "Modifier le mot de passe enregistré",
11781178
"CancelPersonalCredentialUpdate": "Annuler la modification du mot de passe",
11791179
"UseSavedPassword": "Le mot de passe enregistré sera utilisé",
1180-
"UseSavedSecret": "The saved credential will be used",
11811180
"LoadPersonalCredentialsFailed": "Impossible de charger les identifiants enregistrés. Vous pouvez toujours en saisir un manuellement.",
11821181
"ShowPassword": "Afficher le mot de passe",
11831182
"HidePassword": "Masquer le mot de passe"

‎i18n/locales/ja.json‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1177,7 +1177,6 @@
11771177
"UpdatePersonalCredential": "保存済みパスワードを更新",
11781178
"CancelPersonalCredentialUpdate": "パスワード更新をキャンセル",
11791179
"UseSavedPassword": "保存済みのパスワードを使用します",
1180-
"UseSavedSecret": "The saved credential will be used",
11811180
"LoadPersonalCredentialsFailed": "保存済みの認証情報を読み込めませんでした。手動入力は引き続き利用できます。",
11821181
"ShowPassword": "パスワードを表示",
11831182
"HidePassword": "パスワードを非表示"

‎i18n/locales/ko.json‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1177,7 +1177,6 @@
11771177
"UpdatePersonalCredential": "저장된 비밀번호 업데이트",
11781178
"CancelPersonalCredentialUpdate": "비밀번호 업데이트 취소",
11791179
"UseSavedPassword": "저장된 비밀번호를 사용합니다",
1180-
"UseSavedSecret": "The saved credential will be used",
11811180
"LoadPersonalCredentialsFailed": "저장된 자격 증명을 불러오지 못했습니다. 계속 직접 입력할 수 있습니다.",
11821181
"ShowPassword": "비밀번호 표시",
11831182
"HidePassword": "비밀번호 숨기기"

‎i18n/locales/pt_br.json‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1177,7 +1177,6 @@
11771177
"UpdatePersonalCredential": "Atualizar a senha salva",
11781178
"CancelPersonalCredentialUpdate": "Cancelar atualização de senha",
11791179
"UseSavedPassword": "A senha salva será usada",
1180-
"UseSavedSecret": "The saved credential will be used",
11811180
"LoadPersonalCredentialsFailed": "Não foi possível carregar as credenciais salvas. Você ainda pode inserir uma manualmente.",
11821181
"ShowPassword": "Mostrar senha",
11831182
"HidePassword": "Ocultar senha"

‎i18n/locales/ru.json‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1177,7 +1177,6 @@
11771177
"UpdatePersonalCredential": "Обновить сохраненный пароль",
11781178
"CancelPersonalCredentialUpdate": "Отменить обновление пароля",
11791179
"UseSavedPassword": "Будет использован сохраненный пароль",
1180-
"UseSavedSecret": "The saved credential will be used",
11811180
"LoadPersonalCredentialsFailed": "Не удалось загрузить сохраненные учетные данные. Вы по-прежнему можете ввести их вручную.",
11821181
"ShowPassword": "Показать пароль",
11831182
"HidePassword": "Скрыть пароль"

‎i18n/locales/vi.json‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1177,7 +1177,6 @@
11771177
"UpdatePersonalCredential": "Cập nhật mật khẩu đã lưu",
11781178
"CancelPersonalCredentialUpdate": "Hủy cập nhật mật khẩu",
11791179
"UseSavedPassword": "Mật khẩu đã lưu sẽ được sử dụng",
1180-
"UseSavedSecret": "The saved credential will be used",
11811180
"LoadPersonalCredentialsFailed": "Không thể tải thông tin xác thực đã lưu. Bạn vẫn có thể nhập thủ công.",
11821181
"ShowPassword": "Hiện mật khẩu",
11831182
"HidePassword": "Ẩn mật khẩu"

‎i18n/locales/zh.json‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1177,7 +1177,6 @@
11771177
"UpdatePersonalCredential": "更新已保存密码",
11781178
"CancelPersonalCredentialUpdate": "取消更新密码",
11791179
"UseSavedPassword": "将使用已保存的密码",
1180-
"UseSavedSecret": "将使用已保存的凭据",
11811180
"LoadPersonalCredentialsFailed": "无法加载已保存凭据,仍可手动输入。",
11821181
"ShowPassword": "显示密码",
11831182
"HidePassword": "隐藏密码"

‎i18n/locales/zh_hant.json‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1177,7 +1177,6 @@
11771177
"UpdatePersonalCredential": "更新已儲存密碼",
11781178
"CancelPersonalCredentialUpdate": "取消更新密碼",
11791179
"UseSavedPassword": "將使用已儲存的密碼",
1180-
"UseSavedSecret": "The saved credential will be used",
11811180
"LoadPersonalCredentialsFailed": "無法載入已儲存憑據,仍可手動輸入。",
11821181
"ShowPassword": "顯示密碼",
11831182
"HidePassword": "隱藏密碼"

0 commit comments

Comments
 (0)