summary refs log tree commit diff
path: root/api/src
diff options
context:
space:
mode:
authorFlam3rboy <34555296+Flam3rboy@users.noreply.github.com>2021-10-05 19:34:13 +0200
committerFlam3rboy <34555296+Flam3rboy@users.noreply.github.com>2021-10-05 19:34:13 +0200
commit1492751d58ba74c5525d5f6e846a079ca91ad15f (patch)
treef95db213a836803a64926804a6b9b111bf9b8957 /api/src
parent:sparkles: add User.register() method (diff)
downloadserver-1492751d58ba74c5525d5f6e846a079ca91ad15f.tar.xz
:art: move field error to util
Diffstat (limited to '')
-rw-r--r--api/src/middlewares/ErrorHandler.ts4
-rw-r--r--api/src/util/String.ts2
-rw-r--r--api/src/util/index.ts1
-rw-r--r--api/src/util/route.ts2
-rw-r--r--util/src/util/FieldError.ts (renamed from api/src/util/FieldError.ts)0
5 files changed, 3 insertions, 6 deletions
diff --git a/api/src/middlewares/ErrorHandler.ts b/api/src/middlewares/ErrorHandler.ts

index 96e703ce..2012b91c 100644 --- a/api/src/middlewares/ErrorHandler.ts +++ b/api/src/middlewares/ErrorHandler.ts
@@ -1,8 +1,6 @@ import { NextFunction, Request, Response } from "express"; import { HTTPError } from "lambert-server"; -import { EntityNotFoundError } from "typeorm"; -import { FieldError } from "@fosscord/api"; -import { ApiError } from "@fosscord/util"; +import { ApiError, FieldError } from "@fosscord/util"; const EntityNotFoundErrorRegex = /"(\w+)"/; export function ErrorHandler(error: Error, req: Request, res: Response, next: NextFunction) { diff --git a/api/src/util/String.ts b/api/src/util/String.ts
index 67d87e37..982b7e11 100644 --- a/api/src/util/String.ts +++ b/api/src/util/String.ts
@@ -1,6 +1,6 @@ import { Request } from "express"; import { ntob } from "./Base64"; -import { FieldErrors } from "./FieldError"; +import { FieldErrors } from "@fosscord/util"; export function checkLength(str: string, min: number, max: number, key: string, req: Request) { if (str.length < min || str.length > max) { diff --git a/api/src/util/index.ts b/api/src/util/index.ts
index 3e47ce4e..238787c9 100644 --- a/api/src/util/index.ts +++ b/api/src/util/index.ts
@@ -1,5 +1,4 @@ export * from "./Base64"; -export * from "./FieldError"; export * from "./ipAddress"; export * from "./Message"; export * from "./passwordStrength"; diff --git a/api/src/util/route.ts b/api/src/util/route.ts
index 3e967e2a..e4794eb5 100644 --- a/api/src/util/route.ts +++ b/api/src/util/route.ts
@@ -3,6 +3,7 @@ import { EVENT, Event, EventData, + FieldErrors, FosscordApiErrors, getPermission, PermissionResolvable, @@ -15,7 +16,6 @@ import fs from "fs"; import path from "path"; import Ajv from "ajv"; import { AnyValidateFunction } from "ajv/dist/core"; -import { FieldErrors } from ".."; import addFormats from "ajv-formats"; const SchemaPath = path.join(__dirname, "..", "..", "assets", "schemas.json"); diff --git a/api/src/util/FieldError.ts b/util/src/util/FieldError.ts
index 0b3f93d2..0b3f93d2 100644 --- a/api/src/util/FieldError.ts +++ b/util/src/util/FieldError.ts