From 7e5ec289de32854896750702031d2b8f25d472cd Mon Sep 17 00:00:00 2001
From: Atakan Temizkan <atikotemizkan@gmail.com>
Date: Sun, 1 Sep 2024 23:57:29 +0300
Subject: [PATCH 1/8] finished core criteria

---
 .env.example                    |  4 ---
 src/client/App.jsx              | 48 +++++++++++++++++++++---------
 src/server/controllers/movie.js | 47 ++++++++++++++++-------------
 src/server/controllers/user.js  | 52 ++++++++++++++++++---------------
 4 files changed, 90 insertions(+), 61 deletions(-)
 delete mode 100644 .env.example

diff --git a/.env.example b/.env.example
deleted file mode 100644
index 73eec69b..00000000
--- a/.env.example
+++ /dev/null
@@ -1,4 +0,0 @@
-DATABASE_URL="YOUR_DATABASE_URL"
-
-# This env var must be prefixed with `VITE_` in order to work in the client / Vite React app.
-VITE_PORT=4000
diff --git a/src/client/App.jsx b/src/client/App.jsx
index bae3b635..a9a8350c 100644
--- a/src/client/App.jsx
+++ b/src/client/App.jsx
@@ -1,19 +1,19 @@
-import { useEffect, useState } from 'react';
-import './App.css';
-import MovieForm from './components/MovieForm';
-import UserForm from './components/UserForm';
+import { useEffect, useState } from "react";
+import "./App.css";
+import MovieForm from "./components/MovieForm";
+import UserForm from "./components/UserForm";
 
 const port = import.meta.env.VITE_PORT;
 const apiUrl = `http://localhost:${port}`;
 
 function App() {
   const [movies, setMovies] = useState([]);
-
+  const [newMovie, setNewMovie] = useState(false);
   useEffect(() => {
     fetch(`${apiUrl}/movie`)
-      .then(res => res.json())
-      .then(res => setMovies(res.data));
-  }, []);
+      .then((res) => res.json())
+      .then((res) => setMovies(res.data));
+  }, [newMovie]);
 
   /**
    * HINTS!
@@ -34,16 +34,38 @@ function App() {
    * */
 
   const handleRegister = async ({ username, password }) => {
-
+    await fetch(`${apiUrl}/user/register`, {
+      method: "POST",
+      headers: { "Content-Type": "application/json" },
+      body: JSON.stringify({ username: username, password: password }),
+    });
   };
 
   const handleLogin = async ({ username, password }) => {
-
+    const response = await fetch(`${apiUrl}/user/login`, {
+      method: "POST",
+      headers: { "Content-Type": "application/json" },
+      body: JSON.stringify({ username: username, password: password }),
+    });
+    const token = await response.json();
+    localStorage.setItem("token", token.data);
   };
 
   const handleCreateMovie = async ({ title, description, runtimeMins }) => {
-
-  }
+    const response = await fetch(`${apiUrl}/movie`, {
+      method: "POST",
+      headers: {
+        "Content-Type": "application/json",
+        Authentication: localStorage.getItem("token"),
+      },
+      body: JSON.stringify({
+        title: title,
+        description: description,
+        runtimeMins: runtimeMins,
+      }),
+    });
+    setNewMovie(!newMovie);
+  };
 
   return (
     <div className="App">
@@ -58,7 +80,7 @@ function App() {
 
       <h1>Movie list</h1>
       <ul>
-        {movies.map(movie => {
+        {movies.map((movie) => {
           return (
             <li key={movie.id}>
               <h3>{movie.title}</h3>
diff --git a/src/server/controllers/movie.js b/src/server/controllers/movie.js
index d4733b61..6c395b29 100644
--- a/src/server/controllers/movie.js
+++ b/src/server/controllers/movie.js
@@ -1,31 +1,36 @@
-import jwt from 'jsonwebtoken';
-import { PrismaClient } from '@prisma/client'
+import jwt from "jsonwebtoken";
+import { PrismaClient } from "@prisma/client";
 const prisma = new PrismaClient();
 
-const jwtSecret = 'mysecret';
+const jwtSecret = "mysecret";
 
 const getAllMovies = async (req, res) => {
-    const movies = await prisma.movie.findMany();
+  const movies = await prisma.movie.findMany();
 
-    res.json({ data: movies });
+  res.json({ data: movies });
 };
 
 const createMovie = async (req, res) => {
-    const { title, description, runtimeMins } = req.body;
-
-    try {
-        const token = null;
-        // todo verify the token
-    } catch (e) {
-        return res.status(401).json({ error: 'Invalid token provided.' })
-    }
-
-    const createdMovie = null;
-
-    res.json({ data: createdMovie });
+  const { title, description, runtimeMins } = req.body;
+
+  try {
+    const token = req.headers.authentication;
+    // todo verify the token
+    jwt.verify(token, jwtSecret);
+  } catch (e) {
+    return res.status(401).json({ error: "Invalid token provided." });
+  }
+
+  const createdMovie = await prisma.movie.create({
+    data: {
+      title: title,
+      description: description,
+      runtimeMins: runtimeMins,
+    },
+  });
+
+  console.log(createdMovie);
+  res.json({ data: createdMovie });
 };
 
-export {
-    getAllMovies,
-    createMovie
-};
+export { getAllMovies, createMovie };
diff --git a/src/server/controllers/user.js b/src/server/controllers/user.js
index 05db4183..b2d4353f 100644
--- a/src/server/controllers/user.js
+++ b/src/server/controllers/user.js
@@ -1,39 +1,45 @@
-import bcrypt from 'bcrypt';
-import jwt from 'jsonwebtoken';
-import { PrismaClient } from '@prisma/client'
+import bcrypt from "bcrypt";
+import jwt from "jsonwebtoken";
+import { PrismaClient } from "@prisma/client";
 const prisma = new PrismaClient();
 
-const jwtSecret = 'mysecret';
+const jwtSecret = "mysecret";
 
 const register = async (req, res) => {
-    const { username, password } = req.body;
+  const { username, password } = req.body;
 
-    const createdUser = null;
+  const cryptHash = await bcrypt.hash(password, 10);
 
-    res.json({ data: createdUser });
+  const createdUser = await prisma.user.create({
+    data: {
+      username: username,
+      password: cryptHash,
+    },
+  });
+
+  res.json({ data: createdUser });
 };
 
 const login = async (req, res) => {
-    const { username, password } = req.body;
-
-    const foundUser = null;
+  const { username, password } = req.body;
 
-    if (!foundUser) {
-        return res.status(401).json({ error: 'Invalid username or password.' });
-    }
+  const foundUser = await prisma.user.findUnique({
+    where: { username: username },
+  });
 
-    const passwordsMatch = false;
+  if (!foundUser) {
+    return res.status(401).json({ error: "Invalid username or password." });
+  }
 
-    if (!passwordsMatch) {
-        return res.status(401).json({ error: 'Invalid username or password.' });
-    }
+  const passwordsMatch = await bcrypt.compare(password, foundUser.password);
 
-    const token = null;
+  if (!passwordsMatch) {
+    return res.status(401).json({ error: "Invalid username or password." });
+  }
 
-    res.json({ data: token });
+  const token = jwt.sign(username, jwtSecret);
+  console.log(token);
+  res.json({ data: token });
 };
 
-export {
-    register,
-    login
-};
+export { register, login };

From 900821ab1b6662f7a3b70a05f7d7f7dbfbba7b6d Mon Sep 17 00:00:00 2001
From: Atakan Temizkan <atikotemizkan@gmail.com>
Date: Wed, 20 Nov 2024 19:54:49 +0300
Subject: [PATCH 2/8] added error messages

---
 src/client/App.jsx              |  5 ++++-
 src/server/controllers/movie.js | 26 ++++++++++++++------------
 src/server/controllers/user.js  | 26 +++++++++++++++-----------
 3 files changed, 33 insertions(+), 24 deletions(-)

diff --git a/src/client/App.jsx b/src/client/App.jsx
index a9a8350c..693b816d 100644
--- a/src/client/App.jsx
+++ b/src/client/App.jsx
@@ -34,11 +34,12 @@ function App() {
    * */
 
   const handleRegister = async ({ username, password }) => {
-    await fetch(`${apiUrl}/user/register`, {
+    const response = await fetch(`${apiUrl}/user/register`, {
       method: "POST",
       headers: { "Content-Type": "application/json" },
       body: JSON.stringify({ username: username, password: password }),
     });
+    alert(await response.json());
   };
 
   const handleLogin = async ({ username, password }) => {
@@ -49,6 +50,7 @@ function App() {
     });
     const token = await response.json();
     localStorage.setItem("token", token.data);
+    token.errer ? alert(token.error) : alert("Logged in successfully");
   };
 
   const handleCreateMovie = async ({ title, description, runtimeMins }) => {
@@ -65,6 +67,7 @@ function App() {
       }),
     });
     setNewMovie(!newMovie);
+    alert(await response.json());
   };
 
   return (
diff --git a/src/server/controllers/movie.js b/src/server/controllers/movie.js
index 6c395b29..8a21cb07 100644
--- a/src/server/controllers/movie.js
+++ b/src/server/controllers/movie.js
@@ -12,7 +12,6 @@ const getAllMovies = async (req, res) => {
 
 const createMovie = async (req, res) => {
   const { title, description, runtimeMins } = req.body;
-
   try {
     const token = req.headers.authentication;
     // todo verify the token
@@ -20,17 +19,20 @@ const createMovie = async (req, res) => {
   } catch (e) {
     return res.status(401).json({ error: "Invalid token provided." });
   }
-
-  const createdMovie = await prisma.movie.create({
-    data: {
-      title: title,
-      description: description,
-      runtimeMins: runtimeMins,
-    },
-  });
-
-  console.log(createdMovie);
-  res.json({ data: createdMovie });
+  try {
+    const createdMovie = await prisma.movie.create({
+      data: {
+        title: title,
+        description: description,
+        runtimeMins: runtimeMins,
+      },
+    });
+    console.log(createdMovie);
+    res.json("Movie created successfully");
+  } catch (e) {
+    console.log("Movie already exists");
+    res.json("Movie already exists");
+  }
 };
 
 export { getAllMovies, createMovie };
diff --git a/src/server/controllers/user.js b/src/server/controllers/user.js
index b2d4353f..507666d7 100644
--- a/src/server/controllers/user.js
+++ b/src/server/controllers/user.js
@@ -6,18 +6,22 @@ const prisma = new PrismaClient();
 const jwtSecret = "mysecret";
 
 const register = async (req, res) => {
-  const { username, password } = req.body;
+  try {
+    const { username, password } = req.body;
 
-  const cryptHash = await bcrypt.hash(password, 10);
+    const cryptHash = await bcrypt.hash(password, 10);
 
-  const createdUser = await prisma.user.create({
-    data: {
-      username: username,
-      password: cryptHash,
-    },
-  });
+    const createdUser = await prisma.user.create({
+      data: {
+        username: username,
+        password: cryptHash,
+      },
+    });
 
-  res.json({ data: createdUser });
+    res.status(201).json("User created successfully");
+  } catch {
+    res.status(409).json("User already exists");
+  }
 };
 
 const login = async (req, res) => {
@@ -28,13 +32,13 @@ const login = async (req, res) => {
   });
 
   if (!foundUser) {
-    return res.status(401).json({ error: "Invalid username or password." });
+    return res.status(401).json({ error: "Invalid username." });
   }
 
   const passwordsMatch = await bcrypt.compare(password, foundUser.password);
 
   if (!passwordsMatch) {
-    return res.status(401).json({ error: "Invalid username or password." });
+    return res.status(401).json({ error: "Invalid password." });
   }
 
   const token = jwt.sign(username, jwtSecret);

From 93a28c8e88118f862c8fb95faf5a539ca12600a7 Mon Sep 17 00:00:00 2001
From: Atakan Temizkan <atikotemizkan@gmail.com>
Date: Wed, 20 Nov 2024 19:55:25 +0300
Subject: [PATCH 3/8] added .env file for demonstration purposes

---
 .env | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 .env

diff --git a/.env b/.env
new file mode 100644
index 00000000..8bf0e1e0
--- /dev/null
+++ b/.env
@@ -0,0 +1,4 @@
+DATABASE_URL="postgresql://neondb_owner:DFcfaK5mb8Px@ep-calm-bush-a2kv7cr4.eu-central-1.aws.neon.tech/neondb?sslmode=require?schema=prisma"
+
+# This env var must be prefixed with `VITE_` in order to work in the client / Vite React app.
+VITE_PORT=4000

From 91268b2349d952ce67fa202493efa56b3b0bd7af Mon Sep 17 00:00:00 2001
From: Atakan Temizkan <atikotemizkan@gmail.com>
Date: Wed, 20 Nov 2024 20:07:20 +0300
Subject: [PATCH 4/8] updated readme

---
 README.md | 144 ++++++++++++++++++++++++++++++++++++++----------------
 1 file changed, 102 insertions(+), 42 deletions(-)

diff --git a/README.md b/README.md
index ac40573d..66a23f01 100644
--- a/README.md
+++ b/README.md
@@ -1,57 +1,117 @@
 # Authentication Challenge
 
-## Learning Objectives
+This project demonstrates a backend application where users can register, log in, and add movies to a database. It showcases my backend development skills.
 
-- Use a token-based approach to authorise access to API resources
-- Use a hashing library to encrypt sensitive information
-- Build a front-end application that interacts with a bearer-auth protected API
+## Features
 
-## Introduction
+- User registration
+- User authentication
+- Adding movies to the database
 
-You are tasked with building a small frontend application containing 3 forms and a list. There is a screenshot at the
-bottom of this document that gives you an idea of what to aim for. As you'll be able to see, it doesn't have to *look*
-good so don't spend time on styling!
+## Getting Started
 
-The flow of the application you build looks like this:
+The included `.env` file allows for seamless testing.
 
-1. A user fills in the register form to create their account with a hashed password
-2. The user fills in the login form to get a bearer token
-3. The user can then create movies once they have a valid token
-4. The list of displayed movies will update as a user creates them
+### Prerequisites
 
-## Setting up
+- Node.js installed
+- npm installed
 
-Take a little bit of time to familiarise yourself with the project structure - this exercise has both a front-end React
-app (`src/client/`) *and* a back-end express API (`src/server/`) in it.
+### Installation
 
-1. Fork this repository and clone the fork.
-    1. If you want to use the more challenging `freedom` branch, or the completely empty `empty` branch, remember to UNCHECK the checkbox for "Copy the 
-       `main` branch only"
+1. **Clone the repository**:
 
-       <img src="./assets/forking_screenshot.png" alt="forking screenshot" width=600></img>
-    2. Then, once you have cloned your fork of the repo, you can run `git checkout freedom` or `git checkout empty` in your terminal.
-    3. If you do not uncheck this box, then you will only be able to access the `main` branch.
-2. Rename `.env.example` to `.env`
-3. Edit the `DATABASE_URL` variable in `.env`, swapping `YOUR_DATABASE_URL` for the URL of your database
-4. Run `npm ci` to install the project dependencies. 
-5. If you're using the main branch, we have already created the Prisma schema and migrations for you. Run `npx prisma migrate reset` to execute the 
-   database migrations. Press `y` when it asks if you're sure.
+```bash
+git clone https://github.com/AtikoSpeed/auth-challenge.git
+```
 
-## Instructions
+2. **Navigate to the project directory**:
 
-- Run the app with `npm run dev` - this will open a React app in your browser *and* run the express server at the 
-  same time. This is thanks to the `concurrently` package that we have included in this project.
-- The frontend React app will run on Vite's default port, which is usually `5173` - check the terminal once you have
-  started the app to see what port it is running on.
-  - If you have other Vite apps running, then this port could be different.
-- The server will run on port `4000` (as set in `.env.example` - remember to create your own `.env` file). If you need 
-  to, you can change this by updating the `VITE_PORT` environment variable in your `.env`.
-  - Note: This environment variable is used in both the server and the client. Vite requires environment variables 
-    to be prefixed with `VITE_`, so do not change the name! Read more about environment variables in Vite 
-    [here](https://vitejs.dev/guide/env-and-mode.html#env-files).
-- Work through each file in the `requirements` directory in numerical order. You can choose whether to work on the
-  Client or Server version of each requirement first, but you may find it easier to do Server first.
+```bash
+cd auth-challenge
+```
 
-## Example solution
+3. **Install dependencies**:
 
-![](./assets/example_solution.png)
+```bash
+npm ci
+```
+
+### Running the Application
+
+Start the front and back-end servers with a single command:
+
+```bash
+npm run dev
+```
+
+The server will run on the port specified in the `.env` file.
+
+## Testing the Application
+
+Use an API testing tool like Postman to interact with the endpoints.
+
+### Endpoints
+
+- **Register**
+
+  - **Endpoint**: `POST /register`
+  - **Description**: Register a new user.
+  - **Request Body**:
+    ```json
+    {
+      "username": "your_username",
+      "password": "your_password"
+    }
+    ```
+  - **Responses**:
+    - `201 Created`: "User created successfully"
+    - `409 Conflict`: "User already exists"
+
+- **Login**
+
+  - **Endpoint**: `POST /login`
+  - **Description**: Authenticate a user and receive a JWT token.
+  - **Request Body**:
+    ```json
+    {
+      "username": "your_username",
+      "password": "your_password"
+    }
+    ```
+  - **Responses**:
+    - `200 OK`: `{ "data": "<token>" }`
+    - `401 Unauthorized`:
+      - `{ "error": "Invalid username." }`
+      - `{ "error": "Invalid password." }`
+
+- **Get All Movies**
+
+  - **Endpoint**: `GET /movies`
+  - **Description**: Retrieve all movies from the database.
+  - **Responses**:
+    - `200 OK`: `{ "data": [...] }`
+
+- **Add Movie**
+  - **Endpoint**: `POST /movies`
+  - **Description**: Add a new movie to the database. Requires authentication.
+  - **Headers**:
+    ```
+    Authentication: Bearer <token>
+    ```
+  - **Request Body**:
+    ```json
+    {
+      "title": "Movie Title",
+      "description": "Movie Description",
+      "runtimeMins": 120
+    }
+    ```
+  - **Responses**:
+    - `200 OK`: "Movie created successfully"
+    - `401 Unauthorized`: `{ "error": "Invalid token provided." }`
+    - `409 Conflict`: "Movie already exists"
+
+## Purpose
+
+This project is intended to demonstrate my backend capabilities as a full-stack developer.

From 6c70decc382bdb8ebd9949e53089b99b69df756f Mon Sep 17 00:00:00 2001
From: AtikoSpeed <157288392+AtikoSpeed@users.noreply.github.com>
Date: Wed, 20 Nov 2024 20:10:23 +0300
Subject: [PATCH 5/8] Update README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 66a23f01..c35bde67 100644
--- a/README.md
+++ b/README.md
@@ -10,7 +10,7 @@ This project demonstrates a backend application where users can register, log in
 
 ## Getting Started
 
-The included `.env` file allows for seamless testing.
+The included `.env` file allows for seamless testing. **This is temporary and will be removed.**
 
 ### Prerequisites
 

From 1493d864c012d3ac4b63fdddfa6c2f59f81776a3 Mon Sep 17 00:00:00 2001
From: AtikoSpeed <157288392+AtikoSpeed@users.noreply.github.com>
Date: Wed, 20 Nov 2024 20:20:12 +0300
Subject: [PATCH 6/8] Update README.md

---
 README.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/README.md b/README.md
index c35bde67..b98363b4 100644
--- a/README.md
+++ b/README.md
@@ -2,6 +2,8 @@
 
 This project demonstrates a backend application where users can register, log in, and add movies to a database. It showcases my backend development skills.
 
+****Please be aware that the frontend is close to nonexistent since it's purpose is to demonstrate my backend capabilities****
+
 ## Features
 
 - User registration

From fedde2f3b98c3012ce94f0cc06a342c0f649d325 Mon Sep 17 00:00:00 2001
From: AtikoSpeed <157288392+AtikoSpeed@users.noreply.github.com>
Date: Wed, 20 Nov 2024 20:20:33 +0300
Subject: [PATCH 7/8] Update README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index b98363b4..b74262f3 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@
 
 This project demonstrates a backend application where users can register, log in, and add movies to a database. It showcases my backend development skills.
 
-****Please be aware that the frontend is close to nonexistent since it's purpose is to demonstrate my backend capabilities****
+****Please be aware that the frontend is close to nonexistent, since this project's purpose is to demonstrate my backend capabilities****
 
 ## Features
 

From dabaeec992ef7b564a3ae360ed6ca85ca8115e5c Mon Sep 17 00:00:00 2001
From: AtikoSpeed <157288392+AtikoSpeed@users.noreply.github.com>
Date: Tue, 26 Nov 2024 11:07:29 +0300
Subject: [PATCH 8/8] Delete .env

---
 .env | 4 ----
 1 file changed, 4 deletions(-)
 delete mode 100644 .env

diff --git a/.env b/.env
deleted file mode 100644
index 8bf0e1e0..00000000
--- a/.env
+++ /dev/null
@@ -1,4 +0,0 @@
-DATABASE_URL="postgresql://neondb_owner:DFcfaK5mb8Px@ep-calm-bush-a2kv7cr4.eu-central-1.aws.neon.tech/neondb?sslmode=require?schema=prisma"
-
-# This env var must be prefixed with `VITE_` in order to work in the client / Vite React app.
-VITE_PORT=4000