Igen
This commit is contained in:
@@ -1,11 +1,24 @@
|
||||
from pydantic_settings import BaseSettings
|
||||
|
||||
|
||||
class Settings(BaseSettings):
|
||||
DATABASE_URL: str
|
||||
SECRET_KEY: str
|
||||
ACCESS_TOKEN_EXPIRE_MINUTES: int = 10080 # 7 dage
|
||||
|
||||
# Mail
|
||||
MAIL_HOST: str = "mailhog"
|
||||
MAIL_PORT: int = 1025
|
||||
MAIL_FROM: str = "noreply@linedance.local"
|
||||
MAIL_USERNAME: str = ""
|
||||
MAIL_PASSWORD: str = ""
|
||||
MAIL_TLS: bool = False
|
||||
|
||||
# Base URL til verificerings-links
|
||||
BASE_URL: str = "http://localhost:8000"
|
||||
|
||||
class Config:
|
||||
env_file = ".env"
|
||||
|
||||
|
||||
settings = Settings()
|
||||
|
||||
103
linedance-api/app/core/mail.py
Normal file
103
linedance-api/app/core/mail.py
Normal file
@@ -0,0 +1,103 @@
|
||||
"""
|
||||
mail.py — Asynkron mail-sending via aiosmtplib.
|
||||
I udvikling bruges MailHog som SMTP-server.
|
||||
"""
|
||||
import asyncio
|
||||
import secrets
|
||||
from email.mime.multipart import MIMEMultipart
|
||||
from email.mime.text import MIMEText
|
||||
|
||||
import aiosmtplib
|
||||
from app.core.config import settings
|
||||
|
||||
|
||||
def generate_verify_token() -> str:
|
||||
return secrets.token_urlsafe(32)
|
||||
|
||||
|
||||
async def send_verification_email(email: str, username: str, token: str):
|
||||
verify_url = f"{settings.BASE_URL}/auth/verify/{token}"
|
||||
|
||||
msg = MIMEMultipart("alternative")
|
||||
msg["Subject"] = "Bekræft din LineDance-konto"
|
||||
msg["From"] = settings.MAIL_FROM
|
||||
msg["To"] = email
|
||||
|
||||
text = f"""Hej {username},
|
||||
|
||||
Tak for at oprette en konto på LineDance Player.
|
||||
|
||||
Klik på linket nedenfor for at bekræfte din e-mailadresse:
|
||||
{verify_url}
|
||||
|
||||
Linket udløber ikke — men kontoen er ikke aktiv før du har bekræftet.
|
||||
|
||||
Hilsen
|
||||
LineDance Player
|
||||
"""
|
||||
|
||||
html = f"""<html><body>
|
||||
<h2>Velkommen til LineDance Player, {username}!</h2>
|
||||
<p>Klik på knappen nedenfor for at bekræfte din e-mailadresse:</p>
|
||||
<p>
|
||||
<a href="{verify_url}"
|
||||
style="background:#e8a020;color:#111;padding:12px 24px;
|
||||
border-radius:6px;text-decoration:none;font-weight:bold;">
|
||||
Bekræft e-mail
|
||||
</a>
|
||||
</p>
|
||||
<p>Eller kopier dette link:<br>
|
||||
<a href="{verify_url}">{verify_url}</a></p>
|
||||
<p>Linket udløber ikke.</p>
|
||||
</body></html>"""
|
||||
|
||||
msg.attach(MIMEText(text, "plain", "utf-8"))
|
||||
msg.attach(MIMEText(html, "html", "utf-8"))
|
||||
|
||||
try:
|
||||
await aiosmtplib.send(
|
||||
msg,
|
||||
hostname=settings.MAIL_HOST,
|
||||
port=settings.MAIL_PORT,
|
||||
username=settings.MAIL_USERNAME or None,
|
||||
password=settings.MAIL_PASSWORD or None,
|
||||
use_tls=settings.MAIL_TLS,
|
||||
)
|
||||
except Exception as e:
|
||||
# Log fejl men lad registrering gennemføre
|
||||
print(f"Mail-fejl: {e}")
|
||||
|
||||
|
||||
async def send_share_invitation(email: str, owner_name: str,
|
||||
playlist_name: str, permission: str,
|
||||
accept_url: str):
|
||||
perm_text = {"view": "se", "copy": "kopiere", "edit": "redigere"}.get(permission, "se")
|
||||
|
||||
msg = MIMEMultipart("alternative")
|
||||
msg["Subject"] = f"{owner_name} har delt en danseliste med dig"
|
||||
msg["From"] = settings.MAIL_FROM
|
||||
msg["To"] = email
|
||||
|
||||
html = f"""<html><body>
|
||||
<h2>Du er inviteret!</h2>
|
||||
<p>{owner_name} har delt danselisten <strong>{playlist_name}</strong> med dig.</p>
|
||||
<p>Du har fået adgang til at <strong>{perm_text}</strong> listen.</p>
|
||||
<p>
|
||||
<a href="{accept_url}"
|
||||
style="background:#e8a020;color:#111;padding:12px 24px;
|
||||
border-radius:6px;text-decoration:none;font-weight:bold;">
|
||||
Se danseliste
|
||||
</a>
|
||||
</p>
|
||||
</body></html>"""
|
||||
|
||||
msg.attach(MIMEText(html, "html", "utf-8"))
|
||||
try:
|
||||
await aiosmtplib.send(
|
||||
msg,
|
||||
hostname=settings.MAIL_HOST,
|
||||
port=settings.MAIL_PORT,
|
||||
use_tls=settings.MAIL_TLS,
|
||||
)
|
||||
except Exception as e:
|
||||
print(f"Mail-fejl (share): {e}")
|
||||
@@ -1,8 +1,8 @@
|
||||
from datetime import datetime, timedelta, timezone
|
||||
from fastapi import Depends, HTTPException
|
||||
from fastapi.security import OAuth2PasswordBearer
|
||||
from jose import JWTError, jwt
|
||||
from passlib.context import CryptContext
|
||||
from fastapi import Depends, HTTPException, status
|
||||
from fastapi.security import OAuth2PasswordBearer
|
||||
from sqlalchemy.orm import Session
|
||||
from app.core.config import settings
|
||||
from app.core.database import get_db
|
||||
@@ -10,44 +10,32 @@ from app.core.database import get_db
|
||||
pwd_context = CryptContext(schemes=["bcrypt"], deprecated="auto")
|
||||
oauth2_scheme = OAuth2PasswordBearer(tokenUrl="/auth/login")
|
||||
|
||||
ALGORITHM = "HS256"
|
||||
|
||||
|
||||
def hash_password(password: str) -> str:
|
||||
return pwd_context.hash(password)
|
||||
|
||||
|
||||
def verify_password(plain: str, hashed: str) -> bool:
|
||||
return pwd_context.verify(plain, hashed)
|
||||
|
||||
|
||||
def create_access_token(data: dict) -> str:
|
||||
expire = datetime.now(timezone.utc) + timedelta(
|
||||
minutes=settings.ACCESS_TOKEN_EXPIRE_MINUTES
|
||||
)
|
||||
return jwt.encode({**data, "exp": expire}, settings.SECRET_KEY, algorithm=ALGORITHM)
|
||||
|
||||
return jwt.encode({**data, "exp": expire}, settings.SECRET_KEY, algorithm="HS256")
|
||||
|
||||
def get_current_user(
|
||||
token: str = Depends(oauth2_scheme),
|
||||
db: Session = Depends(get_db),
|
||||
db: Session = Depends(get_db)
|
||||
):
|
||||
from app.models.user import User
|
||||
|
||||
credentials_exception = HTTPException(
|
||||
status_code=status.HTTP_401_UNAUTHORIZED,
|
||||
detail="Kunne ikke validere token",
|
||||
headers={"WWW-Authenticate": "Bearer"},
|
||||
)
|
||||
from app.models import User
|
||||
try:
|
||||
payload = jwt.decode(token, settings.SECRET_KEY, algorithms=[ALGORITHM])
|
||||
user_id: str = payload.get("sub")
|
||||
if user_id is None:
|
||||
raise credentials_exception
|
||||
payload = jwt.decode(token, settings.SECRET_KEY, algorithms=["HS256"])
|
||||
user_id = payload.get("sub")
|
||||
if not user_id:
|
||||
raise HTTPException(401, "Ugyldig token")
|
||||
except JWTError:
|
||||
raise credentials_exception
|
||||
|
||||
raise HTTPException(401, "Ugyldig token")
|
||||
user = db.query(User).filter(User.id == user_id).first()
|
||||
if user is None:
|
||||
raise credentials_exception
|
||||
if not user:
|
||||
raise HTTPException(401, "Bruger ikke fundet")
|
||||
return user
|
||||
|
||||
Reference in New Issue
Block a user