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

separate DB connection for each transaction (just for the record, will be reverted probably)

Browse Source
This commit is contained in:
azivner
2017-11-28 17:04:47 -05:00
parent 4d95eb0762
commit fd764f6163
21 changed files with 326 additions and 429 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
services/change_password.js
View File

@@ -17,10 +17,10 @@ async function changePassword(currentPassword, newPassword, req) {
const newPasswordVerificationKey = utils.toBase64(await my_scrypt.getVerificationHash(newPassword));
const decryptedDataKey = await password_encryption.getDataKey(currentPassword);
await sql.doInTransaction(async () => {
await password_encryption.setDataKey(newPassword, decryptedDataKey);
await sql.doInTransaction(async db => {
await password_encryption.setDataKey(db, newPassword, decryptedDataKey);
await options.setOption('password_verification_hash', newPasswordVerificationKey);
await options.setOption(db, 'password_verification_hash', newPasswordVerificationKey);
});
return {