refactoring part 1: camelcase naming, token vs pw naming

This commit is contained in:
2025-07-16 09:39:02 +02:00
parent b8e5031669
commit 34d5034a71
9 changed files with 96 additions and 91 deletions

View File

@@ -19,18 +19,18 @@ export function decryptToken(token: string) {
}
export function authenticate(user, pass) {
let token;
let JWTToken;
// hash user password
let hashed_pw = new jsSHA('SHA-512', 'TEXT').update(pass).getHash('HEX');
let hashedPW = new jsSHA('SHA-512', 'TEXT').update(pass).getHash('HEX');
let get_usr_stmt = 'SELECT name, pw FROM users WHERE name = ?';
const row = db.prepare(get_usr_stmt).get(user);
let stored_pw = row.pw;
let getUserSQLStmt = 'SELECT name, pw FROM users WHERE name = ?';
const row = db.prepare(getUserSQLStmt).get(user);
let storedPW = row.pw;
if (hashed_pw && hashed_pw === stored_pw) {
token = createToken({ id: user, admin: true });
if (hashedPW && hashedPW === storedPW) {
JWTToken = createToken({ id: user, admin: true });
}
return token;
return JWTToken;
}

View File

@@ -28,23 +28,28 @@ export const getVorgangByCaseId = async (caseId: string) => {
/**
* Get Vorgang
* @param caseId
* @param caseToken
* @returns caseObj with keys `token`, `name`, `pw` || undefined
*/
export const getVorgang = function (caseId: string) {
let getVorgang_stmt = `SELECT token, name, pw FROM cases WHERE token = ?`;
const stmt = db.prepare(getVorgang_stmt);
const res = stmt.get(caseId);
export const getVorgangByToken = function (caseToken: string) {
let getVorgangSQLStmt = `SELECT token, name, pw FROM cases WHERE token = ?`;
const statement = db.prepare(getVorgangSQLStmt);
const result = statement.get(caseToken);
return res;
return result;
};
/**
* Get Vorgang
* @param caseName
* @returns caseObj with keys `token`, `name`, `pw` || undefined
*/
export const getVorgangByName = function (caseName: string) {
let getVorgangByName_stmt = `SELECT token, name, pw FROM cases WHERE name = ?`;
const stmt = db.prepare(getVorgangByName_stmt);
const res = stmt.get(caseName);
let getVorgangByNameSQLStmt = `SELECT token, name, pw FROM cases WHERE name = ?`;
const statement = db.prepare(getVorgangByNameSQLStmt);
const result = statement.get(caseName);
return res;
return result;
};
/**
@@ -53,9 +58,9 @@ export const getVorgangByName = function (caseName: string) {
* @returns int: number of changes
*/
export const deleteVorgangByName = function (caseName: string) {
let delete_stmt = 'DELETE FROM cases WHERE name = ?';
const stmt = db.prepare(delete_stmt);
const info = stmt.run(caseName);
let deleteSQLStmt = 'DELETE FROM cases WHERE name = ?';
const statement = db.prepare(deleteSQLStmt);
const info = statement.run(caseName);
return info.changes;
};
@@ -84,11 +89,11 @@ export const getListOfVorgänge = async () => {
* @returns list with of available cases
*/
export const getVorgaenge = function () {
let getVorgaenge_stmt = `SELECT token, name, pw from cases`;
const stmt = db.prepare(getVorgaenge_stmt);
const res = stmt.all();
let getVorgaengeSQLStmt = `SELECT token, name, pw from cases`;
const statement = db.prepare(getVorgaengeSQLStmt);
const result = statement.all();
const vorgaenge_list = [];
for (const r of res) {
for (const r of result) {
const vorg = { token: r.token, name: r.name, pw: r.pw };
vorgaenge_list.push(vorg);
}
@@ -121,11 +126,11 @@ export const checkIfVorgangExists = async (caseId: string | null) => {
return true;
};
export const vorgangExists = function (caseId: string | null) {
if (!caseId) {
export const vorgangExists = function (caseToken: string | null) {
if (!caseToken) {
return fail(400, {
success: false,
caseId,
caseId: caseToken,
error: { message: 'Die Vorgangsnummer darf nicht leer sein.' }
});
}
@@ -133,16 +138,16 @@ export const vorgangExists = function (caseId: string | null) {
let vorgaenge = getVorgaenge();
const vorgaenge_tokens = vorgaenge.map((vorg) => vorg.token);
const found = vorgaenge_tokens.indexOf(caseId) != -1;
const found = vorgaenge_tokens.indexOf(caseToken) != -1;
return found;
};
export const vorgangNameExists = function (caseName: string) {
let vorgaenge = getVorgaenge();
const vorgaenge_names = vorgaenge.map((vorg) => vorg.name);
const vorgaengeNames = vorgaenge.map((vorg) => vorg.name);
const found = vorgaenge_names.indexOf(caseName) != -1;
const found = vorgaengeNames.indexOf(caseName) != -1;
return found;
};
@@ -174,7 +179,7 @@ export const tokenValid = function (caseId, caseToken) {
return false;
}
const vorg = getVorgang(caseId);
const vorg = getVorgangByToken(caseId);
if (!vorg || vorg.pw !== caseToken) {
return false;