test fixes

Author: sle3pyy

.github/workflows/CD-workflow.yml

@@ -36,5 +36,5 @@ jobs:
         env:
           DOCKER_BUILDKIT: 1
         run: |
-          docker compose --env-file deployment/.env -f deployment/docker-compose.yml down --remove-orphans
-          docker compose --env-file deployment/.env -f deployment/docker-compose.yml up -d
+          docker compose --env-file deployment/.env -f deployment/docker-compose.yml down
+          docker compose --env-file deployment/.env -f deployment/docker-compose.yml up -d --build 

api/src/routers/org_manager/user_routes.py

@@ -6,7 +6,7 @@
 
 from fastapi import APIRouter, Depends, File, UploadFile, status
 
-from src.core.dependencies import SessionDep, OAuth2Scheme
+from src.core.dependencies import CurrentRealm, SessionDep, OAuth2Scheme
 from src.models import OrgUserCreate
 from src.core.security import Roles, Resource, Scope
 from src.services.org_manager import get_org_manager_service
@@ -26,6 +26,28 @@ def list_users(realm: str, token: OAuth2Scheme):
     return org_manager_service.list_users(realm, token)
 
 
+@router.post(
+    "/users", dependencies=[Depends(Roles(Resource.ORG_MANAGER, Scope.MANAGE))]
+)
+def create_user_in_own_realm(
+    user: OrgUserCreate,
+    session: SessionDep,
+    token: OAuth2Scheme,
+    current_realm: CurrentRealm,
+):
+    """Create a user in the org manager's own realm."""
+    return org_manager_service.create_user(
+        session,
+        realm=current_realm,
+        token=token,
+        username=user.username,
+        name=user.name,
+        email=user.email,
+        role=user.role,
+        group_id=user.group_id,
+    )
+
+
 @router.post(
     "/{realm}/users", dependencies=[Depends(Roles(Resource.ORG_MANAGER, Scope.MANAGE))]
 )

web/src/components/admin/tenant-org-manager/BulkImportModal.tsx

@@ -76,14 +76,13 @@ export function BulkImportModal({
                 continue;
             }
             try {
-                const res = await fetch(`${API_BASE}/realms/users`, {
+                const res = await fetch(`${API_BASE}/org-manager/users`, {
                     method: "POST",
                     headers: {
                         Authorization: keycloak.token ? `Bearer ${keycloak.token}` : "",
                         "Content-Type": "application/json",
                     },
                     body: JSON.stringify({
-                        realm,
                         username: u.username,
                         name: u.name,
                         email: u.email,

web/src/components/admin/tenant-org-manager/NewUserModal.tsx

@@ -74,15 +74,14 @@ export function NewUserModal({ realm, groups, onClose, onUserCreated }: NewUserM
 
         try {
             const res = await fetch(
-                `${API_BASE}/realms/users`,
+                `${API_BASE}/org-manager/users`,
                 {
                     method: "POST",
                     headers: {
                         Authorization: keycloak.token ? `Bearer ${keycloak.token}` : "",
                         "Content-Type": "application/json",
                     },
                     body: JSON.stringify({
-                        realm,
                         username: newUserUsername || newUserEmail.split("@")[0],
                         name: newUserName,
                         email: newUserEmail,