Tools/Notes
1
0
Fork 0
mirror of https://github.com/TriliumNext/Notes.git synced 2025-07-30 19:52:28 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1655 from TriliumNext/type_sql-transactional

Browse Source 
types: use type variable for sql.transactional's return value
This commit is contained in:
Elian Doran 2025-04-09 12:07:57 +03:00 committed by GitHub
commit c603efb44b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/routes/api/recovery_codes.ts
View File

@ -34,12 +34,10 @@ function getUsedRecoveryCodes() {
const dateRegex = RegExp(/^\d{4}\/\d{2}\/\d{2}T\d{2}:\d{2}:\d{2}.\d{3}Z$/gm); const dateRegex = RegExp(/^\d{4}\/\d{2}\/\d{2}T\d{2}:\d{2}:\d{2}.\d{3}Z$/gm);
const recoveryCodes = recovery_codes.getRecoveryCodes(); const recoveryCodes = recovery_codes.getRecoveryCodes();
const usedStatus: string[] = [];
recoveryCodes.forEach((recoveryKey: string) => { const usedStatus = recoveryCodes.map(recoveryKey => {
if (dateRegex.test(recoveryKey)) usedStatus.push(recoveryKey); return (dateRegex.test(recoveryKey)) ? recoveryKey : String(recoveryCodes.indexOf(recoveryKey))
else usedStatus.push(recoveryCodes.indexOf(recoveryKey)); })
});
return { return {
success: true, success: true,

6
src/services/encryption/recovery_codes.ts
View File

@ -27,7 +27,7 @@ function getRecoveryCodes() {
return [] return []
} }
return sql.transactional(() => { return sql.transactional<string[]>(() => {
const iv = Buffer.from(optionService.getOption('recoveryCodeInitialVector'), 'hex'); const iv = Buffer.from(optionService.getOption('recoveryCodeInitialVector'), 'hex');
const securityKey = Buffer.from(optionService.getOption('recoveryCodeSecurityKey'), 'hex'); const securityKey = Buffer.from(optionService.getOption('recoveryCodeSecurityKey'), 'hex');
const encryptedRecoveryCodes = optionService.getOption('recoveryCodesEncrypted'); const encryptedRecoveryCodes = optionService.getOption('recoveryCodesEncrypted');
@ -41,7 +41,7 @@ function getRecoveryCodes() {
} }
function removeRecoveryCode(usedCode: string) { function removeRecoveryCode(usedCode: string) {
const oldCodes: string[] = getRecoveryCodes(); const oldCodes = getRecoveryCodes();
const today = new Date(); const today = new Date();
oldCodes[oldCodes.indexOf(usedCode)] = today.toJSON().replace(/-/g, '/'); oldCodes[oldCodes.indexOf(usedCode)] = today.toJSON().replace(/-/g, '/');
setRecoveryCodes(oldCodes.toString()); setRecoveryCodes(oldCodes.toString());
@ -55,7 +55,7 @@ function verifyRecoveryCode(recoveryCodeGuess: string) {
const recoveryCodes = getRecoveryCodes(); const recoveryCodes = getRecoveryCodes();
let loginSuccess = false; let loginSuccess = false;
recoveryCodes.forEach((recoveryCode: string) => { recoveryCodes.forEach((recoveryCode) => {
if (recoveryCodeGuess === recoveryCode) { if (recoveryCodeGuess === recoveryCode) {
removeRecoveryCode(recoveryCode); removeRecoveryCode(recoveryCode);
loginSuccess = true; loginSuccess = true;

2
src/services/sql.ts
View File

@ -278,7 +278,7 @@ function transactional<T>(func: (statement: Statement) => T) {
ws.sendTransactionEntityChangesToAllClients(); ws.sendTransactionEntityChangesToAllClients();
} }
return ret; return ret as T;
} catch (e) { } catch (e) {
console.warn("Got error ", e); console.warn("Got error ", e);
const entityChangeIds = cls.getAndClearEntityChangeIds(); const entityChangeIds = cls.getAndClearEntityChangeIds();