Dockery/Trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-10-31 02:16:05 +01:00
Code Issues Packages Projects Releases Activity

feat: 🎸 Fix recovery key error

Browse Source
This commit is contained in:
Jin
2025-03-26 02:55:42 +01:00
parent f2a29653b2
commit 979000c5c8
1 changed files with 39 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

65
src/public/app/widgets/type_widgets/options/multi_factor_authentication.ts
View File

@@ -115,9 +115,9 @@ interface TOTPStatus {
interface RecoveryKeysResponse {
success: boolean;
recoveryCodes?: string[];
recoveryCodes?: string;
keysExist?: boolean;
usedRecoveryCodes?: string[];
usedRecoveryCodes?: string;
}
export default class MultiFactorAuthenticationOptions extends OptionsWidget {
@@ -183,10 +183,43 @@ export default class MultiFactorAuthenticationOptions extends OptionsWidget {
}
}
private keyFiller(values: string[]) {
const keys = values.join(",").split(",");
for (let i = 0; i < keys.length; i++) {
this.$recoveryKeys[i].text(keys[i]);
async displayRecoveryKeys() {
const result = await server.get<RecoveryKeysResponse>("totp_recovery/enabled");
if (!result.success) {
this.fillKeys(t("multi_factor_authentication.recovery_keys_error"));
return;
}
if (!result.keysExist) {
this.fillKeys(t("multi_factor_authentication.recovery_keys_no_key_set"));
this.$generateRecoveryCodeButton.text(t("multi_factor_authentication.recovery_keys_generate"));
return;
}
const usedResult = await server.get<RecoveryKeysResponse>("totp_recovery/used");
if (usedResult.usedRecoveryCodes) {
this.keyFiller(usedResult.usedRecoveryCodes);
this.$generateRecoveryCodeButton.text(t("multi_factor_authentication.recovery_keys_regenerate"));
} else {
this.fillKeys(t("multi_factor_authentication.recovery_keys_no_key_set"));
}
}
private keyFiller(values: string) {
const keys = values.split(',').slice(0, 8);
this.fillKeys("");
keys.forEach((key, index) => {
if (index < 8 && key && typeof key === 'string') {
this.$recoveryKeys[index].text(key.trim());
}
});
}
private fillKeys(message: string) {
for (let i = 0; i < 8; i++) {
this.$recoveryKeys[i].text(message);
}
}
@@ -232,24 +265,4 @@ export default class MultiFactorAuthenticationOptions extends OptionsWidget {
});
this.$protectedSessionTimeout.val(Number(options.protectedSessionTimeout));
}
async displayRecoveryKeys() {
const result = await server.get<RecoveryKeysResponse>("totp_recovery/enabled");
if (!result.success) {
this.keyFiller(Array(8).fill(t("multi_factor_authentication.recovery_keys_error")));
return;
}
if (!result.keysExist) {
this.keyFiller(Array(8).fill(t("multi_factor_authentication.recovery_keys_no_key_set")));
this.$generateRecoveryCodeButton.text(t("multi_factor_authentication.recovery_keys_generate"));
return;
}
const usedResult = await server.get<RecoveryKeysResponse>("totp_recovery/used");
if (usedResult.usedRecoveryCodes) {
this.keyFiller(usedResult.usedRecoveryCodes);
this.$generateRecoveryCodeButton.text(t("multi_factor_authentication.recovery_keys_regenerate"));
}
}
}