Merge pull request #38 from hngprojects/feat/32-Authentication_User_L…

…og_In

Authentication - User Log In

package.json

@@ -6,7 +6,7 @@
   "scripts": {
     "start:dev": "ts-node-dev --respawn --transpile-only ./src/index",
     "start": "ts-node --transpile-only src/index.ts",
-    "test": "jest",
+    "test": "jest --passWithNoTests",
     "typeorm": "typeorm-ts-node-commonjs",
     "build": "tsc",
     "prod": "node dist/index.js"
@@ -20,7 +20,7 @@
     "@types/node": "^16.18.103",
     "@types/supertest": "^6.0.2",
     "ts-node": "^10.9.1",
-    "typescript": "5.5.3"
+    "typescript": "^5.5.3"
   },
   "dependencies": {
     "@types/bcryptjs": "^2.4.6",

src/controllers/AuthController.ts

@@ -1,30 +1,36 @@
-import { Request, Response, NextFunction } from "express";
-
-import { AuthService } from "../services";
-
-/*
- *TODO: add validation
- */
-const authService = new AuthService();
-const signUp = async (req: Request, res: Response, next: NextFunction) => {
-  try {
-    const { mailSent, newUser, access_token } = await authService.signUp(
-      req.body
-    );
-    res.status(201).json({ mailSent, newUser, access_token });
-  } catch (error) {
-    next(error);
-  }
-};
-
-const verifyOtp = async (req: Request, res: Response, next: NextFunction) => {
-  try {
-    const { otp, token } = req.body;
-    const { message } = await authService.verifyEmail(token as string, otp);
-    res.status(200).json({ message });
-  } catch (error) {
-    next(error);
-  }
-};
-
-export { signUp, verifyOtp };
+import { Request, Response, NextFunction } from "express";
+import { AuthService } from "../services";
+
+const authService = new AuthService();
+
+const signUp = async (req: Request, res: Response, next: NextFunction) => {
+  try {
+    const { mailSent, newUser, access_token } = await authService.signUp(
+      req.body
+    );
+    res.status(201).json({ mailSent, newUser, access_token });
+  } catch (error) {
+    next(error);
+  }
+};
+
+const verifyOtp = async (req: Request, res: Response, next: NextFunction) => {
+  try {
+    const { otp, token } = req.body;
+    const { message } = await authService.verifyEmail(token as string, otp);
+    res.status(200).json({ message });
+  } catch (error) {
+    next(error);
+  }
+};
+
+const login = async (req: Request, res: Response, next: NextFunction) => {
+  try {
+    const { access_token, user } = await authService.login(req.body);
+    res.status(200).json({ access_token, user });
+  } catch (error) {
+    next(error);
+  }
+};
+
+export { signUp, verifyOtp, login };

src/controllers/UserController.ts

@@ -1,6 +1,6 @@
 // src/controllers/UserController.ts
 import { Request, Response } from "express";
-import { UserService } from "../services/UserServivce";
+import { UserService } from "../services/user.services";
 
 class UserController {
   private userService: UserService;

src/data-source.ts

@@ -9,13 +9,13 @@ export const AppDataSource = new DataSource({
   username: config.DB_USER,
   password: config.DB_PASSWORD,
   database: config.DB_NAME,
-  synchronize: true,
+  synchronize: false,
   logging: false,
   entities: ["src/models/**/*.ts"],
-  ssl: false,
-  extra: {
-    ssl: {
-      rejectUnauthorized: false,
-    },
-  },
+  // ssl: false,
+  // extra: {
+  //   ssl: {
+  //     rejectUnauthorized: false,
+  //   },
+  // },
 });

src/index.ts

@@ -1,3 +1,4 @@
+// src/index.ts
 import "reflect-metadata";
 import { AppDataSource } from "./data-source";
 import log from "./utils/logger";

src/models/article.ts → src/models/helpcentertopic.ts

@@ -4,13 +4,11 @@ import {
   Column,
   CreateDateColumn,
   UpdateDateColumn,
-  ManyToOne,
 } from "typeorm";
 import ExtendedBaseEntity from "./extended-base-entity";
-import { User } from ".";
 
 @Entity()
-export class Article extends ExtendedBaseEntity {
+export class HelpCenterTopic extends ExtendedBaseEntity {
   @PrimaryGeneratedColumn("uuid")
   id: string;
 
@@ -20,8 +18,8 @@ export class Article extends ExtendedBaseEntity {
   @Column()
   content: string;
 
-  @ManyToOne(() => User, (user) => user.articles)
-  author: User;
+  @Column()
+  author: string;
 
   @CreateDateColumn()
   createdAt: Date;

src/models/index.ts

@@ -1,5 +1,6 @@
-export * from "./User";
-export * from "./Organization";
-export * from "./Profile";
-export * from "./Product";
-export * from "./article";
+export * from "./user";
+export * from "./organization";
+export * from "./profile";
+export * from "./product";
+export * from "./helpcentertopic";
+export * from "./notification";

src/models/notification.ts

@@ -0,0 +1,21 @@
+import { Entity, PrimaryGeneratedColumn, Column, Unique } from "typeorm";
+import ExtendedBaseEntity from "./extended-base-entity";
+
+@Entity()
+@Unique(["user_id"])
+export class NotificationSetting extends ExtendedBaseEntity {
+  @PrimaryGeneratedColumn()
+  id: number;
+
+  @Column()
+  user_id: string;
+
+  @Column()
+  email_notifications: boolean;
+
+  @Column()
+  push_notifications: boolean;
+
+  @Column()
+  sms_notifications: boolean;
+}

src/models/Organization.ts → src/models/organization.ts

@@ -1,5 +1,5 @@
 import { Entity, PrimaryGeneratedColumn, Column, ManyToMany } from "typeorm";
-import { User } from "./User";
+import { User } from "./user";
 import ExtendedBaseEntity from "./extended-base-entity";
 
 @Entity()

src/models/Product.ts → src/models/product.ts

@@ -1,5 +1,5 @@
 import { Entity, PrimaryGeneratedColumn, Column, ManyToOne } from "typeorm";
-import { User } from "./User";
+import { User } from "./user";
 import ExtendedBaseEntity from "./extended-base-entity";
 
 @Entity()

src/models/Profile.ts → src/models/profile.ts

@@ -1,5 +1,5 @@
 import { Entity, PrimaryGeneratedColumn, Column, OneToOne } from "typeorm";
-import { User } from "./User";
+import { User } from "./user";
 import ExtendedBaseEntity from "./extended-base-entity";
 
 @Entity()

src/models/sms.ts

@@ -0,0 +1,28 @@
+import {
+  Entity,
+  PrimaryGeneratedColumn,
+  Column,
+  CreateDateColumn,
+  ManyToOne,
+} from "typeorm";
+import ExtendedBaseEntity from "./extended-base-entity";
+import { User } from ".";
+
+@Entity()
+export class Sms extends ExtendedBaseEntity {
+  @PrimaryGeneratedColumn("uuid")
+  id: string;
+
+  @Column()
+  phone_number: string;
+
+  @Column()
+  message: string;
+
+  @Column()
+  @ManyToOne(() => User, (user) => user.id)
+  sender_id: User;
+
+  @CreateDateColumn()
+  createdAt: Date;
+}

src/models/User.ts → src/models/user.ts

@@ -11,7 +11,7 @@ import {
   CreateDateColumn,
   UpdateDateColumn,
 } from "typeorm";
-import { Profile, Product, Organization, Article } from ".";
+import { Profile, Product, Organization } from ".";
 import { IsEmail } from "class-validator";
 import ExtendedBaseEntity from "./extended-base-entity";
 import { getIsInvalidMessage } from "../utils";
@@ -59,9 +59,6 @@ export class User extends ExtendedBaseEntity {
   @JoinTable()
   products: Product[];
 
-  @OneToMany(() => Article, (article) => article.author, { cascade: true })
-  articles: Article[];
-
   @ManyToMany(() => Organization, (organization) => organization.users, {
     cascade: true,
   })

src/routes/auth.ts

@@ -1,9 +1,10 @@
-import { signUp, verifyOtp } from "../controllers";
+import { signUp, verifyOtp, login } from "../controllers";
 import { Router } from "express";
 
 const authRoute = Router();
 
 authRoute.post("/signup", signUp);
 authRoute.post("/verify-otp", verifyOtp);
+authRoute.post("/login", login);
 
 export { authRoute };

src/services/auth.services.ts

@@ -1,8 +1,8 @@
 import { AppDataSource } from "../data-source";
-import { User, Profile, Organization } from "../models";
-import { IAuthService, IUserSignUp } from "../types";
+import { Profile, User } from "../models";
+import { IAuthService, IUserSignUp, IUserLogin } from "../types";
 import { Conflict, HttpError } from "../middleware";
-import { hashPassword, generateNumericOTP } from "../utils";
+import { hashPassword, generateNumericOTP, comparePassword } from "../utils";
 import { Sendmail } from "../utils/mail";
 import jwt from "jsonwebtoken";
 import { compilerOtp } from "../views/welcome";
@@ -62,6 +62,7 @@ export class AuthService implements IAuthService {
       throw new HttpError(error.status || 500, error.message || error);
     }
   }
+
   public async verifyEmail(
     token: string,
     otp: number
@@ -90,4 +91,37 @@ export class AuthService implements IAuthService {
       throw new HttpError(error.status || 500, error.message || error);
     }
   }
+
+  public async login(
+    payload: IUserLogin
+  ): Promise<{ access_token: string; user: Partial<User> }> {
+    const { email, password } = payload;
+
+    try {
+      const user = await User.findOne({ where: { email } });
+
+      if (!user) {
+        throw new HttpError(404, "User not found");
+      }
+
+      const isPasswordValid = await comparePassword(password, user.password);
+      if (!isPasswordValid) {
+        throw new HttpError(401, "Invalid credentials");
+      }
+
+      if (!user.isverified) {
+        throw new HttpError(403, "Email not verified");
+      }
+
+      const access_token = jwt.sign({ userId: user.id }, config.TOKEN_SECRET, {
+        expiresIn: "1d",
+      });
+
+      const { password: _, ...userWithoutPassword } = user;
+
+      return { access_token, user: userWithoutPassword };
+    } catch (error) {
+      throw new HttpError(error.status || 500, error.message || error);
+    }
+  }
 }

src/services/index.ts

@@ -1,2 +1,2 @@
 export * from "./auth.services";
-export * from "./UserServivce";
+export * from "./user.services";

src/services/UserServivce.ts → src/services/user.services.ts

@@ -1,5 +1,5 @@
 // src/services/UserService.ts
-import { User } from "../models/User";
+import { User } from "../models/user";
 import { IUserService } from "../types";
 
 export class UserService implements IUserService {

src/types/index.d.ts

@@ -9,16 +9,21 @@ export interface IRole {
   role: "super_admin" | "admin" | "user";
 }
 
-interface IUserSignUp {
+export interface IUserSignUp {
   firstName: string;
   lastName: string;
   email: string;
   password: string;
   phone: string;
 }
 
+export interface IUserLogin {
+  email: string;
+  password: string;
+}
+
 export interface IAuthService {
-  // login(email: string, password: string): Promise<User>;
+  login(payload: IUserLogin): Promise<unknown>;
   signUp(payload: IUserSignUp, res: unknown): Promise<unknown>;
   verifyEmail(token: string, otp: number): Promise<{ message: string }>;
 }

src/utils/index.ts

@@ -9,8 +9,12 @@ export async function hashPassword(password: string): Promise<string> {
   return await bcrypt.hash(password, 10);
 }
 
+export async function comparePassword(password: string, hashedPassword: string): Promise<boolean> {
+  return await bcrypt.compare(password, hashedPassword);
+}
+
 export async function generateAccessToken(user_id: string) {
-  return jwt.sign(user_id, config.TOKEN_SECRET, { expiresIn: 60 });
+  return jwt.sign({ user_id }, config.TOKEN_SECRET, { expiresIn: "1d" });
 }
 
 export const generateNumericOTP = (length: number): string => {

yarn.lock

@@ -740,7 +740,7 @@
 
 "@types/jest@^29.5.12":
   version "29.5.12"
-  resolved "https://registry.npmjs.org/@types/jest/-/jest-29.5.12.tgz"
+  resolved "https://registry.yarnpkg.com/@types/jest/-/jest-29.5.12.tgz#7f7dc6eb4cf246d2474ed78744b05d06ce025544"
   integrity sha512-eDC8bTvT/QhYdxJAulQikueigY5AsdBRH2yDKW3yveW7svY3+DzN84/2NUgkw10RTiJbWqZrTtoGVdYlvFJdLw==
   dependencies:
     expect "^29.0.0"
@@ -3699,10 +3699,10 @@ typeorm@^0.3.20:
     uuid "^9.0.0"
     yargs "^17.6.2"
 
-typescript@4.5.2:
-  version "4.5.2"
-  resolved "https://registry.npmjs.org/typescript/-/typescript-4.5.2.tgz"
-  integrity sha512-5BlMof9H1yGt0P8/WF+wPNw6GfctgGjXp5hkblpyT+8rkASSmkUKMXrxR0Xg8ThVCi/JnHQiKXeBaEwCeQwMFw==
+typescript@^5.5.3:
+  version "5.5.3"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.5.3.tgz#e1b0a3c394190838a0b168e771b0ad56a0af0faa"
+  integrity sha512-/hreyEujaB0w76zKo6717l3L0o/qEUtRgdvUBvlkhoWeOVMjMuHNHk0BRBzikzuGDqNmPQbg5ifMEqsHLiIUcQ==
 
 uglify-js@^3.1.4:
   version "3.19.0"