feat: inertia improvements

Author: tmgbedu

example/inertia-pingcrm-app/app/http/controllers/auth/authenticated_session_controller.py

@@ -3,8 +3,8 @@
 from fastapi_startkit.facades import Inertia
 from app.models.User import User
 
-async def create(request: Request):
-    return Inertia.render(request, 'Auth/Login', {})
+async def create():
+    return Inertia.render('Auth/Login', {})
 
 async def store(request: Request):
     form = await request.json()
@@ -16,11 +16,10 @@ async def store(request: Request):
         request.session["user_id"] = user.id
         return RedirectResponse(url="/", status_code=303)
 
-    return Inertia.render(request, 'Auth/Login', {
+    return Inertia.render('Auth/Login', {
         'errors': {'email': 'These credentials do not match our records.'}
     })
 
 async def destroy(request: Request):
     request.session.clear()
     return RedirectResponse(url="/login", status_code=303)
-

example/inertia-pingcrm-app/app/http/controllers/contacts_controller.py

@@ -1,18 +1,20 @@
-from fastapi import Request
+from fastapi import Depends, Request
 from fastapi.responses import RedirectResponse
 from fastapi_startkit.facades import Inertia
+from app.http.requests.organization import OrganizationListRequest
 from app.models.Contact import Contact
 from app.models.Organization import Organization
 
 
-async def index(request: Request):
-    search = request.query_params.get('search', '')
-    query = Contact.query()
-    if search:
-        query = query.where('first_name', 'like', f'%{search}%').or_where('last_name', 'like', f'%{search}%')
-    contacts = await query.limit(10).get()
-    return Inertia.render(request, 'Contacts/Index', {
-        'filters': {'search': search},
+async def index(filters: OrganizationListRequest = Depends()):
+    contacts = await (
+        Contact.query()
+        .when(filters.search, lambda q: q.where('first_name', 'like', f'%{filters.search}%').or_where('last_name', 'like', f'%{filters.search}%'))
+        .limit(10)
+        .get()
+    )
+    return Inertia.render('Contacts/Index', {
+        'filters': {'search': filters.search},
         'contacts': {
             'data': [
                 {
@@ -35,9 +37,9 @@ async def index(request: Request):
     })
 
 
-async def create(request: Request):
+async def create():
     organizations = await Organization.query().limit(100).get()
-    return Inertia.render(request, 'Contacts/Create', {
+    return Inertia.render('Contacts/Create', {
         'organizations': [
             {'id': o.id, 'name': o.name} for o in organizations
         ]
@@ -50,10 +52,10 @@ async def store(request: Request):
     return RedirectResponse(url="/contacts", status_code=303)
 
 
-async def edit(request: Request, contact: str):
+async def edit(contact: str):
     c = await Contact.find(contact)
     organizations = await Organization.query().limit(100).get()
-    return Inertia.render(request, 'Contacts/Edit', {
+    return Inertia.render('Contacts/Edit', {
         'contact': {
             'id': c.id,
             'first_name': c.first_name,
@@ -81,9 +83,9 @@ async def update(request: Request, contact: str):
     return RedirectResponse(url=f"/contacts/{contact}/edit", status_code=303)
 
 
-async def destroy(request: Request, contact: str):
+async def destroy(contact: str):
     return RedirectResponse(url="/contacts", status_code=303)
 
 
-async def restore(request: Request, contact: str):
-    return RedirectResponse(url="/contacts", status_code=303)
+async def restore(contact: str):
+    return RedirectResponse(url="/contacts", status_code=303)

example/inertia-pingcrm-app/app/http/controllers/dashboard_controller.py

@@ -1,6 +1,5 @@
-from fastapi import Request
 from fastapi_startkit.facades import Inertia
 
-async def index(request: Request):
-    return Inertia.render(request, 'Dashboard/Index', {})
 
+async def index():
+    return Inertia.render('Dashboard/Index', {})

example/inertia-pingcrm-app/app/http/controllers/organizations_controller.py

@@ -1,47 +1,49 @@
+from fastapi import Depends
 from fastapi import Request
-from fastapi.responses import JSONResponse, RedirectResponse
-from fastapi_startkit.facades import Inertia
+from fastapi.responses import RedirectResponse
+from fastapi_startkit.inertia import Inertia
+
+from app.http.requests.organization import OrganizationListRequest
 from app.models.Organization import Organization
 
-async def index(request: Request):
-    search = request.query_params.get('search', '')
-    query = Organization.query()
-    if search:
-        query = query.where('name', 'like', f'%{search}%')
-    organizations = await query.limit(10).get()
-    return Inertia.render(request, 'Organizations/Index', {
-        'filters': {'search': search},
-        'organizations': {
-            'data': [
-                {
-                    'id': org.id,
-                    'name': org.name,
-                    'phone': org.phone,
-                    'city': org.city,
-                    'deleted_at': None,
-                } for org in organizations
-            ],
-            'links': {'first': None, 'last': None, 'prev': None, 'next': None},
-            'meta': {
-                'current_page': 1, 'last_page': 1, 'per_page': 10,
-                'from': 1, 'to': len(organizations), 'total': len(organizations),
-                'path': '/organizations', 'links': [],
-            },
-        }
+
+async def index(filters: OrganizationListRequest = Depends()):
+    paginator = await (
+        Organization.query()
+        .when(filters.search, lambda q: q.where('name', 'like', f'%{filters.search}%'))
+        .paginate(page=filters.page, per_page=filters.limit)
+    )
+
+    return Inertia.render('Organizations/Index', {
+        'data': [
+            {
+                'id': org.id,
+                'name': org.name,
+                'phone': org.phone,
+                'city': org.city,
+                'deleted_at': None,
+            } for org in paginator.result
+        ],
+        'meta': {
+            'current_page': paginator.current_page,
+            'last_page': paginator.last_page,
+            'per_page': paginator.per_page,
+            'total': paginator.total,
+        },
     })
 
-async def create(request: Request):
-    return Inertia.render(request, 'Organizations/Create', {})
+async def create():
+    return Inertia.render('Organizations/Create')
 
 async def store(request: Request):
     form = await request.json()
     form["account_id"] = 1 # hardcoded for demo
     await Organization.create(form)
     return RedirectResponse(url="/organizations", status_code=303)
 
-async def edit(request: Request, organization: str):
+async def edit(organization: str):
     org = await Organization.find(organization)
-    return Inertia.render(request, 'Organizations/Edit', {
+    return Inertia.render('Organizations/Edit', {
         'organization': {
             'id': org.id,
             'name': org.name,
@@ -62,11 +64,10 @@ async def update(request: Request, organization: str):
     await org.update(form)
     return RedirectResponse(url=f"/organizations/{organization}/edit", status_code=303)
 
-async def destroy(request: Request, organization: str):
+async def destroy(organization: str):
     # org = await Organization.find(organization)
     # await org.delete()
     return RedirectResponse(url="/organizations", status_code=303)
 
-async def restore(request: Request, organization: str):
+async def restore(organization: str):
     return RedirectResponse(url="/organizations", status_code=303)
-

example/inertia-pingcrm-app/app/http/controllers/reports_controller.py

@@ -1,6 +1,5 @@
-from fastapi import Request
 from fastapi_startkit.facades import Inertia
 
-async def index(request: Request):
-    return Inertia.render(request, 'Reports/Index', {})
 
+async def index():
+    return Inertia.render('Reports/Index', {})

example/inertia-pingcrm-app/app/http/controllers/users_controller.py

@@ -4,9 +4,9 @@
 from app.models.User import User
 
 
-async def index(request: Request):
+async def index():
     users = await User.query().limit(10).get()
-    return Inertia.render(request, 'Users/Index', {
+    return Inertia.render('Users/Index', {
         'users': {
             'data': [
                 {
@@ -28,8 +28,8 @@ async def index(request: Request):
     })
 
 
-async def create(request: Request):
-    return Inertia.render(request, 'Users/Create', {})
+async def create():
+    return Inertia.render('Users/Create', {})
 
 
 async def store(request: Request):
@@ -38,9 +38,9 @@ async def store(request: Request):
     return RedirectResponse(url="/users", status_code=303)
 
 
-async def edit(request: Request, user: str):
+async def edit(user: str):
     u = await User.find(user)
-    return Inertia.render(request, 'Users/Edit', {
+    return Inertia.render('Users/Edit', {
         'user': {
             'id': u.id,
             'first_name': u.first_name,
@@ -61,9 +61,9 @@ async def update(request: Request, user: str):
     return RedirectResponse(url=f"/users/{user}/edit", status_code=303)
 
 
-async def destroy(request: Request, user: str):
+async def destroy(user: str):
     return RedirectResponse(url="/users", status_code=303)
 
 
-async def restore(request: Request, user: str):
-    return RedirectResponse(url="/users", status_code=303)
+async def restore(user: str):
+    return RedirectResponse(url="/users", status_code=303)

example/inertia-pingcrm-app/app/http/requests/organization.py

@@ -0,0 +1,5 @@
+class OrganizationListRequest:
+    def __init__(self, search: str = '', page: int = 1, limit: int = 10):
+        self.search = search
+        self.page = page
+        self.limit = limit

example/inertia-pingcrm-app/authentication/middlewares/auth.py

@@ -0,0 +1,33 @@
+from fastapi import Request
+from starlette.middleware.base import BaseHTTPMiddleware
+
+
+class NotAuthenticated(Exception):
+    pass
+
+
+class AuthMiddleware(BaseHTTPMiddleware):
+    async def dispatch(self, request: Request, call_next):
+        request.state.user = None
+        if "session" in request.scope:
+            user_id = request.session.get("user_id")
+            if user_id:
+                from app.models.User import User
+
+                user = await User.find(user_id)
+                if user:
+                    request.state.user = {
+                        "id": user.id,
+                        "first_name": user.first_name,
+                        "last_name": user.last_name,
+                        "email": user.email,
+                        "role": "Owner" if user.owner else "User",
+                        "account": {"id": user.account_id, "name": "Acme Corporation"},
+                    }
+        return await call_next(request)
+
+
+async def auth(request: Request):
+    """FastAPI dependency — raises NotAuthenticated if no user in session."""
+    if not getattr(request.state, "user", None):
+        raise NotAuthenticated()

example/inertia-pingcrm-app/bootstrap/application.py

@@ -1,13 +1,27 @@
 from pathlib import Path
 
 from config.database import DatabaseConfig
+from providers.fastapi_provider import FastAPIProvider
+from starlette.middleware.trustedhost import TrustedHostMiddleware
+
+from starlette.middleware.sessions import SessionMiddleware
+
+from authentication.middlewares.auth import AuthMiddleware, NotAuthenticated
 from fastapi_startkit import Application
-from fastapi_startkit.logging import LogProvider
-from fastapi_startkit.vite import ViteProvider
+from fastapi_startkit.exceptions import ExceptionHandler as BaseHandler
 from fastapi_startkit.inertia import InertiaProvider
+from fastapi_startkit.logging import LogProvider
 from fastapi_startkit.masoniteorm import DatabaseProvider
+from fastapi_startkit.vite import ViteProvider
+from starlette.responses import RedirectResponse
+
+class ExceptionHandler(BaseHandler):
+    def register(self):
+        self.register_render(
+            NotAuthenticated,
+            lambda request, exc: RedirectResponse(url="/login", status_code=303)
+        )
 
-from providers.fastapi_provider import FastAPIProvider
 
 app: Application = Application(
     base_path=str(Path.cwd()),
@@ -18,4 +32,10 @@
         ViteProvider,
         InertiaProvider,
     ],
+    exception_handler=ExceptionHandler,
 )
+
+
+app.add_middleware(AuthMiddleware)
+app.add_middleware(SessionMiddleware, secret_key="...")
+app.add_middleware(TrustedHostMiddleware, allowed_hosts=["*"])

example/inertia-pingcrm-app/index.py

@@ -0,0 +1,20 @@
+import asyncio
+
+from dumpdie import dd
+
+from bootstrap.application import app
+
+from app.models.Organization import Organization
+
+
+async def index():
+    paginator = await (
+        Organization.query()
+        .paginate()
+    )
+
+    dd(paginator)
+
+
+if __name__ == "__main__":
+    asyncio.run(index())