diff --git a/api/src/app.py b/api/src/app.py index bf738b1..b078c19 100644 --- a/api/src/app.py +++ b/api/src/app.py @@ -1,5 +1,6 @@ """FastAPI application.""" from fastapi import Depends, FastAPI +from fastapi.middleware.cors import CORSMiddleware from dependencies.common_key_header import common_key_header from middlewares import client_auth @@ -8,6 +9,17 @@ app = FastAPI(title="NetWorkers API", version="1.0.0") +app.add_middleware( + CORSMiddleware, + allow_origins=["*"], + allow_credentials=True, + allow_methods=["GET", "POST", "PUT", "PATCH", "DELETE", "OPTIONS"], + allow_headers=["X-Common-Key", "Content-Type"], + expose_headers=["X-Common-Key"], +) + +app.add_middleware(client_auth.ClientAuth) + @app.get("/", summary="Get app version", dependencies=[Depends(common_key_header)]) async def get_info() -> dict: """Get the app info.""" @@ -17,8 +29,6 @@ async def get_info() -> dict: info["author"] = "BORGO, IUT Vélizy" return info -app.add_middleware(client_auth.ClientAuth) - app.include_router(auth.router, prefix="/auth", tags=["auth"], dependencies=[Depends(common_key_header)]) app.include_router(users.router, prefix="/users", tags=["users"], diff --git a/api/src/dependencies/common_key_header.py b/api/src/dependencies/common_key_header.py index 7d083bd..fb1e674 100644 --- a/api/src/dependencies/common_key_header.py +++ b/api/src/dependencies/common_key_header.py @@ -2,18 +2,22 @@ import os -from fastapi import Header, HTTPException +from fastapi import Header, HTTPException, Request -async def common_key_header(x_common_key: str = Header(...)) -> None: +async def common_key_header(request: Request, x_common_key: str = Header(...)) -> None: """Add Common Key Header in Swagger. Args: + request (Request): Request object. x_common_key (str, optional): Clé AES. Defaults to Header(...). Raises: HTTPException: _description_ """ + if request.method == "OPTIONS": + return None # noqa: RET501 + if x_common_key != os.getenv("COMMON_KEY"): raise HTTPException(status_code=403, detail="Invalid X-Common-Key") diff --git a/api/src/middlewares/client_auth.py b/api/src/middlewares/client_auth.py index bbe97c7..f5ed590 100644 --- a/api/src/middlewares/client_auth.py +++ b/api/src/middlewares/client_auth.py @@ -15,6 +15,9 @@ async def dispatch(self, request: Request, call_next: callable) -> Response: if request.url.path in ["/docs", "/redoc", "/openapi.json"]: return await call_next(request) + if request.method == "OPTIONS": + return await call_next(request) + common_key = request.headers.get("X-Common-Key") if common_key != COMMON_KEY: return JSONResponse(status_code=403, diff --git a/api/src/routes/auth.py b/api/src/routes/auth.py index feef1f0..208ebaa 100644 --- a/api/src/routes/auth.py +++ b/api/src/routes/auth.py @@ -9,6 +9,7 @@ create_access_token, create_refresh_token, get_hashed_password, + verify_jwt, verify_password, ) @@ -37,7 +38,14 @@ async def login(auth: Auth) -> dict: @router.post("/refresh", summary="Refresh the access token") async def refresh(refresh_token: RefreshToken) -> dict: """Refresh the access token.""" - return {"access_token": create_access_token(refresh_token)} + # Verify the refresh token + token = verify_jwt(refresh_token.refresh_token) + if not token: + raise HTTPException(status_code=400, detail="Invalid refresh token") + + # Create a new access token + access_token = create_access_token(token["sub"]) + return {"access_token": access_token} @router.post("/register", summary="Register to the app") async def register(auth: Auth) -> dict: diff --git a/api/src/utils/auth.py b/api/src/utils/auth.py index 266d37a..c637737 100644 --- a/api/src/utils/auth.py +++ b/api/src/utils/auth.py @@ -6,7 +6,7 @@ from jose import JWTError, jwt from passlib.context import CryptContext -ACCESS_TOKEN_EXPIRE_MINUTES = 30 # 30 minutes +ACCESS_TOKEN_EXPIRE_MINUTES = 60 * 24 # 1 day REFRESH_TOKEN_EXPIRE_MINUTES = 60 * 24 * 7 # 7 days ALGORITHM = "HS256" JWT_SECRET_KEY = os.getenv("JWT_SECRET_KEY") diff --git a/docker-compose.yml b/docker-compose.yml index 3cef6ac..5dea9ca 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -30,6 +30,21 @@ services: - .env/db networks: - app-network + + web: + image: node:23.0 + container_name: networkers-web + working_dir: /opt/web + command: bash -c "npm install && npm run dev" + volumes: + - ./front-js:/opt/web + depends_on: + - api + restart: always + ports: + - "3000:3000" + networks: + - app-network networks: app-network: diff --git a/front-js/package-lock.json b/front-js/package-lock.json index fe0d551..9ef5f8d 100644 --- a/front-js/package-lock.json +++ b/front-js/package-lock.json @@ -9,6 +9,8 @@ "version": "0.1.0", "dependencies": { "@nextui-org/spacer": "^2.2.4", + "axios": "^1.7.9", + "js-cookie": "^3.0.5", "next": "15.1.0", "react": "^19.0.0", "react-dom": "^19.0.0", @@ -16,6 +18,7 @@ }, "devDependencies": { "@eslint/eslintrc": "^3", + "@types/js-cookie": "^3.0.6", "@types/node": "^20", "@types/react": "^19", "@types/react-dom": "^19", @@ -1223,6 +1226,13 @@ "integrity": "sha512-AYnb1nQyY49te+VRAVgmzfcgjYS91mY5P0TKUDCLEM+gNnA+3T6rWITXRLYCpahpqSQbN5cE+gHpnPyXjHWxcw==", "dev": true }, + "node_modules/@types/js-cookie": { + "version": "3.0.6", + "resolved": "https://registry.npmjs.org/@types/js-cookie/-/js-cookie-3.0.6.tgz", + "integrity": "sha512-wkw9yd1kEXOPnvEeEV1Go1MmxtBJL0RR79aOTAApecWFVu7w0NNXNqhcWgvw2YgZDYadliXkl14pa3WXw5jlCQ==", + "dev": true, + "license": "MIT" + }, "node_modules/@types/json-schema": { "version": "7.0.15", "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.15.tgz", @@ -1744,6 +1754,12 @@ "integrity": "sha512-OH/2E5Fg20h2aPrbe+QL8JZQFko0YZaF+j4mnQ7BGhfavO7OpSLa8a0y9sBwomHdSbkhTS8TQNayBfnW5DwbvQ==", "dev": true }, + "node_modules/asynckit": { + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz", + "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==", + "license": "MIT" + }, "node_modules/available-typed-arrays": { "version": "1.0.7", "resolved": "https://registry.npmjs.org/available-typed-arrays/-/available-typed-arrays-1.0.7.tgz", @@ -1768,6 +1784,17 @@ "node": ">=4" } }, + "node_modules/axios": { + "version": "1.7.9", + "resolved": "https://registry.npmjs.org/axios/-/axios-1.7.9.tgz", + "integrity": "sha512-LhLcE7Hbiryz8oMDdDptSrWowmB4Bl6RCt6sIJKpRB4XtVf0iEgewX3au/pJqm+Py1kCASkb/FFKjxQaLtxJvw==", + "license": "MIT", + "dependencies": { + "follow-redirects": "^1.15.6", + "form-data": "^4.0.0", + "proxy-from-env": "^1.1.0" + } + }, "node_modules/axobject-query": { "version": "4.1.0", "resolved": "https://registry.npmjs.org/axobject-query/-/axobject-query-4.1.0.tgz", @@ -1996,6 +2023,18 @@ "integrity": "sha512-zW190nQTIoXcGCaU08DvVNFTmQhUpnJfVuAKfWqUQkflXKpaDdpaYoM0iluLS9lgJNHyBF58KKA2FBEwkD7wog==", "peer": true }, + "node_modules/combined-stream": { + "version": "1.0.8", + "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz", + "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==", + "license": "MIT", + "dependencies": { + "delayed-stream": "~1.0.0" + }, + "engines": { + "node": ">= 0.8" + } + }, "node_modules/commander": { "version": "4.1.1", "resolved": "https://registry.npmjs.org/commander/-/commander-4.1.1.tgz", @@ -2165,6 +2204,15 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/delayed-stream": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz", + "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==", + "license": "MIT", + "engines": { + "node": ">=0.4.0" + } + }, "node_modules/detect-libc": { "version": "2.0.3", "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-2.0.3.tgz", @@ -2971,6 +3019,26 @@ "integrity": "sha512-AiwGJM8YcNOaobumgtng+6NHuOqC3A7MixFeDafM3X9cIUM+xUXoS5Vfgf+OihAYe20fxqNM9yPBXJzRtZ/4eA==", "dev": true }, + "node_modules/follow-redirects": { + "version": "1.15.9", + "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.9.tgz", + "integrity": "sha512-gew4GsXizNgdoRyqmyfMHyAmXsZDk6mHkSxZFCzW9gwlbtOW44CDtYavM+y+72qD/Vq2l550kMF52DT8fOLJqQ==", + "funding": [ + { + "type": "individual", + "url": "https://github.com/sponsors/RubenVerborgh" + } + ], + "license": "MIT", + "engines": { + "node": ">=4.0" + }, + "peerDependenciesMeta": { + "debug": { + "optional": true + } + } + }, "node_modules/for-each": { "version": "0.3.3", "resolved": "https://registry.npmjs.org/for-each/-/for-each-0.3.3.tgz", @@ -2996,6 +3064,20 @@ "url": "https://github.com/sponsors/isaacs" } }, + "node_modules/form-data": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.1.tgz", + "integrity": "sha512-tzN8e4TX8+kkxGPK8D5u0FNmjPUjw3lwC9lSLxxoB/+GtsJG91CO8bSWy73APlgAZzZbXEYZJuxjkHH2w+Ezhw==", + "license": "MIT", + "dependencies": { + "asynckit": "^0.4.0", + "combined-stream": "^1.0.8", + "mime-types": "^2.1.12" + }, + "engines": { + "node": ">= 6" + } + }, "node_modules/fsevents": { "version": "2.3.3", "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz", @@ -3783,6 +3865,15 @@ "jiti": "bin/jiti.js" } }, + "node_modules/js-cookie": { + "version": "3.0.5", + "resolved": "https://registry.npmjs.org/js-cookie/-/js-cookie-3.0.5.tgz", + "integrity": "sha512-cEiJEAEoIbWfCZYKWhVwFuvPX1gETRYPw6LlaTKoxD3s2AkXzkCjnp6h0V77ozyqj0jakteJ4YqDJT830+lVGw==", + "license": "MIT", + "engines": { + "node": ">=14" + } + }, "node_modules/js-tokens": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", @@ -3972,6 +4063,27 @@ "node": ">=8.6" } }, + "node_modules/mime-db": { + "version": "1.52.0", + "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz", + "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==", + "license": "MIT", + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/mime-types": { + "version": "2.1.35", + "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz", + "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==", + "license": "MIT", + "dependencies": { + "mime-db": "1.52.0" + }, + "engines": { + "node": ">= 0.6" + } + }, "node_modules/minimatch": { "version": "3.1.2", "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", @@ -4552,6 +4664,12 @@ "react-is": "^16.13.1" } }, + "node_modules/proxy-from-env": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz", + "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==", + "license": "MIT" + }, "node_modules/punycode": { "version": "2.3.1", "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz", diff --git a/front-js/package.json b/front-js/package.json index 7d03d86..df69e35 100644 --- a/front-js/package.json +++ b/front-js/package.json @@ -11,6 +11,8 @@ }, "dependencies": { "@nextui-org/spacer": "^2.2.4", + "axios": "^1.7.9", + "js-cookie": "^3.0.5", "next": "15.1.0", "react": "^19.0.0", "react-dom": "^19.0.0", @@ -18,6 +20,7 @@ }, "devDependencies": { "@eslint/eslintrc": "^3", + "@types/js-cookie": "^3.0.6", "@types/node": "^20", "@types/react": "^19", "@types/react-dom": "^19", diff --git a/front-js/src/app/auth/login/page.tsx b/front-js/src/app/auth/login/page.tsx index 926d8cd..ea81b31 100644 --- a/front-js/src/app/auth/login/page.tsx +++ b/front-js/src/app/auth/login/page.tsx @@ -9,12 +9,44 @@ import Title from "@/components/Title"; import Text from "@/components/Text"; import { useState } from "react"; import Link from "@/components/Link"; +import axios from '@/axiosConfig'; +import Cookies from "js-cookie"; export default function Home() { const [username, setUsername] = useState(""); const [password, setPassword] = useState(""); + const [error, setError] = useState(""); + + const handleLogin = async (e: { preventDefault: () => void; }) => { + e.preventDefault(); + try { + const response = await axios.post("/auth/login", { + "username": username, + "password": password + }); + const data = response.data; + if (response.status === 200) { + Cookies.set("access_token", data.access_token); + Cookies.set("refresh_token", data.refresh_token); + window.location.href = "/"; + } + + } catch (error: any) { + if (error.status === 400 || error.status === 404) { + setError("Nom d'utilisateur ou mot de passe incorrect"); + } + else if (error.status === 403) { + setError("Erreur lors de la connexion"); + } + else { + setError("Erreur lors de la connexion"); + } + } + } + + return ( @@ -41,12 +73,14 @@ export default function Home() { required label="Mot de passe" /> + { error !== "" ? Erreur : {error} : null }