Merge pull request #44 from TriliumNext/feature/typescript_backend_8

Convert backend to TypeScript (80% -> 81%)
This commit is contained in:
Elian Doran
2024-04-16 21:01:20 +03:00
committed by GitHub
22 changed files with 213 additions and 109 deletions

View File

@@ -8,19 +8,10 @@ import passwordEncryptionService = require('./encryption/password_encryption');
import config = require('./config');
import passwordService = require('./encryption/password');
import type { NextFunction, Request, Response } from 'express';
import { AppRequest } from '../routes/route-interface';
const noAuthentication = config.General && config.General.noAuthentication === true;
interface AppRequest extends Request {
headers: {
authorization?: string;
"trilium-cred"?: string;
}
session: {
loggedIn: boolean;
}
}
function checkAuth(req: AppRequest, res: Response, next: NextFunction) {
if (!sqlInit.isDbInitialized()) {
res.redirect("setup");

View File

@@ -1,7 +1,11 @@
import { Request, Response } from "express";
import AbstractBeccaEntity = require("../becca/entities/abstract_becca_entity");
import BNote = require("../becca/entities/bnote");
export interface ApiParams {
startNote?: BNote;
originEntity?: AbstractBeccaEntity<any>;
pathParams?: string[],
req?: Request,
res?: Response
}

View File

@@ -28,7 +28,7 @@ interface OpmlOutline {
outline: OpmlOutline[];
}
async function importOpml(taskContext: TaskContext, fileBuffer: Buffer, parentNote: BNote) {
async function importOpml(taskContext: TaskContext, fileBuffer: string | Buffer, parentNote: BNote) {
const xml = await new Promise<OpmlXml>(function(resolve, reject)
{
parseString(fileBuffer, function (err: any, result: OpmlXml) {

View File

@@ -7,7 +7,7 @@ import log = require('./log');
const sessionSecretPath = `${dataDir.TRILIUM_DATA_DIR}/session_secret.txt`;
let sessionSecret;
let sessionSecret: string;
const ENCODING = "ascii";