diff --git a/src/app.ts b/src/app.ts index f11c23c..588d6a1 100644 --- a/src/app.ts +++ b/src/app.ts @@ -1,31 +1,31 @@ -import consola from "consola"; -import "reflect-metadata"; -import { createExpressServer } from "routing-controllers"; -import authchecker from "./authchecker"; -import { config, e as errors } from './config'; -import loaders from "./loaders/index"; -import { ErrorHandler } from './middlewares/ErrorHandler'; - -const app = createExpressServer({ - authorizationChecker: authchecker, - middlewares: [ErrorHandler], - development: config.development, - cors: true, - routePrefix: "/api", - controllers: [__dirname + "/controllers/*.ts"], -}); - -async function main() { - await loaders(app); - app.listen(config.internal_port, () => { - consola.success( - `⚡️[server]: Server is running at http://localhost:${config.internal_port}` - ); - }); -} -if (errors === 0) { - main(); -} else { - console.log("error"); - // something's wrong -} +import consola from "consola"; +import "reflect-metadata"; +import { createExpressServer } from "routing-controllers"; +import authchecker from "./authchecker"; +import { config, e as errors } from './config'; +import loaders from "./loaders/index"; +import { ErrorHandler } from './middlewares/ErrorHandler'; + +const app = createExpressServer({ + authorizationChecker: authchecker, + middlewares: [ErrorHandler], + development: config.development, + cors: true, + routePrefix: "/api", + controllers: [__dirname + "/controllers/*.ts"], +}); + +async function main() { + await loaders(app); + app.listen(config.internal_port, () => { + consola.success( + `⚡️[server]: Server is running at http://localhost:${config.internal_port}` + ); + }); +} +if (errors === 0) { + main(); +} else { + consola.error("error"); + // something's wrong +} diff --git a/src/authchecker.ts b/src/authchecker.ts index 869e0da..00c84c1 100644 --- a/src/authchecker.ts +++ b/src/authchecker.ts @@ -18,7 +18,6 @@ const authchecker = async (action: Action, permissions: string | string[]) => { try { jwtPayload = jwt.verify(provided_token, config.jwt_secret); } catch (error) { - console.log(error); throw new IllegalJWTError() } const count = await getConnectionManager().get().getRepository(User).count({ id: jwtPayload["userdetails"]["id"], refreshTokenCount: jwtPayload["userdetails"]["refreshTokenCount"] }) diff --git a/src/controllers/RunnerController.ts b/src/controllers/RunnerController.ts index c8dcf3d..bbdf333 100644 --- a/src/controllers/RunnerController.ts +++ b/src/controllers/RunnerController.ts @@ -27,7 +27,6 @@ export class RunnerController { async getAll() { let responseRunners: ResponseRunner[] = new Array(); const runners = await this.runnerRepository.find({ relations: ['scans', 'group'] }); - console.log(runners); runners.forEach(runner => { responseRunners.push(new ResponseRunner(runner)); }); diff --git a/src/controllers/RunnerOrganisationController.ts b/src/controllers/RunnerOrganisationController.ts index 338e21a..8c48496 100644 --- a/src/controllers/RunnerOrganisationController.ts +++ b/src/controllers/RunnerOrganisationController.ts @@ -29,7 +29,6 @@ export class RunnerOrganisationController { async getAll() { let responseTeams: ResponseRunnerOrganisation[] = new Array(); const runners = await this.runnerOrganisationRepository.find({ relations: ['address', 'contact', 'teams'] }); - console.log(runners); runners.forEach(runner => { responseTeams.push(new ResponseRunnerOrganisation(runner)); }); diff --git a/src/controllers/RunnerTeamController.ts b/src/controllers/RunnerTeamController.ts index 9558c3a..3e1212f 100644 --- a/src/controllers/RunnerTeamController.ts +++ b/src/controllers/RunnerTeamController.ts @@ -28,7 +28,6 @@ export class RunnerTeamController { async getAll() { let responseTeams: ResponseRunnerTeam[] = new Array(); const runners = await this.runnerTeamRepository.find({ relations: ['parentGroup', 'contact'] }); - console.log(runners); runners.forEach(runner => { responseTeams.push(new ResponseRunnerTeam(runner)); }); diff --git a/src/models/actions/CreateParticipant.ts b/src/models/actions/CreateParticipant.ts index 2847f13..2a67e3c 100644 --- a/src/models/actions/CreateParticipant.ts +++ b/src/models/actions/CreateParticipant.ts @@ -17,7 +17,7 @@ export abstract class CreateParticipant { * Optional. */ @IsString() - @IsNotEmpty() + @IsOptional() middlename?: string; /**