fix: moved helpers to separate folder, added security to usettings (part of #3).

This commit is contained in:
2025-05-15 15:58:44 +02:00
parent 8f0f1efb88
commit 9efeba0010
14 changed files with 25 additions and 20 deletions

View File

@@ -8,6 +8,13 @@ interface IUSettings {
sn: string[]; sn: string[];
kol: string[]; kol: string[];
} }
},
security: {
loginTimeout: {
attempts: number;
time: number;
lockout: number;
}
} }
} }

View File

@@ -1,7 +1,7 @@
import User from "@schemas/User"; import User from "@schemas/User";
import { Router } from "express" import { Router } from "express"
import { Perms, adminCond, adminPerm } from "@/utility"; import { Perms, adminCond, adminPerm } from "@/utility";
import capability from "@/capability"; import capability from "@/helpers/capability";
import Group from "@/schemas/Group"; import Group from "@/schemas/Group";
const accsRouter = Router() const accsRouter = Router()

View File

@@ -1,10 +1,10 @@
import { Router } from "express"; import { Router } from "express";
import { Perms, adminPerm } from "@/utility"; import { Perms, adminPerm } from "@/utility";
import capability, { Features } from "@/capability"; import capability, { Features } from "@/helpers/capability";
import usettings from "@/usettings"; import usettings from "@/helpers/usettings";
import Grade from "@schemas/Grade"; import Grade from "@schemas/Grade";
import User from "@/schemas/User"; import User from "@/schemas/User";
import attendence from "@/attendence"; import attendence from "@/helpers/attendence";
const cleanRouter = Router() const cleanRouter = Router()
cleanRouter.use(adminPerm(Perms.Clean)) cleanRouter.use(adminPerm(Perms.Clean))

View File

@@ -1,7 +1,7 @@
import Group from "@schemas/Group"; import Group from "@schemas/Group";
import { Router } from "express" import { Router } from "express"
import { Perms, adminPerm } from "@/utility"; import { Perms, adminPerm } from "@/utility";
import capability, { Features } from "@/capability"; import capability, { Features } from "@/helpers/capability";
const groupsRouter = Router() const groupsRouter = Router()

View File

@@ -1,7 +1,7 @@
import { Router } from "express"; import { Router } from "express";
import capability, { Features } from "@/capability"; import capability, { Features } from "@/helpers/capability";
import Key from "@schemas/Key"; import Key from "@schemas/Key";
import usettings from "@/usettings"; import usettings from "@/helpers/usettings";
import User, { IUser } from "@schemas/User"; import User, { IUser } from "@schemas/User";
import { Perms, adminPerm } from "@/utility"; import { Perms, adminPerm } from "@/utility";

View File

@@ -4,9 +4,9 @@ import multer from "multer"
import * as XLSX from "xlsx" import * as XLSX from "xlsx"
import Menu from "@schemas/Menu" import Menu from "@schemas/Menu"
import Vote from "@schemas/Vote" import Vote from "@schemas/Vote"
import capability, { Features } from "@/capability" import capability, { Features } from "@/helpers/capability"
import { editorRouter } from "./editor" import { editorRouter } from "./editor"
import usettings from "@/usettings" import usettings from "@/helpers/usettings"
const menuRouter = Router() const menuRouter = Router()

View File

@@ -1,7 +1,7 @@
import { Router } from "express"; import { Router } from "express";
import News from "@schemas/News" import News from "@schemas/News"
import { Perms, adminPerm } from "@/utility"; import { Perms, adminPerm } from "@/utility";
import capability, { Features } from "@/capability"; import capability, { Features } from "@/helpers/capability";
const newsRouter = Router() const newsRouter = Router()

View File

@@ -2,7 +2,7 @@ import { Router } from "express";
import { Perms, adminPerm } from "@/utility"; import { Perms, adminPerm } from "@/utility";
import Group from "@schemas/Group"; import Group from "@schemas/Group";
import { NotifcationHelper } from "@/notif"; import { NotifcationHelper } from "@/notif";
import capability, { Features } from "@/capability"; import capability, { Features } from "@/helpers/capability";
const notifRouter = Router() const notifRouter = Router()

View File

@@ -1,6 +1,6 @@
import { Router } from "express"; import { Router } from "express";
import { adminPerm, Perms, project } from "@/utility"; import { adminPerm, Perms, project } from "@/utility";
import usettings from "@/usettings"; import usettings from "@/helpers/usettings";
export const settingsRouter = Router() export const settingsRouter = Router()
@@ -11,7 +11,7 @@ settingsRouter.get('/', (req, res) => {
}) })
settingsRouter.post('/', (req, res) => { settingsRouter.post('/', (req, res) => {
usettings.settings = project(req.body, {keyrooms: true, cleanThings: true, rooms: true, menu: true}) usettings.settings = project(req.body, {keyrooms: true, cleanThings: true, rooms: true, menu: true, security: true})
res.send({status: 200}) res.send({status: 200})
}) })

View File

@@ -4,9 +4,9 @@ import News from "@schemas/News";
import Menu from "@schemas/Menu"; import Menu from "@schemas/Menu";
import Vote from "@schemas/Vote"; import Vote from "@schemas/Vote";
import { vote } from "@/pipelines/vote"; import { vote } from "@/pipelines/vote";
import capability, { Features } from "@/capability"; import capability, { Features } from "@/helpers/capability";
import Key, { IKey } from "@schemas/Key"; import Key, { IKey } from "@schemas/Key";
import usettings from "@/usettings"; import usettings from "@/helpers/usettings";
import Grade from "@schemas/Grade"; import Grade from "@schemas/Grade";
import { createHash } from "node:crypto"; import { createHash } from "node:crypto";
const appRouter = Router(); const appRouter = Router();

View File

@@ -3,9 +3,8 @@ import passport from "passport";
import User from "@schemas/User"; import User from "@schemas/User";
import { islogged } from "@/utility"; import { islogged } from "@/utility";
import bcrypt from "bcryptjs" import bcrypt from "bcryptjs"
import cap from "@/capability"; import cap from "@/helpers/capability";
import usettings from "@/usettings"; import usettings from "@/helpers/usettings";
import { readFileSync } from "node:fs";
import vapidKeys from "@/vapidKeys"; import vapidKeys from "@/vapidKeys";
const authRouter = Router() const authRouter = Router()

View File

@@ -4,8 +4,7 @@ import { islogged } from "@/utility";
import { adminRouter } from "./api/adminRouter"; import { adminRouter } from "./api/adminRouter";
import { appRouter } from "./api/appRouter"; import { appRouter } from "./api/appRouter";
import { authRouter } from "./auth/index"; import { authRouter } from "./auth/index";
import { Schema } from 'mongoose' import capability, { Features } from "@/helpers/capability";
import capability, { Features } from "@/capability";
const router = Router(); const router = Router();