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

Merge remote-tracking branch 'origin/stable'

Browse Source
This commit is contained in:
zadam
2021-04-04 22:03:00 +02:00
parent 2e82b7380b f0cc3d0bcd
commit c71f3c35b8
14 changed files with 55 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/routes/api/login.js
View File

@@ -78,6 +78,12 @@ function loginToProtectedSession(req) {
};
}
function logoutFromProtectedSession() {
protectedSessionService.resetDataKey();
eventService.emit(eventService.LEAVE_PROTECTED_SESSION);
}
function token(req) {
const username = req.body.username;
const password = req.body.password;
@@ -101,5 +107,6 @@ function token(req) {
module.exports = {
loginSync,
loginToProtectedSession,
logoutFromProtectedSession,
token
};

4
src/routes/api/sync.js
View File

@@ -200,9 +200,7 @@ function queueSector(req) {
const entityName = utils.sanitizeSqlIdentifier(req.params.entityName);
const sector = utils.sanitizeSqlIdentifier(req.params.sector);
const entityPrimaryKey = entityConstructor.getEntityFromEntityName(entityName).primaryKeyName;
entityChangesService.addEntityChangesForSector(entityName, entityPrimaryKey, sector);
entityChangesService.addEntityChangesForSector(entityName, sector);
}
module.exports = {