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

refactored backend to use new naming convention for modules

Browse Source
This commit is contained in:
azivner
2018-04-01 21:27:46 -04:00
parent c765dbc5cf
commit e2921a648d
44 changed files with 305 additions and 310 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2,10 +2,10 @@
const options = require('../../services/options');
const utils = require('../../services/utils');
const source_id = require('../../services/source_id');
const password_encryption = require('../../services/password_encryption');
const protected_session = require('../../services/protected_session');
const app_info = require('../../services/app_info');
const sourceIdService = require('../../services/source_id');
const passwordEncryptionService = require('../../services/password_encryption');
const protectedSessionService = require('../../services/protected_session');
const appInfo = require('../../services/app_info');
async function loginSync(req) {
const timestampStr = req.body.timestamp;
@@ -20,8 +20,8 @@ async function loginSync(req) {
const dbVersion = req.body.dbVersion;
if (dbVersion !== app_info.db_version) {
return [400, { message: 'Non-matching db versions, local is version ' + app_info.db_version }];
if (dbVersion !== appInfo.db_version) {
return [400, { message: 'Non-matching db versions, local is version ' + appInfo.db_version }];
}
const documentSecret = await options.getOption('document_secret');
@@ -36,23 +36,23 @@ async function loginSync(req) {
req.session.loggedIn = true;
return {
sourceId: source_id.getCurrentSourceId()
sourceId: sourceIdService.getCurrentSourceId()
};
}
async function loginToProtectedSession(req) {
const password = req.body.password;
if (!await password_encryption.verifyPassword(password)) {
if (!await passwordEncryptionService.verifyPassword(password)) {
return {
success: false,
message: "Given current password doesn't match hash"
};
}
const decryptedDataKey = await password_encryption.getDataKey(password);
const decryptedDataKey = await passwordEncryptionService.getDataKey(password);
const protectedSessionId = protected_session.setDataKey(req, decryptedDataKey);
const protectedSessionId = protectedSessionService.setDataKey(req, decryptedDataKey);
return {
success: true,