From ee219e1d96c43c103a12ff15dc361390c5ad489d Mon Sep 17 00:00:00 2001 From: naielv <109038805+naielv@users.noreply.github.com> Date: Thu, 25 Dec 2025 19:29:16 +0100 Subject: [PATCH] update --- src/app_modules.js | 28 +++++++++++++++++++--------- src/page/login.js | 4 ++-- 2 files changed, 21 insertions(+), 11 deletions(-) diff --git a/src/app_modules.js b/src/app_modules.js index d465a34..c55837d 100644 --- a/src/app_modules.js +++ b/src/app_modules.js @@ -574,21 +574,27 @@ function TS_decrypt(input, secret, callback, table, id) { decryptedUtf8 = words.toString(CryptoJS.enc.Latin1); } catch (latinErr) { console.warn('TS_decrypt: failed to decode decrypted bytes', utfErr, latinErr); - try { callback(input, false); } catch (ee) { } + try { callback(input, "error"); } catch (ee) { } return; } } var parsed = null; - try { parsed = JSON.parse(decryptedUtf8); } catch (pe) { parsed = decryptedUtf8; } + try { + parsed = JSON.parse(decryptedUtf8); + } catch (pe) { + parsed = decryptedUtf8; + try { callback(parsed, "error2"); } catch (ee) { console.error(ee); } + return; + } try { callback(parsed, true); } catch (e) { console.error(e); } // Keep encrypted at-rest: if table/id provided, ensure DB stores encrypted payload (input) - if (table && id && window.DB && DB.put) { - DB.put(table, id, input).catch(() => {}); - } + // if (table && id && window.DB && DB.put) { + // DB.put(table, id, input).catch(() => {}); + // } return; } catch (e) { console.error('TS_decrypt: invalid encrypted payload', e); - try { callback(input, false); } catch (ee) { } + try { callback(input, "error"); } catch (ee) { } return; } } @@ -893,9 +899,13 @@ function TS_IndexElement( switch (key.type) { case "_encrypted": { const tdEncrypted = document.createElement("td"); - tdEncrypted.innerText = data["_encrypted__"] - ? "🔒" - : ""; + if (data["_encrypted__"] === true) { + tdEncrypted.innerText = "🔒" + } else if (data["_encrypted__"] === "error" || data["_encrypted__"] === "error2" || data["_encrypted__"] === undefined) { + tdEncrypted.innerText = "⚠️ Error"; + } else { + tdEncrypted.innerText = ""; + } new_tr.appendChild(tdEncrypted); break; } diff --git a/src/page/login.js b/src/page/login.js index 732cec0..1ab0a9c 100644 --- a/src/page/login.js +++ b/src/page/login.js @@ -41,8 +41,8 @@ PAGES.login = { localStorage.setItem('TELESEC_COUCH_DBNAME', dbname); localStorage.setItem('TELESEC_COUCH_USER', user); localStorage.setItem('TELESEC_COUCH_PASS', pass); - localStorage.setItem('TELESEC_SECRET', secret); - SECRET = secret; + localStorage.setItem('TELESEC_SECRET', secret.toUpperCase()); + SECRET = secret.toUpperCase(); try { DB.init({ secret: SECRET, remoteServer: "https://" + url, username: user, password: pass, dbname: dbname || undefined }); toastr.success('Iniciando sincronización con CouchDB');