From 2538e4526fd6f66fa47d04229a1d5107de890d3b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=96=B9=20=E6=9F=8F?= <baifang@alicorns.co.jp>
Date: Sat, 4 Nov 2023 17:13:44 +0900
Subject: [PATCH] first&last name

---
 backend/app/api/api_v1/routers/auth.py     | 3 ++-
 backend/app/api/api_v1/routers/platform.py | 1 -
 backend/app/core/auth.py                   | 4 +++-
 backend/app/db/schemas.py                  | 2 ++
 frontend/src/stores/useAuthStore.ts        | 1 -
 5 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/backend/app/api/api_v1/routers/auth.py b/backend/app/api/api_v1/routers/auth.py
index 9f9c2d0..b0e1ffe 100644
--- a/backend/app/api/api_v1/routers/auth.py
+++ b/backend/app/api/api_v1/routers/auth.py
@@ -38,9 +38,10 @@ async def login(
 
 @r.post("/signup")
 async def signup(
+    firstname:str, lastname:str,
     db=Depends(get_db), form_data: OAuth2PasswordRequestForm = Depends()
 ):
-    user = sign_up_new_user(db, form_data.username, form_data.password)
+    user = sign_up_new_user(db, form_data.username, form_data.password,firstname,lastname)
     if not user:
         raise HTTPException(
             status_code=status.HTTP_409_CONFLICT,
diff --git a/backend/app/api/api_v1/routers/platform.py b/backend/app/api/api_v1/routers/platform.py
index b46be9a..b24f9fd 100644
--- a/backend/app/api/api_v1/routers/platform.py
+++ b/backend/app/api/api_v1/routers/platform.py
@@ -241,7 +241,6 @@ async def get_useractivedomain(
 )
 async def update_activeuserdomain(
     request: Request,
-    userid: int,
     domainid:int,
     user=Depends(get_current_user),
     db=Depends(get_db),
diff --git a/backend/app/core/auth.py b/backend/app/core/auth.py
index b43ebd5..60d06b4 100644
--- a/backend/app/core/auth.py
+++ b/backend/app/core/auth.py
@@ -58,7 +58,7 @@ def authenticate_user(db, email: str, password: str):
     return user
 
 
-def sign_up_new_user(db, email: str, password: str):
+def sign_up_new_user(db, email: str, password: str, firstname: str,lastname: str):
     user = get_user_by_email(db, email)
     if user:
         return False  # User already exists
@@ -67,6 +67,8 @@ def sign_up_new_user(db, email: str, password: str):
         schemas.UserCreate(
             email=email,
             password=password,
+            firstname = firstname,
+            lastname = lastname,
             is_active=True,
             is_superuser=False,
         ),
diff --git a/backend/app/db/schemas.py b/backend/app/db/schemas.py
index aae9059..e96484a 100644
--- a/backend/app/db/schemas.py
+++ b/backend/app/db/schemas.py
@@ -21,6 +21,8 @@ class UserOut(UserBase):
 
 class UserCreate(UserBase):
     password: str
+    first_name: str
+    last_name: str
 
     class Config:
         orm_mode = True
diff --git a/frontend/src/stores/useAuthStore.ts b/frontend/src/stores/useAuthStore.ts
index 8900a93..c071af7 100644
--- a/frontend/src/stores/useAuthStore.ts
+++ b/frontend/src/stores/useAuthStore.ts
@@ -22,7 +22,6 @@ export const useAuthStore = defineStore({
               this.token =result.data.access_token;
               this.name = result.data.user_name;
               localStorage.setItem('token', result.data.access_token);
-              localStorage.setItem('id', result.data.user_id);
               localStorage.setItem('name', result.data.user_name);
               const config = {headers:{Authorization : 'Bearer ' + this.token}};
               const activedomain = await api.get(`http://127.0.0.1:8000/api/activedomain`,config);