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

fixes for sync

Browse Source
This commit is contained in:
azivner
2017-10-29 14:55:48 -04:00
parent d613200925
commit af13b28cab
7 changed files with 148 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
services/auth.js
View File

@@ -6,8 +6,7 @@ async function checkAuth(req, res, next) {
if (!req.session.loggedIn) {
res.redirect("login");
}
if (await migration.isDbUpToDate()) {
else if (await migration.isDbUpToDate()) {
next();
}
else {
@@ -26,20 +25,19 @@ async function checkAuthWithoutMigration(req, res, next) {
async function checkApiAuth(req, res, next) {
if (!req.session.loggedIn) {
res.sendStatus(401);
res.status(401).send({});
}
if (await migration.isDbUpToDate()) {
else if (await migration.isDbUpToDate()) {
next();
}
else {
res.sendStatus(409); // need better response than that
res.status(409).send({}); // need better response than that
}
}
async function checkApiAuthWithoutMigration(req, res, next) {
if (!req.session.loggedIn) {
res.sendStatus(401);
res.status(401).send({});
}
else {
next();