External/fredy
1
0
Fork 0
mirror of https://github.com/orangecoding/fredy.git synced 2026-06-16 12:31:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixing docker ignore issue

Browse Source
This commit is contained in:
Christian Kellner
2025-06-04 09:46:07 +02:00
parent 9917491728
commit a42905d63f
2 changed files with 46 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.dockerignore
View File

@@ -2,5 +2,6 @@ node_modules/
npm-debug.log npm-debug.log
test/ test/
db/ db/
conf/
.git/ .git/
.github/ .github/

86
lib/services/storage/userStorage.js
View File

@@ -1,5 +1,5 @@
import { JSONFileSync } from 'lowdb/node'; 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 * as hasher from '../security/hash.js';
import { nanoid } from 'nanoid'; import { nanoid } from 'nanoid';
import * as jobStorage from './jobStorage.js'; import * as jobStorage from './jobStorage.js';
@@ -7,23 +7,23 @@ import path from 'path';
import LowdashAdapter from './LowDashAdapter.js'; import LowdashAdapter from './LowDashAdapter.js';
const defaultData = { const defaultData = {
user: [ user: [
//you probably want to change the default password ;) //you probably want to change the default password ;)
{ {
id: nanoid(), id: nanoid(),
lastLogin: Date.now(), lastLogin: Date.now(),
username: 'admin', username: 'admin',
password: hasher.hash('admin'), password: hasher.hash('admin'),
isAdmin: true, isAdmin: true,
}, },
{ {
id: nanoid(), id: nanoid(),
lastLogin: Date.now(), lastLogin: Date.now(),
username: 'demo', username: 'demo',
password: hasher.hash('demo'), password: hasher.hash('demo'),
isAdmin: true, isAdmin: true,
}, },
], ],
}; };
const file = path.join(getDirName(), '../', 'db/users.json'); const file = path.join(getDirName(), '../', 'db/users.json');
@@ -86,34 +86,38 @@ export const removeUser = (userId) => {
db.chain db.chain
.set( .set(
'user', 'user',
user.filter((u) => u.id !== userId) user.filter((u) => u.id !== userId),
) )
.value(); .value();
db.write(); db.write();
}; };
export const handleDemoUser = () => { export const handleDemoUser = () => {
if(!config.demoMode){ if (!config.demoMode) {
const user = db.chain.get('user').value(); const user = db.chain.get('user').value();
db.chain.get('user').value(); db.chain
db.chain.set('user', user.filter((u) => u.username !== 'demo')).value(); .set(
db.write(); 'user',
}else { user.filter((u) => u.username !== 'demo'),
const demoUser = db.chain )
.get('user') .value();
.filter((u) => u.username === 'demo') db.write();
.value(); } else {
if (demoUser == null || demoUser.length === 0) { const demoUser = db.chain
db.chain.get('user') .get('user')
.value() .filter((u) => u.username === 'demo')
.push({ .value();
id: nanoid(), if (demoUser == null || demoUser.length === 0) {
username: 'demo', db.chain
password: hasher.hash('demo'), .get('user')
isAdmin: true, .value()
}); .push({
db.write(); id: nanoid(),
} username: 'demo',
password: hasher.hash('demo'),
isAdmin: true,
});
db.write();
} }
}
}; };