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

auth exception for images in electron

Browse Source
This commit is contained in:
azivner
2018-01-07 09:59:05 -05:00
parent 743d72a0c3
commit 8bc2a21d80
2 changed files with 18 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
services/auth.js
View File

@@ -28,6 +28,20 @@ async function checkAuthForMigrationPage(req, res, next) {
}
}
// for electron things which need network stuff
// currently we're doing that for file upload because handling form data seems to be difficult
async function checkApiAuthOrElectron(req, res, next) {
if (!req.session.loggedIn && !utils.isElectron()) {
res.status(401).send("Not authorized");
}
else if (await sql.isDbUpToDate()) {
next();
}
else {
res.status(409).send("Mismatched app versions"); // need better response than that
}
}
async function checkApiAuth(req, res, next) {
if (!req.session.loggedIn) {
res.status(401).send("Not authorized");
@@ -63,5 +77,6 @@ module.exports = {
checkAuthForMigrationPage,
checkApiAuth,
checkApiAuthForMigrationPage,
checkAppNotInitialized
checkAppNotInitialized,
checkApiAuthOrElectron
};