rzmk/learnhouse
1
0
Fork 0
mirror of https://github.com/rzmk/learnhouse.git synced 2025-12-19 04:19:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update: UserCreate installation model to fix parameter runtime errors.

Browse source
This commit is contained in:
Abdullah Mustapha 2024-01-02 01:22:20 +01:00
parent b07b4500fa
commit 6d76a6f19b
4 changed files with 14 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

6
apps/api/src/db/users.py
View file

@ -1,5 +1,5 @@
from typing import Optional
from pydantic import BaseModel
from pydantic import BaseModel, EmailStr
from sqlmodel import Field, SQLModel
from src.db.roles import RoleRead
@ -10,12 +10,14 @@ class UserBase(SQLModel):
username: str
first_name: str
last_name: str
email: str
email: EmailStr
avatar_image: Optional[str] = ""
bio: Optional[str] = ""
class UserCreate(UserBase):
first_name: str = ""
last_name: str = ""
password: str

13
apps/api/src/routers/install/install.py
View file

@ -41,33 +41,30 @@ async def api_get_latest_install_instance(
@router.post("/default_elements")
async def api_install_def_elements(
request: Request,
db_session=Depends(get_db_session),
):
elements = await install_default_elements(request, {}, db_session)
elements = await install_default_elements(db_session)
return elements
@router.post("/org")
async def api_install_org(
request: Request,
org: OrganizationCreate,
db_session=Depends(get_db_session),
org: OrganizationCreate,
db_session=Depends(get_db_session),
):
organization = await install_create_organization(request, org, db_session)
organization = await install_create_organization(org, db_session)
return organization
@router.post("/user")
async def api_install_user(
request: Request,
data: UserCreate,
org_slug: str,
db_session=Depends(get_db_session),
):
user = await install_create_organization_user(request, data, org_slug, db_session)
user = await install_create_organization_user(data, org_slug, db_session)
return user

8
apps/web/app/install/steps/account_creation.tsx
View file

@ -61,14 +61,12 @@ function AccountCreation() {
username: '',
},
validate,
onSubmit: values => {
onSubmit: async values => {
let finalvalues = { ...values, org_slug: install.data[1].slug }
let finalvalueswithoutpasswords = { ...values, password: '', confirmPassword: '', org_slug: install.data[1].slug }
let install_data = { ...install.data, 3: finalvalues }
let install_data_without_passwords = { ...install.data, 3: finalvalueswithoutpasswords }
updateInstall({ ...install_data_without_passwords }, 4)
createNewUserInstall(finalvalues)
await updateInstall({ ...install_data_without_passwords }, 4)
await createNewUserInstall({email:values.email,username:values.username,password:values.password},install.data[1].slug)
// await 2 seconds
setTimeout(() => {

4
apps/web/services/install/install.ts
View file

@ -13,8 +13,8 @@ export async function createNewOrgInstall(body: any) {
return res;
}
export async function createNewUserInstall(body: any) {
const result = await fetch(`${getAPIUrl()}install/user?org_slug=${body.org_slug}`, RequestBody("POST", body, null));
export async function createNewUserInstall(body: any,org_slug:string) {
const result = await fetch(`${getAPIUrl()}install/user?org_slug=${org_slug}`, RequestBody("POST", body, null));
const res = await errorHandling(result);
return res;
}