Merge pull request 'fix mail' (#48 ) from hotfix/template-mail into master

Reviewed-on: #48
fix mail
2025-02-10 22:31:53 +00:00 · 2025-02-10 23:29:50 +01:00 · 2025-02-10 22:15:02 +00:00 · 2025-02-10 23:14:00 +01:00 · 2025-02-02 17:41:21 +00:00 · 2025-02-02 18:26:24 +01:00
5 changed files with 140 additions and 14 deletions
--- a/app/models/users.py
+++ b/app/models/users.py
@@ -42,7 +42,9 @@ class UserCreate(BaseModel):
    username: str
    password: str
    email: EmailStr
-
+    birth: str
+    firstName: str
+    name: str

 class UserInDB(User):
    password: str
--- a/app/routers/mail.py
+++ b/app/routers/mail.py
@@ -1,12 +1,18 @@
-from fastapi import APIRouter, HTTPException, status
+from fastapi import APIRouter, HTTPException, status, Request
+from fastapi.templating import Jinja2Templates
 from ..dependencies import users_token, database, mail
 from ..models import users, email
-from fastapi.responses import JSONResponse
+from fastapi.responses import JSONResponse, HTMLResponse
 from fastapi_mail import  MessageSchema, MessageType, FastMail
-import random
+import random, os 
 router = APIRouter()


+# Assurer que le chemin vers "templates" est correct
+BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
+templates = Jinja2Templates(directory=os.path.join(BASE_DIR, "templates"))
+
+
@router.post("/mail",tags=["mail"])
 async def create_user(userSingle: users.UserCreate | None = None):
    if userSingle is None:
@@ -19,7 +25,7 @@ async def create_user(userSingle: users.UserCreate | None = None):
    if user is not None:
         raise HTTPException(
            status_code=status.HTTP_204_NO_CONTENT,
-            detail="User is already exist"
+            detail="User already exists"
        )

    fm = FastMail(mail.conf)
@@ -35,26 +41,32 @@ async def create_user(userSingle: users.UserCreate | None = None):
        )
    
    await fm.send_message(message, template_name="mailer.html") 
-    current_user = users.User(username=userSingle.username, password=users_token.get_password_hash(userSingle.password), email=userSingle.email)
+    current_user = users.User(username=userSingle.username, password=users_token.get_password_hash(userSingle.password), email=userSingle.email, name=userSingle.name, firstName=userSingle.firstName)
+    current_user.status = 0
    user_repository.save(current_user)
    database.connect_redis.set(userSingle.username, key_hashed)
    return JSONResponse(status_code=status.HTTP_200_OK, content={"message": "email has been sent"})

-@router.get("/mail",tags=["mail"])
-async def confirm_user(key: str | None = None, username: str | None = None):
+@router.get("/mail", tags=["mail"])
+async def confirm_user(request: Request, key: str | None = None, username: str | None = None):
    if key is None or username is None:
        raise HTTPException(
            status_code=status.HTTP_400_BAD_REQUEST,
            detail="Parameter key or/and username is empty"
        )
+
    user_repository = users.UserRepository(database=database.database)
    user = user_repository.find_one_by({"username": {'$eq': username}})
    key_hashed = database.connect_redis.get(username)
+
    if key_hashed != key:
        raise HTTPException(
            status_code=status.HTTP_400_BAD_REQUEST,
            detail="Key is invalid"
        )
-    user.confirmed = True
+
+    user.status = 1
    user_repository.save(user)
-    return JSONResponse(status_code=status.HTTP_200_OK, content={"message": "user account confirmed"})
+
+    # Rendre la page HTML avec Jinja2 et passer la variable username
+    return templates.TemplateResponse("confirm.html", {"request": request, "username": username})
--- a/app/routers/users.py
+++ b/app/routers/users.py
@@ -139,6 +139,7 @@ async def delete_users_id(item_id : str, authorize: Annotated[bool, Depends(perm
    response = JSONResponse(content=content)  
    return response

+
@router.put("/users/me",tags=["users"])
 async def update_users_me(current_user: Annotated[users.User, Depends(users_token.get_current_active_user)], authorize: Annotated[bool, Depends(permissions_checker.PermissionChecker(roles=["Admin", "User"]))], userSingle: users.UserIn | None = None):
    user_repository = users.UserRepository(database=database.database)
--- a/app/templates/confirm.html
+++ b/app/templates/confirm.html
@@ -0,0 +1,58 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="UTF-8">
+    <title>Votre compte est activé</title>
+    <style>
+        body {
+            font-family: Arial, sans-serif;
+            background-color: #f4f4f4;
+            margin: 0;
+            padding: 0;
+        }
+        .container {
+            max-width: 600px;
+            margin: 20px auto;
+            background: #ffffff;
+            padding: 20px;
+            border-radius: 10px;
+            box-shadow: 0 2px 5px rgba(0,0,0,0.1);
+            text-align: center;
+        }
+        h2 {
+            color: #333;
+        }
+        p {
+            color: #666;
+            font-size: 16px;
+        }
+        .button {
+            display: inline-block;
+            background: #007BFF;
+            color: white;
+            padding: 12px 20px;
+            text-decoration: none;
+            border-radius: 5px;
+            font-size: 16px;
+            font-weight: bold;
+            margin-top: 20px;
+        }
+        .button:hover {
+            background: #0056b3;
+        }
+        .footer {
+            margin-top: 20px;
+            font-size: 12px;
+            color: #888;
+        }
+    </style>
+</head>
+<body>
+    <div class="container">
+        <h2>Félicitations, {{ username }} ! 🎉</h2>
+        <p>Votre compte a été activé avec succès.</p>
+        <p>Vous pouvez maintenant vous connecter et profiter pleinement de nos services.</p>
+        <p class="footer">Si vous avez des questions, n'hésitez pas à nous contacter.</p>
+    </div>
+</body>
+</html>
--- a/app/templates/mailer.html
+++ b/app/templates/mailer.html
@@ -1,6 +1,59 @@
+<!DOCTYPE html>
 <html>
-<head><title>Email</title></head>
-<body><p>Voici un lien https://localhost:8080/api/mail?key={{ key }}&username={{ username }}
-</p></body>
-
+<head>
+    <meta charset="UTF-8">
+    <title>Confirmation de votre compte</title>
+    <style>
+        body {
+            font-family: Arial, sans-serif;
+            background-color: #f4f4f4;
+            margin: 0;
+            padding: 0;
+        }
+        .container {
+            max-width: 600px;
+            margin: 20px auto;
+            background: #ffffff;
+            padding: 20px;
+            border-radius: 10px;
+            box-shadow: 0 2px 5px rgba(0,0,0,0.1);
+            text-align: center;
+        }
+        h2 {
+            color: #333;
+        }
+        p {
+            color: #666;
+            font-size: 16px;
+        }
+        .button {
+            display: inline-block;
+            background: #28a745;
+            color: white;
+            padding: 12px 20px;
+            text-decoration: none;
+            border-radius: 5px;
+            font-size: 16px;
+            font-weight: bold;
+            margin-top: 20px;
+        }
+        .button:hover {
+            background: #218838;
+        }
+        .footer {
+            margin-top: 20px;
+            font-size: 12px;
+            color: #888;
+        }
+    </style>
+</head>
+<body>
+    <div class="container">
+        <h2>Bienvenue, {{ username }} ! 🎉</h2>
+        <p>Merci de vous être inscrit sur notre plateforme.</p>
+        <p>Pour finaliser votre inscription, veuillez confirmer votre compte en cliquant sur le bouton ci-dessous :</p>
+        <a href="https://backend.valczeryba.ovh/mail?key={{ key }}&username={{ username }}" class="button">Confirmer mon compte</a>
+        <p class="footer">Si vous n'êtes pas à l'origine de cette inscription, ignorez simplement cet email.</p>
+    </div>
+</body>
 </html>
Author	SHA1	Message	Date
v4l3n71n	83449eba92	Merge pull request 'fix mail' (#48 ) from hotfix/template-mail into master Reviewed-on: #48	2025-02-10 22:31:53 +00:00
Valentin CZERYBA	563e0e07d1	fix mail	2025-02-10 23:29:50 +01:00
v4l3n71n	528176fc0d	Merge pull request 'add confirm mail' (#47 ) from hotfix/template-mail into master Reviewed-on: #47	2025-02-10 22:15:02 +00:00
Valentin CZERYBA	e677261be5	add confirm mail	2025-02-10 23:14:00 +01:00
v4l3n71n	0a5ff67da5	Merge pull request 'more detail for profile creation' (#46 ) from feature/create-user-post into master Reviewed-on: #46	2025-02-02 17:41:21 +00:00
Valentin CZERYBA	3f720e7279	more detail for profile creation	2025-02-02 18:26:24 +01:00
v4l3n71n	ea6f9790d9	Merge pull request 'add status changing' (#45 ) from feature/create-user-post into master Reviewed-on: #45	2025-01-26 20:25:28 +00:00
Valentin CZERYBA	cfa1402984	add status changing	2025-01-26 21:10:06 +01:00