backend update 260127

app/main.py

@@ -7,6 +7,8 @@ from passlib.context import CryptContext
 from sqlalchemy.exc import IntegrityError
 from contextlib import asynccontextmanager
 import httpx
+from datetime import datetime
+from typing import List
 
 @asynccontextmanager
 async def lifespan(app: FastAPI):
@@ -17,6 +19,23 @@ async def lifespan(app: FastAPI):
     
 app = FastAPI(lifespan=lifespan)
 
+from fastapi.middleware.cors import CORSMiddleware
+
+origins = [
+    "http://localhost",
+    "http://localhost:8081",
+    "http://localhost:8080",
+    "http://localhost:3000",
+]
+
+app.add_middleware(
+    CORSMiddleware,
+    allow_origins=origins,
+    allow_credentials=True,
+    allow_methods=["*"],
+    allow_headers=["*"],
+)
+
 
 @app.post("/register", response_model=schemas.UserOut)
 async def register(user: schemas.UserCreate, db: AsyncSession = Depends(database.get_db)):
@@ -25,9 +44,12 @@ async def register(user: schemas.UserCreate, db: AsyncSession = Depends(database
     
     new_user = models.User(
         username=user.username, 
+        email=user.email,
         hashed_password=hashed_pwd,
         private_key=private_key,
-        public_key=public_key
+        public_key=public_key,
+        tier="Free",
+        last_active_at=datetime.utcnow()
     )
     db.add(new_user)
     try:
@@ -40,12 +62,17 @@ async def register(user: schemas.UserCreate, db: AsyncSession = Depends(database
         await db.rollback()
         raise HTTPException(
             status_code=status.HTTP_400_BAD_REQUEST,
-            detail="用户名已存在"
+            detail="邮箱已存在"
+        )
+    except Exception as e:
+        await db.rollback()
+        raise HTTPException(
+            status_code=status.HTTP_500_INTERNAL_SERVER_ERROR,
+            detail=f"注册失败: {str(e)}"
         )
 
 
-
-@app.post("/token")
+@app.post("/login", response_model=schemas.LoginResponse)
 async def login(form_data: schemas.UserLogin, db: AsyncSession = Depends(database.get_db)):
     result = await db.execute(select(models.User).where(models.User.username == form_data.username))
     user = result.scalars().first()
@@ -53,10 +80,31 @@ async def login(form_data: schemas.UserLogin, db: AsyncSession = Depends(databas
         raise HTTPException(status_code=400, detail="Incorrect username or password")
     
     access_token = auth.create_access_token(data={"sub": user.username})
-    return {"access_token": access_token, "token_type": "bearer"}
+    
+    # Update last_active_at
+    user.last_active_at = datetime.utcnow()
+    await db.commit()
+    
+    return {
+        "access_token": access_token, 
+        "token_type": "bearer",
+        "user": user
+    }
 
 
-@app.post("/assets/", response_model=schemas.AssetOut)
+
+@app.get("/assets/get", response_model=List[schemas.AssetOut])
+async def get_my_assets(
+    current_user: models.User = Depends(auth.get_current_user),
+    db: AsyncSession = Depends(database.get_db)
+):
+    result = await db.execute(
+        select(models.Asset).where(models.Asset.author_id == current_user.id)
+    )
+    return result.scalars().all()
+
+
+@app.post("/assets/create", response_model=schemas.AssetOut)
 async def create_asset(
     asset: schemas.AssetCreate,
     current_user: models.User = Depends(auth.get_current_user),