innohub/tatort
7
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactoring part 2: mainly consolidation of token, ids and passwort

Browse Source
This commit is contained in:
Chi Cong Tran
2025-07-17 08:09:17 +02:00
parent 34d5034a71
commit 143bb128a5
10 changed files with 74 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/routes/(angemeldet)/upload/+page.server.ts
View File

@@ -1,11 +1,10 @@
import { Buffer } from 'buffer';
import { Readable } from 'stream';
import { client } from '$lib/minio';
import { fail } from '@sveltejs/kit';
import { v4 as uuidv4 } from 'uuid';
import { db } from '$lib/server/dbService';
import { getVorgangByName, vorgangExists, vorgangNameExists } from '$lib/server/vorgangService';
import { getVorgangByName, vorgangNameExists } from '$lib/server/vorgangService';
const isRequiredFieldValid = (value: unknown) => {
if (value == null) return false;
@@ -18,36 +17,36 @@ const isRequiredFieldValid = (value: unknown) => {
export const actions = {
url: async ({ request }: { request: Request }) => {
const data = await request.formData();
const vorgang = data.get('vorgang');
const name = data.get('name');
const caseName = data.get('vorgang');
const crimeName = data.get('name');
const type = data.get('type');
const pw = data.get('zugangscode');
const password = data.get('password');
const fileName = data.get('fileName');
// store case in database
// skip if Vorgang exists and token not changed
const vorgangExists = vorgangNameExists(vorgang);
const vorgangExists = vorgangNameExists(caseName);
let token;
if (!vorgangExists) {
token = uuidv4();
let insertSQLStmt = `INSERT INTO cases (token, name, pw) VALUES (?, ?, ?)`;
const statement = db.prepare(insertSQLStmt);
statement.run(token, vorgang, pw);
let insertSQLStatement = `INSERT INTO cases (token, name, pw) VALUES (?, ?, ?)`;
const statement = db.prepare(insertSQLStatement);
statement.run(token, caseName, password);
} else {
// vorgang exists
// check if PW was changed, and update DB if it was
const vorg = getVorgangByName(vorg);
const vorg = getVorgangByName(caseName);
token = vorg.token;
if (vorg.pw != pw) {
if (vorg.pw != password) {
let updateSQLStmt = `UPDATE cases SET pw = ? WHERE name = ?`;
const statement = db.prepare(updateSQLStmt);
statement.run(pw, vorg);
statement.run(password, vorg);
}
}
let objectName = `${token}/${name}`;
let objectName = `${token}/${crimeName}`;
switch (type) {
case 'image/png':
if (!objectName.endsWith('.png')) objectName += '.png';
@@ -66,10 +65,9 @@ export const actions = {
const data = Object.fromEntries(requestData);
const vorgang = data.vorgang;
const name = data.name;
const zugangscode = data.zugangscode;
const password = data.password;
let success = true;
const err = {};
if (isRequiredFieldValid(vorgang)) err.vorgang = null;
else {
err.vorgang = 'Das Feld Vorgang darf nicht leer bleiben.';
@@ -82,9 +80,9 @@ export const actions = {
success = false;
}
if (isRequiredFieldValid(zugangscode)) err.zugangscode = null;
if (isRequiredFieldValid(password)) err.password = null;
else {
err.zugangscode = 'Das Feld Zugangscode darf nicht leer bleiben.';
err.password = 'Das Feld Zugangspasswort darf nicht leer bleiben.';
success = false;
}