@@ -58,7 +83,7 @@ function App() {
Movie list
- {movies.map(movie => {
+ {movies.map((movie) => {
return (
-
{movie.title}
diff --git a/src/server/controllers/movie.js b/src/server/controllers/movie.js
index d4733b61..8a21cb07 100644
--- a/src/server/controllers/movie.js
+++ b/src/server/controllers/movie.js
@@ -1,31 +1,38 @@
-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." });
+ }
+ 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
-};
+export { getAllMovies, createMovie };
diff --git a/src/server/controllers/user.js b/src/server/controllers/user.js
index 05db4183..507666d7 100644
--- a/src/server/controllers/user.js
+++ b/src/server/controllers/user.js
@@ -1,39 +1,49 @@
-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) => {
+ try {
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.status(201).json("User created successfully");
+ } catch {
+ res.status(409).json("User already exists");
+ }
};
const login = async (req, res) => {
- const { username, password } = req.body;
+ const { username, password } = req.body;
- const foundUser = null;
+ const foundUser = await prisma.user.findUnique({
+ where: { username: username },
+ });
- if (!foundUser) {
- return res.status(401).json({ error: 'Invalid username or password.' });
- }
+ if (!foundUser) {
+ return res.status(401).json({ error: "Invalid username." });
+ }
- const passwordsMatch = false;
+ const passwordsMatch = await bcrypt.compare(password, foundUser.password);
- if (!passwordsMatch) {
- return res.status(401).json({ error: 'Invalid username or password.' });
- }
+ if (!passwordsMatch) {
+ return res.status(401).json({ error: "Invalid password." });
+ }
- const token = null;
-
- res.json({ data: token });
+ const token = jwt.sign(username, jwtSecret);
+ console.log(token);
+ res.json({ data: token });
};
-export {
- register,
- login
-};
+export { register, login };
- 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.
+1. **Clone the repository**:
-## Instructions
+```bash
+git clone https://github.com/AtikoSpeed/auth-challenge.git
+```
-- 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.
+2. **Navigate to the project directory**:
-## Example solution
+```bash
+cd auth-challenge
+```
-
+3. **Install dependencies**:
+
+```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": "