diff --git a/package.json b/package.json index f713f16..88920f5 100644 --- a/package.json +++ b/package.json @@ -24,8 +24,6 @@ "bootstrap": "^5.3.1", "bootstrap-vue-next": "^0.9.26", "buffer": "^6.0.3", - "class-transformer": "^0.5.1", - "class-validator": "^0.14.0", "date-fns": "^2.30.0", "dotenv": "^16.3.1", "eventemitter3": "^5.0.1", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index bcf0899..0a74bab 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -23,12 +23,6 @@ dependencies: buffer: specifier: ^6.0.3 version: 6.0.3 - class-transformer: - specifier: ^0.5.1 - version: 0.5.1 - class-validator: - specifier: ^0.14.0 - version: 0.14.0 date-fns: specifier: ^2.30.0 version: 2.30.0 @@ -675,10 +669,6 @@ packages: '@types/node': 18.17.0 dev: true - /@types/validator@13.9.0: - resolution: {integrity: sha512-NclP0IbzHj/4tJZKFqKh8E7kZdgss+MCUYV9G+TLltFfDA4lFgE4PKPpDIyS2FlcdANIfSx273emkupvChigbw==} - dev: false - /@types/web-bluetooth@0.0.17: resolution: {integrity: sha512-4p9vcSmxAayx72yn70joFoL44c9MO/0+iVEBIQXe3v2h2SiAsEIo/G5v6ObFWvNKRFjbrVadNf9LqEEZeQPzdA==} dev: false @@ -1243,18 +1233,6 @@ packages: ansi-styles: 4.3.0 supports-color: 7.2.0 - /class-transformer@0.5.1: - resolution: {integrity: sha512-SQa1Ws6hUbfC98vKGxZH3KFY0Y1lm5Zm0SY8XX9zbK7FJCyVEac3ATW0RIpwzW+oOfmHE5PMPufDG9hCfoEOMw==} - dev: false - - /class-validator@0.14.0: - resolution: {integrity: sha512-ct3ltplN8I9fOwUd8GrP8UQixwff129BkEtuWDKL5W45cQuLd19xqmTLu5ge78YDm/fdje6FMt0hGOhl0lii3A==} - dependencies: - '@types/validator': 13.9.0 - libphonenumber-js: 1.10.39 - validator: 13.11.0 - dev: false - /cli-highlight@2.1.11: resolution: {integrity: sha512-9KDcoEVwyUXrjcJNvHD0NFc/hiwe/WPVYIleQh2O1N2Zro5gWJZ/K+3DGn8w8P/F6FxOgzyC5bxDyHIgCSPhGg==} engines: {node: '>=8.0.0', npm: '>=5.0.0'} @@ -2455,10 +2433,6 @@ packages: type-check: 0.4.0 dev: true - /libphonenumber-js@1.10.39: - resolution: {integrity: sha512-iPMM/NbSNIrdwbr94rAOos6krB7snhfzEptmk/DJUtTPs+P9gOhZ1YXVPcRgjpp3jJByclfm/Igvz45spfJK7g==} - dev: false - /load-json-file@4.0.0: resolution: {integrity: sha512-Kx8hMakjX03tiGTLAIdJ+lL0htKnXjEZN6hk/tozf/WOuYGdZBJrZ+rCJRbVCugsjB3jMLn9746NsQIf5VjBMw==} engines: {node: '>=4'} @@ -3703,11 +3677,6 @@ packages: spdx-expression-parse: 3.0.1 dev: true - /validator@13.11.0: - resolution: {integrity: sha512-Ii+sehpSfZy+At5nPdnyMhx78fEoPDkR2XW/zimHEL3MyGJQOCQ7WeP20jPYRz7ZCpcKLB21NxuXHF3bxjStBQ==} - engines: {node: '>= 0.10'} - dev: false - /vary@1.1.2: resolution: {integrity: sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg==} engines: {node: '>= 0.8'} diff --git a/server/api/Login/LoginByID.ts b/server/api/Login/LoginByID.ts index 7f4c3da..412769d 100644 --- a/server/api/Login/LoginByID.ts +++ b/server/api/Login/LoginByID.ts @@ -2,7 +2,6 @@ import { POST } from "../defs.js"; import type { structure } from "../../apiStructure/sammoRootAPI.js"; import type { ExtractError, ExtractQuery, ExtractResponse } from "../../apiStructure/defs.js"; import { StartSession } from "../ProcDecorator/StartSession.js"; -import { IsString } from "class-validator"; import { delay } from "../../util/delay.js"; import { declProcDecorators } from "../ProcDecorator/base.js"; import { z } from "zod"; diff --git a/server/api/Login/LoginByToken.ts b/server/api/Login/LoginByToken.ts index d470b2c..3d82d9d 100644 --- a/server/api/Login/LoginByToken.ts +++ b/server/api/Login/LoginByToken.ts @@ -2,7 +2,6 @@ import { POST } from "../defs.js"; import type { structure } from "../../apiStructure/sammoRootAPI.js"; import type { ExtractError, ExtractQuery, ExtractResponse } from "../../apiStructure/defs.js"; import { StartSession } from "../ProcDecorator/StartSession.js"; -import { IsNumber, IsString } from "class-validator"; import { delay } from "../../util/delay.js"; import { declProcDecorators } from "../ProcDecorator/base.js"; import { LoginCtx, loginCtxSessionKey } from "../ProcDecorator/ReqLogin.js"; diff --git a/server/index.ts b/server/index.ts index 1800625..b1a6377 100644 --- a/server/index.ts +++ b/server/index.ts @@ -1,6 +1,5 @@ import 'dotenv/config'; import 'reflect-metadata'; -import { validate } from 'class-validator'; import express, { type Request, type Response } from "express" import { AppDataSource } from "./data_source.js" import session from "express-session"; @@ -10,6 +9,7 @@ import { simpleSerialize } from './util/simpleSerialize.js'; import { SammoRootAPI } from './clientAPI/sammoRootAPI.js'; import { buildAPISystem } from './api/generator.js'; import { sammoRootAPI } from './api/root.js'; +import { unwrap } from './util/unwrap.js'; const ownConfig = { sessionSecret: process.env.SESSION_SECRET, @@ -22,7 +22,7 @@ AppDataSource.initialize().then(async () => { const app = express() app.use(express.json()); app.use(session({ - secret: ownConfig.sessionSecret, + secret: unwrap(ownConfig.sessionSecret), resave: false, saveUninitialized: false, }))