From a42905d63f0058a5d7a5015f51231bffea149b9c Mon Sep 17 00:00:00 2001 From: Christian Kellner Date: Wed, 4 Jun 2025 09:46:07 +0200 Subject: [PATCH] fixing docker ignore issue --- .dockerignore | 1 + lib/services/storage/userStorage.js | 86 +++++++++++++++-------------- 2 files changed, 46 insertions(+), 41 deletions(-) diff --git a/.dockerignore b/.dockerignore index 0dacae7..b40cae6 100644 --- a/.dockerignore +++ b/.dockerignore @@ -2,5 +2,6 @@ node_modules/ npm-debug.log test/ db/ +conf/ .git/ .github/ diff --git a/lib/services/storage/userStorage.js b/lib/services/storage/userStorage.js index a3ffd9d..b39c689 100644 --- a/lib/services/storage/userStorage.js +++ b/lib/services/storage/userStorage.js @@ -1,5 +1,5 @@ import { JSONFileSync } from 'lowdb/node'; -import {config, getDirName} from '../../utils.js'; +import { config, getDirName } from '../../utils.js'; import * as hasher from '../security/hash.js'; import { nanoid } from 'nanoid'; import * as jobStorage from './jobStorage.js'; @@ -7,23 +7,23 @@ import path from 'path'; import LowdashAdapter from './LowDashAdapter.js'; const defaultData = { - user: [ - //you probably want to change the default password ;) - { - id: nanoid(), - lastLogin: Date.now(), - username: 'admin', - password: hasher.hash('admin'), - isAdmin: true, - }, - { - id: nanoid(), - lastLogin: Date.now(), - username: 'demo', - password: hasher.hash('demo'), - isAdmin: true, - }, - ], + user: [ + //you probably want to change the default password ;) + { + id: nanoid(), + lastLogin: Date.now(), + username: 'admin', + password: hasher.hash('admin'), + isAdmin: true, + }, + { + id: nanoid(), + lastLogin: Date.now(), + username: 'demo', + password: hasher.hash('demo'), + isAdmin: true, + }, + ], }; const file = path.join(getDirName(), '../', 'db/users.json'); @@ -86,34 +86,38 @@ export const removeUser = (userId) => { db.chain .set( 'user', - user.filter((u) => u.id !== userId) + user.filter((u) => u.id !== userId), ) .value(); db.write(); }; export const handleDemoUser = () => { - if(!config.demoMode){ - const user = db.chain.get('user').value(); - db.chain.get('user').value(); - db.chain.set('user', user.filter((u) => u.username !== 'demo')).value(); - db.write(); - }else { - const demoUser = db.chain - .get('user') - .filter((u) => u.username === 'demo') - .value(); - if (demoUser == null || demoUser.length === 0) { - db.chain.get('user') - .value() - .push({ - id: nanoid(), - username: 'demo', - password: hasher.hash('demo'), - isAdmin: true, - }); - db.write(); - } + if (!config.demoMode) { + const user = db.chain.get('user').value(); + db.chain + .set( + 'user', + user.filter((u) => u.username !== 'demo'), + ) + .value(); + db.write(); + } else { + const demoUser = db.chain + .get('user') + .filter((u) => u.username === 'demo') + .value(); + if (demoUser == null || demoUser.length === 0) { + db.chain + .get('user') + .value() + .push({ + id: nanoid(), + username: 'demo', + password: hasher.hash('demo'), + isAdmin: true, + }); + db.write(); } + } }; -