Merge pull request #42 from Modarb-Ai-Trainer:MoWafy001/issue36

src/modules/console/modules/auth/services/auth.service.ts

@@ -7,12 +7,13 @@ import { JwtHelper } from "@helpers/jwt.helper";
 
 export class ConsoleAuthService extends CrudService(Admin) {
   async login(loginRequest: ILogin) {
-    const admin = await this.findOneOrFail({ email: loginRequest.email });
+    const admin = await this.findOne({ email: loginRequest.email });
+    if (!admin) throw new HttpError(401, "Invalid Credentials");
     const isPasswordCorrect = await bcrypt.compare(
       loginRequest.password,
       admin.password
     );
-    if (!isPasswordCorrect) throw new HttpError(401, "Incorrect Password");
+    if (!isPasswordCorrect) throw new HttpError(401, "Invalid Credentials");
     const token = JwtHelper.generateToken({
       id: admin._id,
       email: admin.email,

src/modules/users/modules/auth/controllers/auth.controller.ts

@@ -1,4 +1,3 @@
-import { UsersAuthService } from "../services/users.service";
 import { loginValidationSchema } from "../validation/login.validation";
 import { Request, Response } from "express";
 import { JsonResponse } from "@lib/responses/json-response";
@@ -12,6 +11,7 @@ import { BaseController } from "@lib/controllers/controller.base";
 import { Prefix } from "@lib/decorators/prefix.decorator";
 import { serialize } from "@helpers/serialize";
 import { UserSerialization } from "@common/serializers/user.serialization";
+import { UsersAuthService } from "../services/users-auth.service";
 
 @Prefix("/users/auth")
 export class UsersAuthController extends BaseController {

src/modules/users/modules/auth/services/users-auth.service.ts

@@ -12,12 +12,14 @@ export class UsersAuthService extends CrudService(User) {
   }
 
   async login(loginRequest: ILogin) {
-    const user = await this.findOneOrFail({ email: loginRequest.email });
+    const user = await this.findOne({ email: loginRequest.email });
+    if (!user) throw new HttpError(401, "Invalid Credentials");
+    
     const isPasswordCorrect = await bcrypt.compare(
       loginRequest.password,
       user.password
     );
-    if (!isPasswordCorrect) throw new HttpError(401, "Incorrect Password");
+    if (!isPasswordCorrect) throw new HttpError(401, "Invalid Credentials");
     const token = JwtHelper.generateToken({
       id: user._id,
       email: user.email,

src/modules/users/modules/auth/services/users.service.ts

@@ -1,29 +0,0 @@
-import bcrypt from "bcrypt";
-import { ILogin } from "../validation/login.validation";
-import { HttpError } from "@lib/error-handling/http-error";
-import { JwtHelper } from "@helpers/jwt.helper";
-import { User } from "@common/models/user.model";
-import { IUserRegister } from "@common/validations/user-register.validation";
-import { CrudService } from "@lib/services/crud.service";
-
-export class UsersAuthService extends CrudService(User) {
-  async register(createParams: IUserRegister) {
-    return this.create(createParams);
-  }
-
-  async login(loginRequest: ILogin) {
-    const user = await this.findOneOrFail({ email: loginRequest.email });
-    const isPasswordCorrect = await bcrypt.compare(
-      loginRequest.password,
-      user.password
-    );
-    if (!isPasswordCorrect) throw new HttpError(401, "Incorrect Password");
-    const token = JwtHelper.generateToken({
-      id: user._id,
-      email: user.email,
-      name: user.name,
-      type: "user",
-    });
-    return { user, token };
-  }
-}