diff --git a/src/attendence.ts b/src/helpers/attendence.ts similarity index 100% rename from src/attendence.ts rename to src/helpers/attendence.ts diff --git a/src/capability.ts b/src/helpers/capability.ts similarity index 100% rename from src/capability.ts rename to src/helpers/capability.ts diff --git a/src/usettings.ts b/src/helpers/usettings.ts similarity index 85% rename from src/usettings.ts rename to src/helpers/usettings.ts index 2cd73e0..c4d06cb 100644 --- a/src/usettings.ts +++ b/src/helpers/usettings.ts @@ -8,6 +8,13 @@ interface IUSettings { sn: string[]; kol: string[]; } + }, + security: { + loginTimeout: { + attempts: number; + time: number; + lockout: number; + } } } diff --git a/src/routes/api/admin/accs.ts b/src/routes/api/admin/accs.ts index d692231..66c8547 100644 --- a/src/routes/api/admin/accs.ts +++ b/src/routes/api/admin/accs.ts @@ -1,7 +1,7 @@ import User from "@schemas/User"; import { Router } from "express" import { Perms, adminCond, adminPerm } from "@/utility"; -import capability from "@/capability"; +import capability from "@/helpers/capability"; import Group from "@/schemas/Group"; const accsRouter = Router() diff --git a/src/routes/api/admin/clean.ts b/src/routes/api/admin/clean.ts index 57deec4..a0f48f6 100644 --- a/src/routes/api/admin/clean.ts +++ b/src/routes/api/admin/clean.ts @@ -1,10 +1,10 @@ import { Router } from "express"; import { Perms, adminPerm } from "@/utility"; -import capability, { Features } from "@/capability"; -import usettings from "@/usettings"; +import capability, { Features } from "@/helpers/capability"; +import usettings from "@/helpers/usettings"; import Grade from "@schemas/Grade"; import User from "@/schemas/User"; -import attendence from "@/attendence"; +import attendence from "@/helpers/attendence"; const cleanRouter = Router() cleanRouter.use(adminPerm(Perms.Clean)) diff --git a/src/routes/api/admin/groups.ts b/src/routes/api/admin/groups.ts index bf1aeeb..6d8957d 100644 --- a/src/routes/api/admin/groups.ts +++ b/src/routes/api/admin/groups.ts @@ -1,7 +1,7 @@ import Group from "@schemas/Group"; import { Router } from "express" import { Perms, adminPerm } from "@/utility"; -import capability, { Features } from "@/capability"; +import capability, { Features } from "@/helpers/capability"; const groupsRouter = Router() diff --git a/src/routes/api/admin/keys.ts b/src/routes/api/admin/keys.ts index 106c57b..c631b2f 100644 --- a/src/routes/api/admin/keys.ts +++ b/src/routes/api/admin/keys.ts @@ -1,7 +1,7 @@ import { Router } from "express"; -import capability, { Features } from "@/capability"; +import capability, { Features } from "@/helpers/capability"; import Key from "@schemas/Key"; -import usettings from "@/usettings"; +import usettings from "@/helpers/usettings"; import User, { IUser } from "@schemas/User"; import { Perms, adminPerm } from "@/utility"; diff --git a/src/routes/api/admin/menu.ts b/src/routes/api/admin/menu.ts index 87ba928..7886fbf 100644 --- a/src/routes/api/admin/menu.ts +++ b/src/routes/api/admin/menu.ts @@ -4,9 +4,9 @@ import multer from "multer" import * as XLSX from "xlsx" import Menu from "@schemas/Menu" import Vote from "@schemas/Vote" -import capability, { Features } from "@/capability" +import capability, { Features } from "@/helpers/capability" import { editorRouter } from "./editor" -import usettings from "@/usettings" +import usettings from "@/helpers/usettings" const menuRouter = Router() diff --git a/src/routes/api/admin/news.ts b/src/routes/api/admin/news.ts index 4e2c2ca..f339838 100644 --- a/src/routes/api/admin/news.ts +++ b/src/routes/api/admin/news.ts @@ -1,7 +1,7 @@ import { Router } from "express"; import News from "@schemas/News" import { Perms, adminPerm } from "@/utility"; -import capability, { Features } from "@/capability"; +import capability, { Features } from "@/helpers/capability"; const newsRouter = Router() diff --git a/src/routes/api/admin/notif.ts b/src/routes/api/admin/notif.ts index c7c9f4f..80164be 100644 --- a/src/routes/api/admin/notif.ts +++ b/src/routes/api/admin/notif.ts @@ -2,7 +2,7 @@ import { Router } from "express"; import { Perms, adminPerm } from "@/utility"; import Group from "@schemas/Group"; import { NotifcationHelper } from "@/notif"; -import capability, { Features } from "@/capability"; +import capability, { Features } from "@/helpers/capability"; const notifRouter = Router() diff --git a/src/routes/api/admin/settings.ts b/src/routes/api/admin/settings.ts index 70d5959..15bc750 100644 --- a/src/routes/api/admin/settings.ts +++ b/src/routes/api/admin/settings.ts @@ -1,6 +1,6 @@ import { Router } from "express"; import { adminPerm, Perms, project } from "@/utility"; -import usettings from "@/usettings"; +import usettings from "@/helpers/usettings"; export const settingsRouter = Router() @@ -11,7 +11,7 @@ settingsRouter.get('/', (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}) }) diff --git a/src/routes/api/appRouter.ts b/src/routes/api/appRouter.ts index 72543d9..1cdc23e 100644 --- a/src/routes/api/appRouter.ts +++ b/src/routes/api/appRouter.ts @@ -4,9 +4,9 @@ import News from "@schemas/News"; import Menu from "@schemas/Menu"; import Vote from "@schemas/Vote"; import { vote } from "@/pipelines/vote"; -import capability, { Features } from "@/capability"; +import capability, { Features } from "@/helpers/capability"; import Key, { IKey } from "@schemas/Key"; -import usettings from "@/usettings"; +import usettings from "@/helpers/usettings"; import Grade from "@schemas/Grade"; import { createHash } from "node:crypto"; const appRouter = Router(); diff --git a/src/routes/auth/index.ts b/src/routes/auth/index.ts index 52db104..b10339e 100644 --- a/src/routes/auth/index.ts +++ b/src/routes/auth/index.ts @@ -3,9 +3,8 @@ import passport from "passport"; import User from "@schemas/User"; import { islogged } from "@/utility"; import bcrypt from "bcryptjs" -import cap from "@/capability"; -import usettings from "@/usettings"; -import { readFileSync } from "node:fs"; +import cap from "@/helpers/capability"; +import usettings from "@/helpers/usettings"; import vapidKeys from "@/vapidKeys"; const authRouter = Router() diff --git a/src/routes/index.ts b/src/routes/index.ts index fe18dc7..60e2810 100644 --- a/src/routes/index.ts +++ b/src/routes/index.ts @@ -4,8 +4,7 @@ import { islogged } from "@/utility"; import { adminRouter } from "./api/adminRouter"; import { appRouter } from "./api/appRouter"; import { authRouter } from "./auth/index"; -import { Schema } from 'mongoose' -import capability, { Features } from "@/capability"; +import capability, { Features } from "@/helpers/capability"; const router = Router();