Merge pull request #200 from DocShow-AI/dev

Dev

backend/database/user_manager.py

@@ -247,3 +247,19 @@ def update_user_requires_password_update(
             self.db_session.commit()
             self.db_session.refresh(db_user)
         return db_user
+
+    def delete_user_by_username(self, username: str) -> User:
+        """
+        Delete a user based on their username.
+
+        Args:
+            username (str): The username of the user.
+
+        Returns:
+            User: The deleted User object if found, else None.
+        """
+        db_user = self.db_session.query(User).filter(User.username == username).first()
+        if db_user:
+            self.db_session.delete(db_user)
+            self.db_session.commit()
+        return db_user

backend/models/user.py

@@ -162,6 +162,10 @@ class ForgotPasswordRequest(BaseModel):
     email: EmailStr
 
 
+class DeleteUserRequest(BaseModel):
+    username: str
+
+
 class ResetPasswordRequest(BaseModel):
     token: str = Field(...)
     new_password: str = Field(...)

backend/routes/user_routes.py

@@ -4,6 +4,7 @@
 
 from models.user import (
     ChangePasswordRequest,
+    DeleteUserRequest,
     ForgotPasswordRequest,
     ResetPasswordRequest,
     SendVerificationEmailRequest,
@@ -212,3 +213,20 @@ async def verify_email(request: VerifyEmailRequest):
 @user_router.get("/users/is-email-verified/")
 async def is_user_verified(current_user: User = Depends(get_current_user)):
     return {"email_verified": current_user.email_verified}
+
+
+@user_router.delete("/users/delete/")
+async def delete_user(
+    request: DeleteUserRequest,
+    current_admin_user: User = Depends(get_current_admin_user),
+):
+    with DatabaseManager() as session:
+        user_manager = UserManager(session)
+
+        # Delete user
+        deleted_user = user_manager.delete_user_by_username(request.username)
+
+        if not deleted_user:
+            raise HTTPException(status_code=404, detail="User not found")
+
+        return {"message": f"Successfully deleted user {request.username}."}

frontend/src/pages/admin/UserManagement.jsx

@@ -18,6 +18,19 @@ function UserManagement() {
     }
   };
 
+  const handleDeleteUser = async () => {
+    try {
+      await axios.delete(`${API_URL}users/delete/`, {
+       data: {username: selectedUser.username}
+      });
+      // Refetch users after deletion
+      const response = await axios.get(`${API_URL}users/`);
+      setUsers(response.data);
+    } catch (error) {
+      console.error('Error deleting user', error);
+    }
+  };
+
   const fetchRoles = async () => {
     try {
       const response = await axios.get(`${API_URL}users/roles/`);
@@ -155,6 +168,7 @@ function UserManagement() {
           </Grid>
           <Grid item xs={12} sm={4}>
             <Button variant="contained" onClick={handleUpdateUser} disabled={!selectedUser.username}>Update</Button>
+            <Button variant="contained" onClick={handleDeleteUser} disabled={!selectedUser.username} style={{marginLeft:'10px'}}>Delete</Button>
           </Grid>
         </Grid>
       </CardContent>