add prettier

mateogalic112 · mateogalic112 · commit 6d6e3fa88e39 · 2024-10-20T12:11:55.000+02:00
diff --git a/.prettierignore b/.prettierignore
@@ -0,0 +1 @@
+yarn.lock
diff --git a/.prettierrc b/.prettierrc
@@ -0,0 +1,6 @@
+{
+  "singleQuote": true,
+  "trailingComma": "all",
+  "printWidth": 100,
+  "singleAttributePerLine": true
+}
diff --git a/package.json b/package.json
@@ -7,7 +7,8 @@
     "prestart": "tsup src/config --onSuccess \"node dist/database.js\"",
     "start": "node dist/server.js",
     "dev": "tsup src/server.ts --watch --onSuccess \"node dist/server.js\"",
-    "build": "tsup"
+    "build": "tsup",
+    "prettier:fix": "npx prettier --write ."
   },
   "keywords": [],
   "author": "",
diff --git a/src/app.ts b/src/app.ts
@@ -1,8 +1,8 @@
-import express from "express";
-import { env } from "config/env";
-import errorMiddleware from "middleware/error.middleware";
-import { type Controller } from "interfaces/controller.interface";
-import cookieParser from "cookie-parser";
+import express from 'express';
+import { env } from 'config/env';
+import errorMiddleware from 'middleware/error.middleware';
+import { type Controller } from 'interfaces/controller.interface';
+import cookieParser from 'cookie-parser';
 
 class App {
   private app: express.Application;
@@ -23,7 +23,7 @@ class App {
 
   private initializeControllers(controllers: Controller[]) {
     controllers.forEach((controller) => {
-      this.app.use("/api/v1", controller.router);
+      this.app.use('/api/v1', controller.router);
     });
   }
 
diff --git a/src/auth/auth.controller.ts b/src/auth/auth.controller.ts
@@ -1,46 +1,34 @@
-import { Request, Response, NextFunction } from "express";
-import validationMiddleware from "middleware/validation.middleware";
-import { loginSchema, registerSchema } from "./auth.validation";
-import { AuthService } from "./auth.service";
-import { Controller } from "interfaces/controller.interface";
-import authMiddleware from "middleware/auth.middleware";
+import { Request, Response, NextFunction } from 'express';
+import validationMiddleware from 'middleware/validation.middleware';
+import { loginSchema, registerSchema } from './auth.validation';
+import { AuthService } from './auth.service';
+import { Controller } from 'interfaces/controller.interface';
+import authMiddleware from 'middleware/auth.middleware';
 
 export class AuthController extends Controller {
   private authService = new AuthService();
 
   constructor() {
-    super("/auth");
+    super('/auth');
     this.initializeRoutes();
   }
 
   protected initializeRoutes() {
-    this.router.post(
-      `${this.path}/register`,
-      validationMiddleware(registerSchema),
-      this.register
-    );
-    this.router.post(
-      `${this.path}/login`,
-      validationMiddleware(loginSchema),
-      this.login
-    );
+    this.router.post(`${this.path}/register`, validationMiddleware(registerSchema), this.register);
+    this.router.post(`${this.path}/login`, validationMiddleware(loginSchema), this.login);
     this.router.get(`${this.path}/me`, authMiddleware, this.isLoggedIn);
     this.router.delete(`${this.path}/logout`, authMiddleware, this.logout);
   }
 
-  private register = async (
-    request: Request,
-    response: Response,
-    next: NextFunction
-  ) => {
+  private register = async (request: Request, response: Response, next: NextFunction) => {
     try {
       const createdUser = await this.authService.registerUser(request.body);
-      if (!createdUser) return next("No user created");
+      if (!createdUser) return next('No user created');
 
       response.cookie(
-        "Authentication",
+        'Authentication',
         this.authService.createToken(createdUser.id),
-        this.authService.createCookieOptions()
+        this.authService.createCookieOptions(),
       );
 
       response.status(201).json(createdUser);
@@ -49,19 +37,15 @@ export class AuthController extends Controller {
     }
   };
 
-  private login = async (
-    request: Request,
-    response: Response,
-    next: NextFunction
-  ) => {
+  private login = async (request: Request, response: Response, next: NextFunction) => {
     try {
       const user = await this.authService.login(request.body);
-      if (!user) return next("No user found");
+      if (!user) return next('No user found');
 
       response.cookie(
-        "Authentication",
+        'Authentication',
         this.authService.createToken(user.id),
-        this.authService.createCookieOptions()
+        this.authService.createCookieOptions(),
       );
 
       response.json(user);
@@ -70,11 +54,7 @@ export class AuthController extends Controller {
     }
   };
 
-  private isLoggedIn = async (
-    request: Request,
-    response: Response,
-    next: NextFunction
-  ) => {
+  private isLoggedIn = async (request: Request, response: Response, next: NextFunction) => {
     try {
       const loggedUser = await this.authService.isLoggedIn(request.userId);
       if (!loggedUser) return next();
@@ -87,7 +67,7 @@ export class AuthController extends Controller {
 
   private logout = (_: Request, response: Response) => {
     response
-      .setHeader("Set-Cookie", ["Authentication=; Max-Age=0; Path=/; HttpOnly"])
+      .setHeader('Set-Cookie', ['Authentication=; Max-Age=0; Path=/; HttpOnly'])
       .status(204)
       .end();
   };
diff --git a/src/auth/auth.repository.ts b/src/auth/auth.repository.ts
@@ -1,28 +1,23 @@
-import pool from "config/database";
-import { RegisterPayload } from "./auth.validation";
-import { User } from "users/users.model";
+import pool from 'config/database';
+import { RegisterPayload } from './auth.validation';
+import { User } from 'users/users.model';
 
 export class AuthRepository {
   public async createUser(payload: RegisterPayload) {
     const result = await pool.query<User>(
-      "INSERT INTO users (username, email, password) VALUES ($1, $2, $3) RETURNING *",
-      [payload.username, payload.email, payload.password]
+      'INSERT INTO users (username, email, password) VALUES ($1, $2, $3) RETURNING *',
+      [payload.username, payload.email, payload.password],
     );
     return result.rows[0];
   }
 
   public async findUserById(id: number) {
-    const result = await pool.query<User>("SELECT * FROM users WHERE id = $1", [
-      id,
-    ]);
+    const result = await pool.query<User>('SELECT * FROM users WHERE id = $1', [id]);
     return result.rows[0];
   }
 
   public async findUserByEmail(email: string) {
-    const result = await pool.query<User>(
-      "SELECT * FROM users WHERE email = $1",
-      [email]
-    );
+    const result = await pool.query<User>('SELECT * FROM users WHERE email = $1', [email]);
     return result.rows[0];
   }
 }
diff --git a/src/auth/auth.service.ts b/src/auth/auth.service.ts
@@ -1,11 +1,11 @@
-import jwt from "jsonwebtoken";
-import bcrypt from "bcrypt";
-import { LoginPayload, RegisterPayload } from "./auth.validation";
-import { AuthRepository } from "./auth.repository";
-import { env } from "config/env";
-import { BadRequestError } from "errors/bad-request.error";
-import { CookieOptions } from "express";
-import { User } from "users/users.model";
+import jwt from 'jsonwebtoken';
+import bcrypt from 'bcrypt';
+import { LoginPayload, RegisterPayload } from './auth.validation';
+import { AuthRepository } from './auth.repository';
+import { env } from 'config/env';
+import { BadRequestError } from 'errors/bad-request.error';
+import { CookieOptions } from 'express';
+import { User } from 'users/users.model';
 
 export class AuthService {
   private authRepository = new AuthRepository();
@@ -14,15 +14,15 @@ export class AuthService {
     // Check if email already exists
     const foundUser = await this.authRepository.findUserByEmail(payload.email);
     if (foundUser) {
-      throw new BadRequestError("User with that email already exists");
+      throw new BadRequestError('User with that email already exists');
     }
 
     const user = await this.authRepository.createUser({
       ...payload,
       password: await bcrypt.hash(payload.password, 10), // Hash password
     });
     if (!user) {
-      throw new BadRequestError("Failed to create user");
+      throw new BadRequestError('Failed to create user');
     }
 
     return this.removePassword(user);
@@ -31,15 +31,12 @@ export class AuthService {
   public async login(payload: LoginPayload) {
     const user = await this.authRepository.findUserByEmail(payload.email);
     if (!user) {
-      throw new BadRequestError("Invalid email or password");
+      throw new BadRequestError('Invalid email or password');
     }
 
-    const isPasswordCorrect = await bcrypt.compare(
-      payload.password,
-      user.password
-    );
+    const isPasswordCorrect = await bcrypt.compare(payload.password, user.password);
     if (!isPasswordCorrect) {
-      throw new BadRequestError("Invalid email or password");
+      throw new BadRequestError('Invalid email or password');
     }
 
     return this.removePassword(user);
@@ -58,8 +55,8 @@ export class AuthService {
     return {
       maxAge: 5 * 60 * 60 * 1000, // 5 hours
       httpOnly: true,
-      sameSite: "lax",
-      secure: process.env.NODE_ENV === "production",
+      sameSite: 'lax',
+      secure: process.env.NODE_ENV === 'production',
     };
   }
 
diff --git a/src/auth/auth.validation.ts b/src/auth/auth.validation.ts
@@ -1,4 +1,4 @@
-import { z } from "zod";
+import { z } from 'zod';
 
 export const registerSchema = z.object({
   body: z.object({
@@ -8,7 +8,7 @@ export const registerSchema = z.object({
   }),
 });
 
-export type RegisterPayload = z.infer<typeof registerSchema>["body"];
+export type RegisterPayload = z.infer<typeof registerSchema>['body'];
 
 export const loginSchema = z.object({
   body: z.object({
@@ -17,4 +17,4 @@ export const loginSchema = z.object({
   }),
 });
 
-export type LoginPayload = z.infer<typeof loginSchema>["body"];
+export type LoginPayload = z.infer<typeof loginSchema>['body'];
diff --git a/src/config/database.ts b/src/config/database.ts
@@ -1,5 +1,5 @@
-import { Pool } from "pg";
-import { env } from "./env";
+import { Pool } from 'pg';
+import { env } from './env';
 
 const pool = new Pool({
   host: env.POSTGRES_HOST,
diff --git a/src/config/env.ts b/src/config/env.ts
@@ -1,5 +1,5 @@
-import { config } from "dotenv";
-import { cleanEnv, port, str } from "envalid";
+import { config } from 'dotenv';
+import { cleanEnv, port, str } from 'envalid';
 
 config();
 
diff --git a/src/errors/bad-request.error.ts b/src/errors/bad-request.error.ts
@@ -1,7 +1,7 @@
-import { HttpError } from "./http.error";
+import { HttpError } from './http.error';
 
 export class BadRequestError extends HttpError {
   constructor(message?: string) {
-    super(400, "Bad Request");
+    super(400, 'Bad Request');
   }
 }
diff --git a/src/errors/forbidden.error.ts b/src/errors/forbidden.error.ts
@@ -1,7 +1,7 @@
-import { HttpError } from "./http.error";
+import { HttpError } from './http.error';
 
 export class ForbiddenError extends HttpError {
   constructor(message?: string) {
-    super(403, message || "Forbidden");
+    super(403, message || 'Forbidden');
   }
 }
diff --git a/src/errors/unauthorized.error.ts b/src/errors/unauthorized.error.ts
@@ -1,7 +1,7 @@
-import { HttpError } from "./http.error";
+import { HttpError } from './http.error';
 
 export class UnauthorizedError extends HttpError {
   constructor(message?: string) {
-    super(401, message || "Unauthorized");
+    super(401, message || 'Unauthorized');
   }
 }
diff --git a/src/interfaces/api.interface.ts b/src/interfaces/api.interface.ts
@@ -6,7 +6,7 @@ export interface PaginatedResponse<T> {
 }
 
 // Extend the Express session interface to include user ID
-declare module "express" {
+declare module 'express' {
   interface Request {
     userId?: number;
   }
diff --git a/src/interfaces/controller.interface.ts b/src/interfaces/controller.interface.ts
@@ -1,4 +1,4 @@
-import { Router } from "express";
+import { Router } from 'express';
 
 export abstract class Controller {
   public router: Router;
diff --git a/src/middleware/auth.middleware.ts b/src/middleware/auth.middleware.ts
@@ -1,23 +1,17 @@
-import { NextFunction, Response, Request } from "express";
-import pool from "config/database";
-import jwt from "jsonwebtoken";
-import { UnauthorizedError } from "errors/unauthorized.error";
-import { env } from "config/env";
+import { NextFunction, Response, Request } from 'express';
+import pool from 'config/database';
+import jwt from 'jsonwebtoken';
+import { UnauthorizedError } from 'errors/unauthorized.error';
+import { env } from 'config/env';
 
-async function authMiddleware(
-  request: Request,
-  _: Response,
-  next: NextFunction
-) {
+async function authMiddleware(request: Request, _: Response, next: NextFunction) {
   const token = request.cookies.Authentication;
   if (!token) return next(new UnauthorizedError());
 
   const decoded = jwt.verify(token, env.JWT_SECRET) as { _id: number };
   if (!decoded._id) return next(new UnauthorizedError());
 
-  const result = await pool.query("SELECT id FROM users WHERE id = $1", [
-    decoded._id,
-  ]);
+  const result = await pool.query('SELECT id FROM users WHERE id = $1', [decoded._id]);
   if (result.rows.length === 0) return next(new UnauthorizedError());
 
   request.userId = decoded._id;
diff --git a/src/middleware/error.middleware.ts b/src/middleware/error.middleware.ts
@@ -1,14 +1,14 @@
-import { HttpError } from "errors/http.error";
-import { NextFunction, Request, Response } from "express";
+import { HttpError } from 'errors/http.error';
+import { NextFunction, Request, Response } from 'express';
 
 function errorMiddleware(
   error: HttpError,
   request: Request,
   response: Response,
-  next: NextFunction
+  next: NextFunction,
 ) {
   const status = error.status || 500;
-  const message = error.message || "Something went wrong";
+  const message = error.message || 'Something went wrong';
   response.status(status).json({
     status,
     message,
diff --git a/src/middleware/validation.middleware.ts b/src/middleware/validation.middleware.ts
diff --git a/src/server.ts b/src/server.ts
diff --git a/src/users/users.controller.ts b/src/users/users.controller.ts
diff --git a/src/users/users.model.ts b/src/users/users.model.ts
