diff --git a/server/auth.js b/server/auth.js index f87099c..ae647a5 100644 --- a/server/auth.js +++ b/server/auth.js @@ -53,7 +53,6 @@ module.exports = async (req, res, next) => { // skip auth for pub resources // handle login and register paths if ( req.originalUrl.startsWith("/pub/") ){ - console.log("pub"); next(); return; } if ( req.method == "GET" && req.originalUrl == "/login" ){ diff --git a/server/dao.js b/server/dao.js index b4654e4..73e3e91 100644 --- a/server/dao.js +++ b/server/dao.js @@ -1,5 +1,7 @@ const betterSqlite3 = require('better-sqlite3'); const fs = require('fs').promises; +const crypto = require('crypto'); +const conf = require('./conf.js'); let db = null; @@ -261,15 +263,15 @@ async function init(path){ let pins = db.prepare(`SELECT * FROM pins`).all(); - if ( require("fs").existsSync(`${IMAGE_PATH}`) ){ - let userdirs = await fs.readdir(IMAGE_PATH); + if ( require("fs").existsSync(conf.getImagePath()) ){ + let userdirs = await fs.readdir(conf.getImagePath()); console.log(" migrating images"); for ( let i = 0; i < userdirs.length; ++i ){ - if ( require("fs").existsSync(`${IMAGE_PATH}/${userdirs[i]}/images/originals`) ){ - await fs.rename(`${IMAGE_PATH}/${userdirs[i]}/images/originals`, `${IMAGE_PATH}/${userdirs[i]}/images/o`); + if ( require("fs").existsSync(`${conf.getImagePath()}/${userdirs[i]}/images/originals`) ){ + await fs.rename(`${conf.getImagePath()}/${userdirs[i]}/images/originals`, `${conf.getImagePath()}/${userdirs[i]}/images/o`); } - if ( require("fs").existsSync(`${IMAGE_PATH}/${userdirs[i]}/images/thumbnails`) ){ - await fs.rename(`${IMAGE_PATH}/${userdirs[i]}/images/thumbnails`, `${IMAGE_PATH}/${userdirs[i]}/images/400`); + if ( require("fs").existsSync(`${conf.getImagePath()}/${userdirs[i]}/images/thumbnails`) ){ + await fs.rename(`${conf.getImagePath()}/${userdirs[i]}/images/thumbnails`, `${conf.getImagePath()}/${userdirs[i]}/images/400`); } } }