Merge pull request #4 from kennie-larkson/authentication

feat(): added auth service, auth controller and cookies is set

Author: kennie-larkson

README.md

@@ -3,7 +3,7 @@
 ## How to run the code
 
 1. Clone to repo in your favorite directory using the command `git clone https://github.com/kennie-larkson/weblog.git`
-2. CD into the `teesas` folder and run the command `npm install` to install the dependencies.
+2. CD into the `weblog` folder and run the command `npm install` to install the dependencies.
 3. Create a .env file with the contents of .env.local. Also ensure to have docker running on your machine and create your docker.env file since the docker-compose.yml will be needing the environment variables.
 4. Run the command `npm start` to start the application
 5. Visit the postman collection file for a link to test all endpoint
@@ -12,6 +12,3 @@
 
 1. User
 2. Post
-3. Topic
-
-## Data structure :

package.json

@@ -5,7 +5,7 @@
   "main": "index.js",
   "scripts": {
     "start": "nodemon index.js",
-    "dev": "npx nodemon ./src/server.ts",
+    "dev": "ts-node ./src/server.ts",
     "test": "nyc mocha --timeout 10000"
   },
   "keywords": [],

src/authentication/authentication.controller.ts

@@ -28,7 +28,7 @@ export default class AuthController {
     const userData: ICreateUser = request.body;
     try {
       const { cookie, user } = await this.authService.register(userData);
-      console.log({ user, cookie });
+      // console.log({ user, cookie });
       response.setHeader("Set-Cookie", [cookie]);
       response.send(user);
     } catch (error) {

src/authentication/authentication.service.ts

@@ -5,6 +5,7 @@ import AppDataSource from "./../data-source";
 import User from "./../entity/users/user.entity";
 import ITokenData from "./../interfaces/tokenData.interface";
 import IDataStoredInToken from "./../interfaces/dataStoredInToken.interface";
+import ThereIsAlreadyAUserWithThatEmail from "../exceptions/DuplicateEmailRegistrationException";
 
 export default class AuthenticationService {
   public async register(userData: ICreateUser) {
@@ -13,9 +14,11 @@ export default class AuthenticationService {
         .getRepository(User)
         .findOneBy({ email: userData.email })
     ) {
-      throw new Error(
-        "Sorry there is a user with that email already. Please, try another."
-      );
+      throw new ThereIsAlreadyAUserWithThatEmail(userData.email);
+
+      // throw new Error(
+      //   "Sorry there is a user with that email already. Please, try another."
+      // );
     }
 
     const hashedPassword = await bcrypt.hash(userData.password, 10);
@@ -33,11 +36,14 @@ export default class AuthenticationService {
   }
 
   public createToken(user: User): ITokenData {
-    const expiresIn = 60 * 60;
+    const expiresIn = 60 * 60; // an hour
     const secret = process.env.JWT_SECRET;
     const dataStoredInToken: IDataStoredInToken = { id: user.id };
 
-    return { expiresIn, token: jwt.sign(dataStoredInToken, secret, {}) };
+    return {
+      expiresIn,
+      token: jwt.sign(dataStoredInToken, secret, { expiresIn }),
+    };
   }
 
   public createCookie(tokenData: ITokenData) {

src/entity/posts/post.controller.ts

@@ -1,6 +1,7 @@
 import express from "express";
 import IPost from "./post.interface";
 import { validatePostForm } from "./../../middleware/validation.middleware";
+import PostNotFoundException from "./../../exceptions/PostNotFoundException";
 
 import AppDataSource from "./../../data-source";
 import { NextFunction, Request, Response } from "express";
@@ -22,73 +23,76 @@ export default class PostController {
     this.router.patch(`${this.path}/:id`, this.updatePost);
   }
 
-  public async getAllPosts(
-    request: Request,
-    response: Response,
-    next: NextFunction
-  ) {
+  public async getAllPosts(req: Request, res: Response, next: NextFunction) {
     try {
       const posts = await AppDataSource.manager
         .getRepository(Post)
         .find({ relations: { author: true } });
-      return response.json(posts);
+      return res.json(posts);
     } catch (error) {
-      return response.json(error);
+      return res.json(error);
     }
   }
 
-  async getPostById(request: Request, response: Response, next: NextFunction) {
-    const { id } = request.params;
-    return AppDataSource.manager.findOneBy(Post, { id: Number(id) });
+  async getPostById(req: Request, res: Response, next: NextFunction) {
+    const { id } = req.params;
+    const post: IPost = await AppDataSource.manager.findOneBy(Post, {
+      id: Number(id),
+    });
+    if (post) {
+      return res.status(200).json(post);
+    }
+    next(new PostNotFoundException(Number(id)));
   }
 
-  async createPost(request: Request, response: Response, next: NextFunction) {
-    const post: IPost = request.body;
-    //const post = request.body;
+  async createPost(req: Request, res: Response, next: NextFunction) {
+    const post: IPost = req.body;
+
     try {
       const createdPost = AppDataSource.manager
         .getRepository(Post)
         .create(post);
       const result = await AppDataSource.manager
         .getRepository(Post)
         .save(createdPost);
-      return response.json(result);
+      return res.json(result);
     } catch (error) {
-      return response.json(error);
+      //return res.json(error);
+      next(error);
     }
   }
 
-  async removePost(request: Request, response: Response, next: NextFunction) {
-    const { id } = request.params;
+  async removePost(req: Request, res: Response, next: NextFunction) {
+    const { id } = req.params;
     let postToRemove = await AppDataSource.manager.findOneBy(Post, {
       id: Number(id),
     });
     await AppDataSource.manager.remove(postToRemove);
   }
 
-  async updatePost(request: Request, response: Response, next: NextFunction) {
-    const { id } = request.params;
-    const update = request.body;
+  async updatePost(req: Request, res: Response, next: NextFunction) {
+    const { id } = req.params;
+    const update = req.body;
     console.log(update);
 
     try {
       const postToUpdate = await AppDataSource.getRepository(Post).findOneBy({
         id: Number(id),
       });
       if (!postToUpdate) {
-        return response.json({ message: `Unable to find post with id ${id}` });
+        return res.json({ message: `Unable to find post with id ${id}` });
       }
       AppDataSource.getRepository(Post).merge(postToUpdate, update);
       const updatedPost = await AppDataSource.getRepository(Post).save(
         postToUpdate
       );
 
-      return response.json({
+      return res.json({
         message: `Successfully updated data for post with id: ${id}.`,
         updatedPost,
       });
     } catch (error) {
-      return response.json(error);
+      return res.json(error);
     }
   }
 }

src/entity/posts/post.interface.ts

@@ -1,6 +1,7 @@
 import User from "entity/users/user.entity";
 
 interface IPost {
+  id?: number;
   content: string;
   title: string;
   author: Partial<User>;

src/entity/users/user.entity.ts

@@ -1,4 +1,10 @@
-import { Entity, Column, PrimaryGeneratedColumn, OneToMany } from "typeorm";
+import {
+  Entity,
+  Column,
+  PrimaryGeneratedColumn,
+  OneToMany,
+  JoinColumn,
+} from "typeorm";
 import "reflect-metadata";
 import Post from "../posts/post.entity";
 

src/exceptions/DuplicateEmailRegistrationException.ts

@@ -0,0 +1,7 @@
+import HttpExceptions from "./HttpExceptions";
+
+export default class ThereIsAlreadyAUserWithThatEmail extends HttpExceptions {
+  constructor(email: string) {
+    super(400, `A user with the email ${email} already exists.`);
+  }
+}

src/exceptions/PostNotFoundException.ts

@@ -0,0 +1,7 @@
+import HttpExceptions from "./HttpExceptions";
+
+export default class PostNotFoundException extends HttpExceptions {
+  constructor(id: number) {
+    super(400, `Cannot find Post with id ${id}.`);
+  }
+}

tsconfig.json

@@ -9,7 +9,7 @@
     "experimentalDecorators": true,
     "moduleResolution": "node",
     "allowSyntheticDefaultImports": true
-  }
-  //   "include": ["src/**/*.ts"],
-  //   "exclude": ["node_modules"]
+  },
+  "include": ["src/**/*.ts"],
+  "exclude": ["node_modules"]
 }