Update code

Author: Youngestdev

ch05/planner/models/events.py

@@ -14,7 +14,7 @@ class Event(BaseModel):
     class Config:
         schema_extra = {
             "example": {
-                "title": "FastAPI BookLaunch",
+                "title": "FastAPI Book Launch",
                 "image": "https://linktomyimage.com/image.png",
                 "description": "We will be discussing the contents of the FastAPI book in this event.Ensure to come with your own copy to win gifts!",
                 "tags": ["python", "fastapi", "book", "launch"],

ch05/planner/models/users.py

@@ -1,58 +1,31 @@
 from typing import Optional, List
-
-from fastapi import Form
 from pydantic import BaseModel, EmailStr
 
 from models.events import Event
 
 
 class User(BaseModel):
     email: EmailStr
-    username: str
+    password: str
     events: Optional[List[Event]]
 
-    @classmethod
-    def as_form(
-            cls,
-            email: EmailStr = Form(...),
-            username: str = Form(...),
-            password: str = Form(...)
-    ):
-        return cls(email=email, username=username, password=password)
-
     class Config:
         schema_extra = {
             "example": {
                 "email": "fastapi@packt.com",
-                "username": "fastapipackt001",
+                "password": "strong!!!",
                 "events": [],
             }
         }
 
 
-class NewUser(User):
+class UserSignIn(BaseModel):
+    email: EmailStr
     password: str
 
-    class Config:
-        schema_extra = {
+    schema_extra = {
             "example": {
                 "email": "fastapi@packt.com",
-                "password": "Stro0ng!",
-                "username": "FastPackt"
+                "password": "strong!!!"
             }
-        }
-
-
-class UserSignIn(BaseModel):
-    email: EmailStr
-    password: str
-
-    @classmethod
-    def as_form(
-            cls,
-            email: EmailStr = Form(...),
-            password: str = Form(...)
-    ):
-        return cls(email=email, password=password)
-
-
+        }

ch05/planner/routes/users.py

@@ -1,18 +1,15 @@
-from fastapi import APIRouter, HTTPException, Request, status, Depends
-from fastapi.templating import Jinja2Templates
+from fastapi import APIRouter, HTTPException, status
 
-from models.users import NewUser, UserSignIn
+from models.users import User, UserSignIn
 
 user_router = APIRouter(
     tags=["User"],
 )
 
 users = {}
-templates = Jinja2Templates(directory="templates/")
-
 
 @user_router.post("/signup")
-async def sign_user_up(request: Request, data: NewUser = Depends(NewUser.as_form)):
+async def sign_user_up( data: User):
     if data.email in users:
         raise HTTPException(
             status_code=status.HTTP_409_CONFLICT,
@@ -21,14 +18,13 @@ async def sign_user_up(request: Request, data: NewUser = Depends(NewUser.as_form
 
     users[data.email] = data
 
-    return templates.TemplateResponse("user.html", {
-        "request": request,
-        "signed_in": True,
-    })
+    return { 
+        "message": "User successfully registered!"
+        }
 
 
 @user_router.post("/signin")
-async def sign_user_in(request: Request, user: UserSignIn = Depends(UserSignIn.as_form)):
+async def sign_user_in(user: UserSignIn):
     if user.email not in users:
         raise HTTPException(
             status_code=status.HTTP_404_NOT_FOUND,
@@ -40,30 +36,6 @@ async def sign_user_in(request: Request, user: UserSignIn = Depends(UserSignIn.a
             status_code=status.HTTP_403_FORBIDDEN,
             detail="Wrong credential passed"
         )
-    return templates.TemplateResponse(
-        "index.html",
-        {
-            "request": request,
-            "signed_in": True
-        }
-    )
-
-
-@user_router.get("/")
-async def render_login_page(request: Request):
-    return templates.TemplateResponse(
-        "user.html", {
-            "request": request,
-            "sign_in": True
-        }
-    )
-
-
-@user_router.get("/signup")
-async def render_signup_page(request: Request):
-    return templates.TemplateResponse(
-        "user.html", {
-            "request": request,
-            "sign_in": False
-        }
-    )
+    return {
+        "message": "User signed in successfully"
+    }