Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions src/constants/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,13 @@ export type HttpErrorCodes = {
OK: number;
FORBIDDEN: number;
BAD_REQUEST: number;
NOT_FOUND: number;
UNAUTHORIZED: number;
TOO_MANY_REQS: number;
SOMETHING_WRONG: number;
MOVED_PERMANENTLY: number;
SUPPORT_DOC: number;
SERVER_ERROR: number;
};
export type ConstantType = {
AXIOS_TIMEOUT: number;
Expand Down Expand Up @@ -36,11 +38,13 @@ export const constants: ConstantType = {
OK: 200,
FORBIDDEN: 403,
BAD_REQUEST: 400,
NOT_FOUND: 404,
UNAUTHORIZED: 401,
TOO_MANY_REQS: 429,
SOMETHING_WRONG: 501,
MOVED_PERMANENTLY: 301,
SUPPORT_DOC: 294,
SERVER_ERROR: 500,
},
HTTP_TEXTS: {
INTERNAL_ERROR: "Internal server error, please try again later.",
Expand Down
17 changes: 9 additions & 8 deletions src/controllers/auth.controller.ts
Original file line number Diff line number Diff line change
@@ -1,24 +1,25 @@
import { Request, Response } from "express";
import { NextFunction, Request, Response } from "express";
import { userService } from "../services/auth.service";
import { constants } from "../constants";
const login = async (req: Request, res: Response) => {
const login = async (req: Request, res: Response, next: NextFunction) => {
try {
const resp = await userService.login(req);
res.status(resp?.status).json(resp?.data);
} catch (error) {
console.error(error);
res
.status(constants.HTTP_CODES.SOMETHING_WRONG)
.json({ message: constants.HTTP_TEXTS.INTERNAL_ERROR });
next(error);
}
};
const getUserProfile = async (req: Request, res: Response) => {
const getUserProfile = async (
req: Request,
res: Response,
next: NextFunction
) => {
try {
const user = await userService.getUserProfile(req);
res.status(200).json(user);
} catch (error) {
console.error(error);
res.status(500).json({ message: "Internal Server Error" });
next(error);
}
};

Expand Down
20 changes: 20 additions & 0 deletions src/middlewares/error.middleware.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
import { NextFunction, Request, Response } from "express";
import { AppError } from "../utils/custom-errors.utils";

export const errorMiddleware = (
err: Error,
req: Request,
res: Response,
next: NextFunction
) => {
if (err instanceof AppError) {
res
.status(err.statusCode)
.json({ error: { code: err.statusCode, message: err.message } });
} else {
console.error(err.stack);
res
.status(500)
.json({ error: { code: 500, message: "Internal Server Error" } });
}
};
4 changes: 4 additions & 0 deletions src/server.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import cors from "cors";
import helmet from "helmet";
import authRoutes from "./routes/auth.routes";
import projectRoutes from "./routes/projects.routes";
import { errorMiddleware } from "./middlewares/error.middleware";
import loggerMiddleware from "./middlewares/logger.middleware";

try {
Expand All @@ -24,6 +25,9 @@ try {
app.use("/v2/auth", authRoutes);
app.use("/v2/org", projectRoutes);

// Middleware
app.use(errorMiddleware);

app.use((req: Request, res: Response, next: NextFunction) => {
res.setHeader("Access-Control-Allow-Origin", "*");
res.setHeader(
Expand Down
34 changes: 34 additions & 0 deletions src/utils/custom-errors.utils.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
import { constants } from "../constants";

export class AppError extends Error {
constructor(public statusCode: number, message: string) {
super(message);
Object.setPrototypeOf(this, AppError.prototype);
}
}

export class NotFoundError extends AppError {
constructor(message: string = "Not Found") {
super(constants.HTTP_CODES.NOT_FOUND, message);
}
}

export class BadRequestError extends AppError {
constructor(message: string = "Bad Request") {
super(constants.HTTP_CODES.BAD_REQUEST, message);
}
}

export class DatabaseError extends AppError {
constructor(message: string = "DB error") {
super(constants.HTTP_CODES.SERVER_ERROR, message);
}
}

export class ValidationError extends AppError {
constructor(message: string = "User validation error") {
super(constants.HTTP_CODES.FORBIDDEN, message);
}
}

// Add more custom error classes as needed