self-hosted/joplin
1
0
Fork 0
mirror of https://github.com/laurent22/joplin.git synced 2025-07-16 00:14:34 +02:00
Code Issues Releases Activity

All: Improved E2EE usability by making its state a property of the sync target (#5276)

Browse Source
This commit is contained in:
Laurent
2021-08-12 16:54:10 +01:00
committed by GitHub
parent ba3cbfa051
commit dcd5a8d975
102 changed files with 1775 additions and 551 deletions
Download Patch File Download Diff File Expand all files Collapse all files

71
packages/lib/models/MasterKey.ts
View File

@ -1,6 +1,8 @@
import BaseModel from '../BaseModel';
import { MasterKeyEntity } from '../services/database/types';
import { localSyncInfo, saveLocalSyncInfo } from '../services/synchronizer/syncInfoUtils';
import BaseItem from './BaseItem';
import uuid from '../uuid';
export default class MasterKey extends BaseItem {
static tableName() {
@ -15,21 +17,72 @@ export default class MasterKey extends BaseItem {
return false;
}
static latest() {
return this.modelSelectOne('SELECT * FROM master_keys WHERE created_time >= (SELECT max(created_time) FROM master_keys)');
public static latest() {
let output: MasterKeyEntity = null;
const syncInfo = localSyncInfo();
for (const mk of syncInfo.masterKeys) {
if (!output || output.updated_time < mk.updated_time) {
output = mk;
}
}
return output;
// return this.modelSelectOne('SELECT * FROM master_keys WHERE created_time >= (SELECT max(created_time) FROM master_keys)');
}
static allWithoutEncryptionMethod(masterKeys: MasterKeyEntity[], method: number) {
return masterKeys.filter(m => m.encryption_method !== method);
}
static async save(o: MasterKeyEntity, options: any = null) {
return super.save(o, options).then(item => {
this.dispatch({
type: 'MASTERKEY_UPDATE_ONE',
item: item,
});
return item;
public static async all(): Promise<MasterKeyEntity[]> {
return localSyncInfo().masterKeys;
}
public static async allIds(): Promise<string[]> {
return localSyncInfo().masterKeys.map(k => k.id);
}
public static async count(): Promise<number> {
return localSyncInfo().masterKeys.length;
}
public static async load(id: string): Promise<MasterKeyEntity> {
return localSyncInfo().masterKeys.find(mk => mk.id === id);
}
public static async save(o: MasterKeyEntity): Promise<MasterKeyEntity> {
const syncInfo = localSyncInfo();
const masterKey = { ...o };
if (!masterKey.id) {
masterKey.id = uuid.create();
masterKey.created_time = Date.now();
}
masterKey.updated_time = Date.now();
const idx = syncInfo.masterKeys.findIndex(mk => mk.id === masterKey.id);
if (idx >= 0) {
syncInfo.masterKeys[idx] = masterKey;
} else {
syncInfo.masterKeys.push(masterKey);
}
saveLocalSyncInfo(syncInfo);
this.dispatch({
type: 'MASTERKEY_UPDATE_ONE',
item: masterKey,
});
return masterKey;
// return super.save(o, options).then(item => {
// this.dispatch({
// type: 'MASTERKEY_UPDATE_ONE',
// item: item,
// });
// return item;
// });
}
}