gaschz/trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-03-01 14:22:32 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

server-ts: Convert routes/api/login

Browse Source
This commit is contained in:
Elian Doran 2024-04-06 21:34:34 +03:00
parent b0d6035a67
commit b1744c3867
No known key found for this signature in database
3 changed files with 26 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
src/routes/api/login.js → src/routes/api/login.ts
View File

@ -1,19 +1,20 @@
"use strict"; "use strict";
const options = require('../../services/options'); import options = require('../../services/options');
const utils = require('../../services/utils'); import utils = require('../../services/utils');
const dateUtils = require('../../services/date_utils'); import dateUtils = require('../../services/date_utils');
const instanceId = require('../../services/instance_id'); import instanceId = require('../../services/instance_id');
const passwordEncryptionService = require('../../services/encryption/password_encryption'); import passwordEncryptionService = require('../../services/encryption/password_encryption');
const protectedSessionService = require('../../services/protected_session'); import protectedSessionService = require('../../services/protected_session');
const appInfo = require('../../services/app_info'); import appInfo = require('../../services/app_info');
const eventService = require('../../services/events'); import eventService = require('../../services/events');
const sqlInit = require('../../services/sql_init'); import sqlInit = require('../../services/sql_init');
const sql = require('../../services/sql'); import sql = require('../../services/sql');
const ws = require('../../services/ws'); import ws = require('../../services/ws');
const etapiTokenService = require('../../services/etapi_tokens'); import etapiTokenService = require('../../services/etapi_tokens');
import { Request } from 'express';
function loginSync(req) { function loginSync(req: Request) {
if (!sqlInit.schemaExists()) { if (!sqlInit.schemaExists()) {
return [500, { message: "DB schema does not exist, can't sync." }]; return [500, { message: "DB schema does not exist, can't sync." }];
} }
@ -44,7 +45,7 @@ function loginSync(req) {
return [400, { message: "Sync login credentials are incorrect. It looks like you're trying to sync two different initialized documents which is not possible." }]; return [400, { message: "Sync login credentials are incorrect. It looks like you're trying to sync two different initialized documents which is not possible." }];
} }
req.session.loggedIn = true; (req as any).session.loggedIn = true;
return { return {
instanceId: instanceId, instanceId: instanceId,
@ -52,7 +53,7 @@ function loginSync(req) {
}; };
} }
function loginToProtectedSession(req) { function loginToProtectedSession(req: Request) {
const password = req.body.password; const password = req.body.password;
if (!passwordEncryptionService.verifyPassword(password)) { if (!passwordEncryptionService.verifyPassword(password)) {
@ -63,6 +64,12 @@ function loginToProtectedSession(req) {
} }
const decryptedDataKey = passwordEncryptionService.getDataKey(password); const decryptedDataKey = passwordEncryptionService.getDataKey(password);
if (!decryptedDataKey) {
return {
success: false,
message: "Unable to obtain data key."
}
}
protectedSessionService.setDataKey(decryptedDataKey); protectedSessionService.setDataKey(decryptedDataKey);
@ -87,7 +94,7 @@ function touchProtectedSession() {
protectedSessionService.touchProtectedSession(); protectedSessionService.touchProtectedSession();
} }
function token(req) { function token(req: Request) {
const password = req.body.password; const password = req.body.password;
if (!passwordEncryptionService.verifyPassword(password)) { if (!passwordEncryptionService.verifyPassword(password)) {
@ -102,7 +109,7 @@ function token(req) {
return { token: authToken }; return { token: authToken };
} }
module.exports = { export = {
loginSync, loginSync,
loginToProtectedSession, loginToProtectedSession,
logoutFromProtectedSession, logoutFromProtectedSession,

2
src/routes/routes.js
View File

@ -33,7 +33,7 @@ const recentChangesApiRoute = require('./api/recent_changes.js');
const optionsApiRoute = require('./api/options.js'); const optionsApiRoute = require('./api/options.js');
const passwordApiRoute = require('./api/password'); const passwordApiRoute = require('./api/password');
const syncApiRoute = require('./api/sync'); const syncApiRoute = require('./api/sync');
const loginApiRoute = require('./api/login.js'); const loginApiRoute = require('./api/login');
const recentNotesRoute = require('./api/recent_notes.js'); const recentNotesRoute = require('./api/recent_notes.js');
const appInfoRoute = require('./api/app_info'); const appInfoRoute = require('./api/app_info');
const exportRoute = require('./api/export'); const exportRoute = require('./api/export');

2
src/services/events.ts
View File

@ -44,7 +44,7 @@ function subscribeBeccaLoader(eventTypes: EventType, listener: EventListener) {
} }
} }
function emit(eventType: string, data: any) { function emit(eventType: string, data?: any) {
const listeners = eventListeners[eventType]; const listeners = eventListeners[eventType];
if (listeners) { if (listeners) {