feat(auth,privacy,web): step-by-step login, privacy settings persistence, TOTP QR, and API docs
Some checks failed
CI / test (push) Failing after 22s
Some checks failed
CI / test (push) Failing after 22s
This commit is contained in:
@@ -5,6 +5,7 @@ from sqlalchemy.ext.asyncio import AsyncSession
|
||||
|
||||
from app.auth.schemas import (
|
||||
AuthUserResponse,
|
||||
EmailStatusResponse,
|
||||
LoginRequest,
|
||||
MessageResponse,
|
||||
RefreshTokenRequest,
|
||||
@@ -30,6 +31,7 @@ from app.auth.service import (
|
||||
revoke_user_session,
|
||||
refresh_tokens,
|
||||
register_user,
|
||||
get_email_status,
|
||||
request_password_reset,
|
||||
resend_verification_email,
|
||||
reset_password,
|
||||
@@ -45,6 +47,14 @@ from app.users.models import User
|
||||
router = APIRouter(prefix="/auth", tags=["auth"])
|
||||
|
||||
|
||||
@router.get("/check-email", response_model=EmailStatusResponse)
|
||||
async def check_email_status(
|
||||
email: str,
|
||||
db: AsyncSession = Depends(get_db),
|
||||
) -> EmailStatusResponse:
|
||||
return await get_email_status(db, email=email)
|
||||
|
||||
|
||||
@router.post("/register", response_model=MessageResponse, status_code=status.HTTP_201_CREATED)
|
||||
async def register(
|
||||
payload: RegisterRequest,
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
from datetime import datetime
|
||||
|
||||
from pydantic import BaseModel, ConfigDict, EmailStr, Field
|
||||
from app.users.schemas import GroupInvitePrivacyLevel, PrivacyLevel
|
||||
|
||||
|
||||
class RegisterRequest(BaseModel):
|
||||
@@ -58,6 +59,10 @@ class AuthUserResponse(BaseModel):
|
||||
avatar_url: str | None = None
|
||||
email_verified: bool
|
||||
twofa_enabled: bool
|
||||
allow_private_messages: bool = True
|
||||
privacy_last_seen: PrivacyLevel = "everyone"
|
||||
privacy_avatar: PrivacyLevel = "everyone"
|
||||
privacy_group_invites: GroupInvitePrivacyLevel = "everyone"
|
||||
created_at: datetime
|
||||
updated_at: datetime
|
||||
|
||||
@@ -76,3 +81,10 @@ class TwoFactorSetupRead(BaseModel):
|
||||
|
||||
class TwoFactorCodeRequest(BaseModel):
|
||||
code: str = Field(min_length=6, max_length=8)
|
||||
|
||||
|
||||
class EmailStatusResponse(BaseModel):
|
||||
email: EmailStr
|
||||
registered: bool
|
||||
email_verified: bool = False
|
||||
twofa_enabled: bool = False
|
||||
|
||||
@@ -16,6 +16,7 @@ from app.auth.token_store import (
|
||||
store_refresh_token_jti,
|
||||
)
|
||||
from app.auth.schemas import (
|
||||
EmailStatusResponse,
|
||||
LoginRequest,
|
||||
RefreshTokenRequest,
|
||||
RegisterRequest,
|
||||
@@ -343,3 +344,15 @@ async def get_current_user_for_ws(token: str, db: AsyncSession) -> User:
|
||||
|
||||
def get_email_sender() -> EmailService:
|
||||
return get_email_service()
|
||||
|
||||
|
||||
async def get_email_status(db: AsyncSession, email: str) -> EmailStatusResponse:
|
||||
user = await get_user_by_email(db, email)
|
||||
if not user:
|
||||
return EmailStatusResponse(email=email, registered=False)
|
||||
return EmailStatusResponse(
|
||||
email=email,
|
||||
registered=True,
|
||||
email_verified=user.email_verified,
|
||||
twofa_enabled=user.twofa_enabled,
|
||||
)
|
||||
|
||||
@@ -24,6 +24,9 @@ class User(Base):
|
||||
bio: Mapped[str | None] = mapped_column(String(500), nullable=True)
|
||||
email_verified: Mapped[bool] = mapped_column(Boolean, default=False, nullable=False, index=True)
|
||||
allow_private_messages: Mapped[bool] = mapped_column(Boolean, default=True, nullable=False, server_default="true")
|
||||
privacy_last_seen: Mapped[str] = mapped_column(String(16), nullable=False, default="everyone", server_default="everyone")
|
||||
privacy_avatar: Mapped[str] = mapped_column(String(16), nullable=False, default="everyone", server_default="everyone")
|
||||
privacy_group_invites: Mapped[str] = mapped_column(String(16), nullable=False, default="everyone", server_default="everyone")
|
||||
twofa_enabled: Mapped[bool] = mapped_column(Boolean, default=False, nullable=False, server_default="false")
|
||||
twofa_secret: Mapped[str | None] = mapped_column(String(64), nullable=True)
|
||||
created_at: Mapped[datetime] = mapped_column(DateTime(timezone=True), server_default=func.now(), nullable=False)
|
||||
|
||||
@@ -65,6 +65,9 @@ async def update_profile(
|
||||
bio=payload.bio,
|
||||
avatar_url=payload.avatar_url,
|
||||
allow_private_messages=payload.allow_private_messages,
|
||||
privacy_last_seen=payload.privacy_last_seen,
|
||||
privacy_avatar=payload.privacy_avatar,
|
||||
privacy_group_invites=payload.privacy_group_invites,
|
||||
)
|
||||
return updated
|
||||
|
||||
|
||||
@@ -1,6 +1,11 @@
|
||||
from datetime import datetime
|
||||
|
||||
from pydantic import BaseModel, ConfigDict, EmailStr, Field
|
||||
from typing import Literal
|
||||
|
||||
|
||||
PrivacyLevel = Literal["everyone", "contacts", "nobody"]
|
||||
GroupInvitePrivacyLevel = Literal["everyone", "contacts"]
|
||||
|
||||
|
||||
class UserBase(BaseModel):
|
||||
@@ -21,6 +26,9 @@ class UserRead(UserBase):
|
||||
bio: str | None = None
|
||||
email_verified: bool
|
||||
allow_private_messages: bool
|
||||
privacy_last_seen: PrivacyLevel = "everyone"
|
||||
privacy_avatar: PrivacyLevel = "everyone"
|
||||
privacy_group_invites: GroupInvitePrivacyLevel = "everyone"
|
||||
twofa_enabled: bool = False
|
||||
created_at: datetime
|
||||
updated_at: datetime
|
||||
@@ -32,6 +40,9 @@ class UserProfileUpdate(BaseModel):
|
||||
bio: str | None = Field(default=None, max_length=500)
|
||||
avatar_url: str | None = Field(default=None, max_length=512)
|
||||
allow_private_messages: bool | None = None
|
||||
privacy_last_seen: PrivacyLevel | None = None
|
||||
privacy_avatar: PrivacyLevel | None = None
|
||||
privacy_group_invites: GroupInvitePrivacyLevel | None = None
|
||||
|
||||
|
||||
class UserSearchRead(BaseModel):
|
||||
|
||||
@@ -41,6 +41,9 @@ async def update_user_profile(
|
||||
bio: str | None = None,
|
||||
avatar_url: str | None = None,
|
||||
allow_private_messages: bool | None = None,
|
||||
privacy_last_seen: str | None = None,
|
||||
privacy_avatar: str | None = None,
|
||||
privacy_group_invites: str | None = None,
|
||||
) -> User:
|
||||
if name is not None:
|
||||
user.name = name
|
||||
@@ -52,6 +55,12 @@ async def update_user_profile(
|
||||
user.avatar_url = avatar_url
|
||||
if allow_private_messages is not None:
|
||||
user.allow_private_messages = allow_private_messages
|
||||
if privacy_last_seen is not None:
|
||||
user.privacy_last_seen = privacy_last_seen
|
||||
if privacy_avatar is not None:
|
||||
user.privacy_avatar = privacy_avatar
|
||||
if privacy_group_invites is not None:
|
||||
user.privacy_group_invites = privacy_group_invites
|
||||
await db.commit()
|
||||
await db.refresh(user)
|
||||
return user
|
||||
|
||||
Reference in New Issue
Block a user