Michael Chihlas
9b517d3320
Lays the groundwork for the post-signup welcome wizard (Phase 2, Task 38). Authed users hitting /welcome are routed to the next incomplete step based on users.onboarding_step_completed + users.onboarding_dismissed; refresh resumes correctly because every navigation persists state server-side first. Backend: - Expose onboarding_step_completed (Optional[int]) and onboarding_dismissed (bool) on UserResponse so /auth/me drives client-side routing without a separate fetch. Frontend: - WelcomeRouter handles the /welcome decision table (dismissed → /, completed >=3 → /, else next step). - WelcomeStep1 renders the "Your shop" form (company name pre-filled from accounts.name, team size 1-2/3-5/6-10/11-25/26+, role Owner/Lead Tech/Tech/Other). Continue PATCHes /users/me/onboarding-step with action=complete; Skip-this-step PATCHes action=skip; Skip-the-rest POSTs /users/me/onboarding-dismiss-rest. Each action refreshes the auth store before navigating so the router resumes correctly on the next visit. - onboardingApi.updateStep + dismissRest (typed against backend OnboardingStepRequest/Response schemas). - Routes mounted inside AppLayout so EmailVerificationBanner persists above each step per spec. - 11 vitest cases covering the routing decision table + Continue / Skip / Skip-the-rest / persist-failure paths. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
76 lines
2.6 KiB
Python
76 lines
2.6 KiB
Python
from datetime import datetime
|
|
from typing import Literal, Optional
|
|
from uuid import UUID
|
|
import re
|
|
from pydantic import BaseModel, EmailStr, Field, field_validator
|
|
|
|
|
|
class UserBase(BaseModel):
|
|
email: EmailStr
|
|
name: str = Field(..., min_length=1, max_length=255)
|
|
|
|
|
|
class UserCreate(UserBase):
|
|
password: str = Field(..., min_length=10, description="Password must be at least 10 characters")
|
|
invite_code: Optional[str] = Field(None, description="Invite code for registration (required when invite system is enabled)")
|
|
account_invite_code: Optional[str] = Field(None, description="Account invite code to join an existing account")
|
|
|
|
@field_validator('password')
|
|
@classmethod
|
|
def password_complexity(cls, v: str) -> str:
|
|
if not re.search(r'[A-Z]', v):
|
|
raise ValueError('Password must contain at least one uppercase letter')
|
|
if not re.search(r'[a-z]', v):
|
|
raise ValueError('Password must contain at least one lowercase letter')
|
|
if not re.search(r'[0-9]', v):
|
|
raise ValueError('Password must contain at least one digit')
|
|
return v
|
|
|
|
|
|
class UserUpdate(BaseModel):
|
|
name: Optional[str] = Field(None, min_length=1, max_length=255)
|
|
email: Optional[EmailStr] = None
|
|
current_password: Optional[str] = Field(None, description="Required when changing email")
|
|
phone: Optional[str] = Field(None, max_length=50)
|
|
job_title: Optional[str] = Field(None, max_length=255)
|
|
timezone: Optional[str] = Field(None, max_length=100)
|
|
|
|
|
|
class UserLogin(BaseModel):
|
|
email: EmailStr
|
|
password: str
|
|
|
|
|
|
class UserResponse(UserBase):
|
|
id: UUID
|
|
role: str = "engineer"
|
|
account_id: Optional[UUID] = None
|
|
account_role: Optional[str] = None
|
|
team_id: Optional[UUID] = None
|
|
is_super_admin: bool = False
|
|
is_active: bool = True
|
|
must_change_password: bool = False
|
|
created_at: datetime
|
|
last_login: Optional[datetime] = None
|
|
deleted_at: Optional[datetime] = None
|
|
phone: Optional[str] = None
|
|
job_title: Optional[str] = None
|
|
timezone: str = "UTC"
|
|
avatar_url: Optional[str] = None
|
|
email_verified_at: Optional[datetime] = None
|
|
onboarding_step_completed: Optional[int] = None
|
|
onboarding_dismissed: bool = False
|
|
|
|
class Config:
|
|
from_attributes = True
|
|
|
|
|
|
class RoleUpdate(BaseModel):
|
|
role: Literal["engineer", "viewer"]
|
|
|
|
|
|
class AccountRoleUpdate(BaseModel):
|
|
# Ownership changes must go through the explicit transfer-ownership flow so
|
|
# account.owner_id stays consistent with user.account_role.
|
|
account_role: str = Field(..., pattern="^(admin|engineer|viewer)$")
|