create separate type for user data with password. password should not…

… leave server once stored
rafa-lopes-pt · Jun 22, 2024 · e6d083d · e6d083d
1 parent 1bb3bfa
commit e6d083d
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 13 deletions.
diff --git a/backend/src/repositories/Auth.repository.ts b/backend/src/repositories/Auth.repository.ts
@@ -1,35 +1,35 @@
-import { UserSchemaType } from "../../../shared/schemas/user.schema";
 
 import Repository from "./Repository";
+import { DbUserSchemaType } from "./auth/DbUser.type";
 
 const USERS_DATABASE = "users";
 const USERS_COLLECTION = "users_list";
 
-export default class AuthRepository extends Repository<UserSchemaType> {
-	insert(data: UserSchemaType & { password: string }) {
+export default class AuthRepository extends Repository<DbUserSchemaType> {
+	insert(data: DbUserSchemaType & { password: string }) {
 		return this.client.insertOne(USERS_DATABASE, USERS_COLLECTION, data);
 	}
 
-	find(filters: Partial<UserSchemaType>) {
+	find(filters: Partial<DbUserSchemaType>) {
 		return this.client.find(USERS_DATABASE, USERS_COLLECTION, filters);
 	}
 
-	findOne(filters: Partial<UserSchemaType>) {
+	findOne(filters: Partial<DbUserSchemaType>) {
 		return this.client.findOne(USERS_DATABASE, USERS_COLLECTION, filters);
 	}
 
-	has(filters: Partial<UserSchemaType>) {
+	has(filters: Partial<DbUserSchemaType>) {
 		return this.client.has(USERS_DATABASE, USERS_COLLECTION, filters);
 	}
-	update(filters: Partial<UserSchemaType>, data: UserSchemaType) {
+	update(filters: Partial<DbUserSchemaType>, data: DbUserSchemaType) {
 		return this.client.updateOne(
 			USERS_DATABASE,
 			USERS_COLLECTION,
 			filters,
 			data
 		);
 	}
-	delete(filters: Partial<UserSchemaType>) {
+	delete(filters: Partial<DbUserSchemaType>) {
 		return this.client.deleteOne(USERS_DATABASE, USERS_COLLECTION, filters);
 	}
 }
diff --git a/backend/src/repositories/auth/DbUser.type.ts b/backend/src/repositories/auth/DbUser.type.ts
@@ -0,0 +1,3 @@
+import { UserSchemaType } from "../../../../shared/schemas/user.schema";
+
+export type DbUserSchemaType = UserSchemaType & { password: string };
diff --git a/backend/src/routes/controllers/auth/login.controller.ts b/backend/src/routes/controllers/auth/login.controller.ts
@@ -1,10 +1,10 @@
 import { NextFunction, Request, Response } from "express";
+import { WithId } from "mongodb";
 import HTTPCodes from "simple-http-codes";
-import { authRepo } from "./auth.router";
+import { DbUserSchemaType } from "../../../repositories/auth/DbUser.type";
 import HttpError from "../../../utils/HttpError";
 import { compareHash, signToken } from "../../../utils/crypto";
-import { UserSchemaType } from "../../../../../shared/schemas/user.schema";
-import { WithId } from "mongodb";
+import { authRepo } from "./auth.router";
 
 export default async function loginController(
 	req: Request,
@@ -15,7 +15,7 @@ export default async function loginController(
 
 	//validate email and retrieve used data
 
-	let existingUser: WithId<UserSchemaType> | undefined;
+	let existingUser: WithId<DbUserSchemaType> | undefined;
 
 	try {
 		const response = await authRepo.findOne({ email });

diff --git a/backend/src/routes/controllers/auth/signup.controller.ts b/backend/src/routes/controllers/auth/signup.controller.ts
@@ -6,6 +6,7 @@ import { UserSchemaType } from "../../../../../shared/schemas/user.schema";
 import HttpError from "../../../utils/HttpError";
 import { hashData } from "../../../utils/crypto";
 import { authRepo } from "./auth.router";
+import { DbUserSchemaType } from "../../../repositories/auth/DbUser.type";
 
 export default async function signupController(
 	req: Request,
@@ -35,7 +36,7 @@ export default async function signupController(
 
 	const hashedPassword = await hashData(password);
 
-	const user: UserSchemaType = {
+	const user: DbUserSchemaType = {
 		name,
 		email,
 		password: hashedPassword,
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		import { UserSchemaType } from "../../../../shared/schemas/user.schema";

		export type DbUserSchemaType = UserSchemaType & { password: string };