Org creation now works correctly! :-O

Author: chriscarrollsmith

main.py

@@ -228,14 +228,6 @@ async def read_reset_password(
 
 # Define a dependency for common parameters
 async def common_authenticated_parameters(
-    request: Request,
-    user: User = Depends(get_authenticated_user),
-    error_message: Optional[str] = None,
-) -> dict:
-    return {"request": request, "user": user, "error_message": error_message}
-
-
-async def common_authenticated_parameters_with_organizations(
     request: Request,
     user: User = Depends(get_user_with_relations),
     error_message: Optional[str] = None
@@ -253,9 +245,8 @@ async def read_dashboard(
 
 @app.get("/profile")
 async def read_profile(
-    params: dict = Depends(common_authenticated_parameters_with_organizations)
+    params: dict = Depends(common_authenticated_parameters)
 ):
-    params["organizations"] = params["user"].organizations
     return templates.TemplateResponse(params["request"], "users/profile.html", params)
 
 

routers/authentication.py

@@ -119,6 +119,7 @@ class UserRead(BaseModel):
 # -- Routes --
 
 
+# TODO: Use custom error message in the case where the user is already registered
 @router.post("/register", response_class=RedirectResponse)
 async def register(
     user: UserRegister = Depends(UserRegister.as_form),

routers/organization.py

@@ -93,7 +93,7 @@ async def as_form(cls, id: int = Form(...), name: str = Form(...)):
 
 # -- Routes --
 
-@router.post("/", response_class=RedirectResponse)
+@router.post("/create", name="create_organization", response_class=RedirectResponse)
 def create_organization(
     org: OrganizationCreate = Depends(OrganizationCreate.as_form),
     user: User = Depends(get_authenticated_user),
@@ -132,7 +132,7 @@ def create_organization(
     return RedirectResponse(url=f"/profile", status_code=303)
 
 
-@router.put("/{org_id}", response_class=RedirectResponse)
+@router.post("/update/{org_id}", name="update_organization", response_class=RedirectResponse)
 def update_organization(
     org: OrganizationUpdate = Depends(OrganizationUpdate.as_form),
     user: User = Depends(get_user_with_relations),
@@ -162,7 +162,7 @@ def update_organization(
     return RedirectResponse(url=f"/profile", status_code=303)
 
 
-@router.delete("/{org_id}", response_class=RedirectResponse)
+@router.post("/delete/{org_id}", name="delete_organization", response_class=RedirectResponse)
 def delete_organization(
     org_id: int,
     user: User = Depends(get_user_with_relations),

templates/authentication/register.html

@@ -24,6 +24,7 @@
         <!-- Password Input -->
         <div class="mb-3">
             <label for="password" class="form-label">Password</label>
+            <!-- Make sure 9g,X*88w[6"W passes validation -->
             <input type="password" class="form-control" id="password" name="password" 
                    pattern="(?=.*\d)(?=.*[a-z])(?=.*[A-Z])(?=.*[@$!%*?&\{\}\<\>\.\,\\\\'#\-_=\+\(\)\[\]:;\|~\/])[A-Za-z\d@$!%*?&\{\}\<\>\.\,\\\\'#\-_=\+\(\)\[\]:;\|~\/]{8,}"
                    title="Must contain at least one number, one uppercase and lowercase letter, one special character, and at least 8 or more characters" 

templates/components/organizations.html

@@ -9,7 +9,7 @@
     <div class="card-body">
         <!-- New Organization Form -->
         <div class="collapse mb-3" id="newOrgForm">
-            <form action="/organizations/" method="post" class="border rounded p-3 bg-light">
+            <form action="/organizations/create" method="post" class="border rounded p-3 bg-light">
                 <div class="mb-3">
                     <label for="name" class="form-label">Organization Name</label>
                     <input type="text" 

templates/users/profile.html

@@ -59,7 +59,7 @@ <h1 class="mb-4">User Profile</h1>
             Change Password
         </div>
         <div class="card-body">
-            <!-- Trigger password reset via email confirmation -->
+            <!-- TODO: Trigger password reset via email confirmation -->
             <form action="{{ url_for('forgot_password') }}" method="post">
                 <input type="hidden" name="email" value="{{ user.email }}">
                 <p>To change your password, please confirm your email. A password reset link will be sent to your email address.</p>
@@ -68,8 +68,8 @@ <h1 class="mb-4">User Profile</h1>
         </div>
     </div>
 
-    <!-- Organizations Section - Add this before the Delete Account section -->
-    {{ render_organizations(organizations) }}
+    <!-- Organizations Section -->
+    {{ render_organizations(user.roles|map(attribute='organization')|list) }}
 
     <!-- Delete Account -->
     <div class="card mb-4">