reset password form 1.0

server/backend/endpoints.py

@@ -2,7 +2,7 @@ from fastapi import FastAPI, HTTPException, status, Depends
 from fastapi.middleware.cors import CORSMiddleware
 from fastapi.responses import JSONResponse
 from fastapi.security import OAuth2PasswordRequestForm
-from . import pydentic, JWT
+from . import pydentic, JWT, password
 from datetime import datetime, timedelta
 from pydantic import EmailStr
 from server.database import db
@@ -37,25 +37,25 @@ async def get_all_rows(current_user: str = Depends(JWT.current_user)):
         else:
             raise HTTPException(status_code=404, detail="The user isn't found")
 @api.get("/get_user_by_email/{email}", response_model=pydentic.CreateUser)
-async def GetUserbyEmail(email:str, current_user: str = Depends(JWT.current_user)):
+async def get_user_by_email(email:str, current_user: str = Depends(JWT.current_user)):
     user = await db.get_user_by_email(email)
     if user:
         return user
     else:
         raise HTTPException(status_code=404, detail="The user isn't found")
-@api.post("/user_create", response_model=pydentic.CreateUser)
+@api.post("/user_create", response_model=pydentic.UsersInfo)
 async def create_user(row:pydentic.CreateUser):
     new_row = pydentic.CreateUser(email=row.email, description=row.description, activated = row.activated, password = row.password)
     await db.create_user(new_row)
     return new_row
-@api.delete("/user_delete/{email}", response_model=pydentic.CreateUser)
+@api.delete("/user_delete/{email}", response_model=pydentic.UsersInfo)
 async def delete_user(email:str,current_user: str = Depends(JWT.current_user)):
     user = await db.get_user_by_email(email)
     if not user:
         raise HTTPException(status_code=404, detail="The user isn't found")
     await db.delete_user(email)
     return user
-@api.put("/user_update/{email}", response_model=pydentic.CreateUser)
+@api.put("/user_update/{email}", response_model=pydentic.UsersInfo)
 async def update_user(email:str, updated_row: pydentic.UserUpdate, current_user: str = Depends(JWT.current_user)):
     user = await db.get_user_by_email(email)
     if not user:
@@ -89,4 +89,15 @@ async def login_user(form_data: OAuth2PasswordRequestForm = Depends()):
         {"sub": user.email},
         timedelta(minutes=JWT.ACCESS_TOKEN_EXPIRE_MINUTES)
     )
-    return {"access_token": access_token, "token_type": "bearer"}
+    return {"access_token": access_token, "token_type": "bearer"}
+@api.post("/reset", response_model=pydentic.UsersInfo)
+async def reset_user(row:pydentic.UserReset):
+    user = await db.get_user_by_email(row.email)
+    if not user:
+        raise HTTPException(status_code=401, detail="The user isn't found")
+    new_password = password.generate_password()
+    new_row = pydentic.UserReset(email=row.email, new_password=new_password)
+    password.send_password(new_row)
+    user = await db.reset_user(new_row)
+    return user
+

server/backend/password.py

@@ -0,0 +1,69 @@
+import os
+import string
+import secrets
+import smtplib
+from email.message import EmailMessage
+from dotenv import load_dotenv
+
+
+def generate_password(length: int = 12) -> str:
+    """Генерация пароля: минимум 1 буква, 1 цифра и 1 спецсимвол"""
+    if length < 3:
+        raise ValueError("Длина пароля должна быть минимум 3 символа")
+
+    # обязательные категории
+    password = [
+        secrets.choice(string.ascii_letters),
+        secrets.choice(string.digits),
+        secrets.choice(string.punctuation),
+    ]
+
+    # остальные символы
+    all_chars = string.ascii_letters + string.digits + string.punctuation
+    password += [secrets.choice(all_chars) for _ in range(length - 3)]
+
+    # перемешиваем
+    secrets.SystemRandom().shuffle(password)
+    return "".join(password)
+
+
+load_dotenv()
+
+
+def send_password(user_info):
+    smtp_domain = os.getenv("SMTP_DOMAIN")
+    smtp_port = int(os.getenv("SMTP_PORT", "587"))
+    mail_login = os.getenv("MAIL_LOGIN")
+    mail_password = os.getenv("MAIL_PASSWORD")
+
+    msg = EmailMessage()
+    msg["From"] = mail_login
+    msg["To"] = user_info.email
+    msg["Subject"] = "Ваш новый пароль"
+    msg.set_content(
+        f"Здравствуйте!\n\n"
+        f"Ваш новый пароль: {user_info.new_password}\n\n"
+        "Рекомендуем сразу его сменить."
+    )
+
+    try:
+        if smtp_port == 465:
+            # SSL-соединение сразу
+            with smtplib.SMTP_SSL(smtp_domain, smtp_port, timeout=10) as smtp:
+                smtp.login(mail_login, mail_password)
+                smtp.send_message(msg)
+        else:
+            # STARTTLS (обычно порт 587)
+            with smtplib.SMTP(smtp_domain, smtp_port, timeout=10) as smtp:
+                smtp.ehlo()
+                smtp.starttls()
+                smtp.ehlo()
+                smtp.login(mail_login, mail_password)
+                smtp.send_message(msg)
+
+        print(f"Пароль отправлен на {user_info.email}")
+
+    except Exception as e:
+        # Логируй ошибку, но не пались паролем в логах!
+        print(f"Ошибка при отправке письма: {e}")
+        raise

server/backend/pydentic.py

@@ -36,5 +36,9 @@ class UserUpdate(BaseModel):
 class UserLogin(BaseModel):
     email:EmailStr = Field(..., min_length=6, max_length=254, description="user's email")
     password:str = Field(..., description="Password")
-class UserLogout(BaseModel):
-    email:EmailStr = Field(..., min_length=6, max_length=254, description="user's email")
+class UserReset(BaseModel):
+    email:EmailStr = Field(..., min_length=6, max_length=254, description="user's email")
+    new_password:constr(min_length=8) = Field(None,description="New_password")
+    @validator('new_password')
+    def password_validator(cls, new_password):
+        return check_password_complexity(cls, new_password)