hazo_auth 4.5.0 → 4.5.2

package/dist/app/api/hazo_auth/user_management/users/route.d.ts

@@ -14,6 +14,7 @@ export declare function GET(request: NextRequest): Promise<NextResponse<{
         label: string;
         badge_color: string;
     }[];
+    multi_tenancy_enabled: boolean;
     users: {
         id: unknown;
         name: {} | null;
@@ -25,10 +26,12 @@ export declare function GET(request: NextRequest): Promise<NextResponse<{
         profile_picture_url: {} | null;
         profile_source: {} | null;
         user_type: string | null;
+        org_id: string | null | undefined;
+        root_org_id: string | null | undefined;
     }[];
 }>>;
 /**
- * PATCH - Update user (deactivate: set is_active to false)
+ * PATCH - Update user (deactivate: set is_active to false, assign org, etc.)
  */
 export declare function PATCH(request: NextRequest): Promise<NextResponse<{
     error: string;

package/dist/app/api/hazo_auth/user_management/users/route.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"route.d.ts","sourceRoot":"","sources":["../../../../../../src/app/api/hazo_auth/user_management/users/route.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,WAAW,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAexD,eAAO,MAAM,OAAO,kBAAkB,CAAC;AAGvC;;;GAGG;AACH,wBAAsB,GAAG,CAAC,OAAO,EAAE,WAAW;;;;;;;;;;;;;;;;;;;;;;IAwE7C;AAED;;GAEG;AACH,wBAAsB,KAAK,CAAC,OAAO,EAAE,WAAW;;;;IA2G/C;AAED;;GAEG;AACH,wBAAsB,IAAI,CAAC,OAAO,EAAE,WAAW;;;;IA2E9C"}
+{"version":3,"file":"route.d.ts","sourceRoot":"","sources":["../../../../../../src/app/api/hazo_auth/user_management/users/route.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,WAAW,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAsBxD,eAAO,MAAM,OAAO,kBAAkB,CAAC;AAGvC;;;GAGG;AACH,wBAAsB,GAAG,CAAC,OAAO,EAAE,WAAW;;;;;;;;;;;;;;;;;;;;;;;;;IA+E7C;AAED;;GAEG;AACH,wBAAsB,KAAK,CAAC,OAAO,EAAE,WAAW;;;;IA2L/C;AAED;;GAEG;AACH,wBAAsB,IAAI,CAAC,OAAO,EAAE,WAAW;;;;IA2E9C"}

package/dist/app/api/hazo_auth/user_management/users/route.js

@@ -9,6 +9,10 @@ import { request_password_reset } from "../../../../../lib/services/password_res
 import { get_auth_cache } from "../../../../../lib/auth/auth_cache";
 import { get_auth_utility_config } from "../../../../../lib/auth_utility_config.server";
 import { is_user_types_enabled, get_all_user_types, get_user_types_config, } from "../../../../../lib/user_types_config.server";
+import { is_multi_tenancy_enabled } from "../../../../../lib/multi_tenancy_config.server";
+import { get_org_by_id, can_add_user_to_org, } from "../../../../../lib/services/org_service";
+import { get_org_cache } from "../../../../../lib/auth/org_cache";
+import { get_multi_tenancy_config } from "../../../../../lib/multi_tenancy_config.server";
 // section: route_config
 export const dynamic = 'force-dynamic';
 // section: api_handler
@@ -42,10 +46,13 @@ export async function GET(request) {
                 badge_color: t.badge_color,
             }))
             : [];
+        // Check if multi-tenancy is enabled
+        const multi_tenancy_enabled = is_multi_tenancy_enabled();
         return NextResponse.json({
             success: true,
             user_types_enabled,
             available_user_types,
+            multi_tenancy_enabled,
             users: users.map((user) => ({
                 id: user.id,
                 name: user.name || null,
@@ -57,6 +64,9 @@ export async function GET(request) {
                 profile_picture_url: user.profile_picture_url || null,
                 profile_source: user.profile_source || null,
                 user_type: user.user_type || null,
+                // Include org info when multi-tenancy is enabled
+                org_id: multi_tenancy_enabled ? user.org_id || null : undefined,
+                root_org_id: multi_tenancy_enabled ? user.root_org_id || null : undefined,
             })),
         }, { status: 200 });
     }
@@ -73,13 +83,13 @@ export async function GET(request) {
     }
 }
 /**
- * PATCH - Update user (deactivate: set is_active to false)
+ * PATCH - Update user (deactivate: set is_active to false, assign org, etc.)
  */
 export async function PATCH(request) {
     const logger = create_app_logger();
     try {
         const body = await request.json();
-        const { user_id, is_active, user_type } = body;
+        const { user_id, is_active, user_type, org_id } = body;
         // user_id is always required
         if (!user_id) {
             return NextResponse.json({ error: "user_id is required" }, { status: 400 });
@@ -88,6 +98,7 @@ export async function PATCH(request) {
         const update_data = {
             changed_at: new Date().toISOString(),
         };
+        const hazoConnect = get_hazo_connect_instance();
         // Handle is_active if provided
         if (typeof is_active === "boolean") {
             update_data.is_active = is_active;
@@ -108,20 +119,53 @@ export async function PATCH(request) {
                 }
             }
         }
+        // Handle org_id if provided (only when multi-tenancy is enabled)
+        if (org_id !== undefined) {
+            if (!is_multi_tenancy_enabled()) {
+                return NextResponse.json({ error: "Multi-tenancy is not enabled" }, { status: 400 });
+            }
+            // Allow null to clear the org assignment
+            if (org_id === null || org_id === "") {
+                update_data.org_id = null;
+                update_data.root_org_id = null;
+            }
+            else {
+                // Validate org exists
+                const org_result = await get_org_by_id(hazoConnect, org_id);
+                if (!org_result.success || !org_result.org) {
+                    return NextResponse.json({ error: "Organization not found" }, { status: 400 });
+                }
+                const org = org_result.org;
+                // Check if org is active
+                if (org.active === false) {
+                    return NextResponse.json({ error: "Cannot assign user to inactive organization" }, { status: 400 });
+                }
+                // Check user limit
+                const limit_check = await can_add_user_to_org(hazoConnect, org_id);
+                if (limit_check.success && !limit_check.can_add) {
+                    return NextResponse.json({ error: limit_check.reason || "Organization user limit reached" }, { status: 400 });
+                }
+                // Set org_id and calculate root_org_id
+                update_data.org_id = org_id;
+                update_data.root_org_id = org.root_org_id || org_id;
+            }
+        }
         // Ensure there's something to update besides changed_at
         if (Object.keys(update_data).length === 1) {
             return NextResponse.json({ error: "No valid fields to update" }, { status: 400 });
         }
-        const hazoConnect = get_hazo_connect_instance();
         const users_service = createCrudService(hazoConnect, "hazo_users");
         // Update user
         await users_service.updateById(user_id, update_data);
-        // Invalidate user cache after deactivation
-        if (is_active === false) {
+        // Invalidate caches
+        let cache_invalidated = false;
+        // Invalidate user auth cache if user deactivated or org changed
+        if (is_active === false || org_id !== undefined) {
             try {
-                const config = get_auth_utility_config();
-                const cache = get_auth_cache(config.cache_max_users, config.cache_ttl_minutes, config.cache_max_age_minutes);
-                cache.invalidate_user(user_id);
+                const auth_config = get_auth_utility_config();
+                const auth_cache = get_auth_cache(auth_config.cache_max_users, auth_config.cache_ttl_minutes, auth_config.cache_max_age_minutes);
+                auth_cache.invalidate_user(user_id);
+                cache_invalidated = true;
             }
             catch (cache_error) {
                 // Log but don't fail user update if cache invalidation fails
@@ -134,11 +178,34 @@ export async function PATCH(request) {
                 });
             }
         }
+        // If org changed, also invalidate org cache for old and new orgs
+        if (org_id !== undefined && is_multi_tenancy_enabled()) {
+            try {
+                const mt_config = get_multi_tenancy_config();
+                const org_cache = get_org_cache(mt_config.org_cache_max_entries, mt_config.org_cache_ttl_minutes);
+                // Invalidate for the new org if set
+                if (org_id && typeof org_id === "string") {
+                    org_cache.invalidate(org_id);
+                }
+            }
+            catch (cache_error) {
+                // Log but don't fail user update if cache invalidation fails
+                const cache_error_message = cache_error instanceof Error ? cache_error.message : "Unknown error";
+                logger.warn("user_management_org_cache_invalidation_failed", {
+                    filename: get_filename(),
+                    line_number: get_line_number(),
+                    user_id,
+                    org_id,
+                    error: cache_error_message,
+                });
+            }
+        }
         logger.info("user_management_user_updated", {
             filename: get_filename(),
             line_number: get_line_number(),
             user_id,
             updated_fields: Object.keys(update_data).filter((k) => k !== "changed_at"),
+            cache_invalidated,
         });
         return NextResponse.json({ success: true }, { status: 200 });
     }

package/dist/components/layouts/user_management/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/components/layouts/user_management/index.tsx"],"names":[],"mappings":"AA0DA,4CAA4C;AAC5C,MAAM,MAAM,cAAc,GAAG;IAC3B,GAAG,EAAE,MAAM,CAAC;IACZ,KAAK,EAAE,MAAM,CAAC;IACd,WAAW,EAAE,MAAM,CAAC;CACrB,CAAC;AAEF,MAAM,MAAM,yBAAyB,GAAG;IACtC,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,oDAAoD;IACpD,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,4DAA4D;IAC5D,mBAAmB,CAAC,EAAE,OAAO,CAAC;IAC9B,iEAAiE;IACjE,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,6DAA6D;IAC7D,kBAAkB,CAAC,EAAE,cAAc,EAAE,CAAC;CACvC,CAAC;AAuBF;;;;;;;;;;GAUG;AACH,wBAAgB,oBAAoB,CAAC,EAAE,SAAS,EAAE,YAAoB,EAAE,mBAA2B,EAAE,gBAAwB,EAAE,kBAAuB,EAAE,EAAE,yBAAyB,2CA81ClL"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/components/layouts/user_management/index.tsx"],"names":[],"mappings":"AA0DA,4CAA4C;AAC5C,MAAM,MAAM,cAAc,GAAG;IAC3B,GAAG,EAAE,MAAM,CAAC;IACZ,KAAK,EAAE,MAAM,CAAC;IACd,WAAW,EAAE,MAAM,CAAC;CACrB,CAAC;AAEF,MAAM,MAAM,yBAAyB,GAAG;IACtC,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,oDAAoD;IACpD,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,4DAA4D;IAC5D,mBAAmB,CAAC,EAAE,OAAO,CAAC;IAC9B,iEAAiE;IACjE,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,6DAA6D;IAC7D,kBAAkB,CAAC,EAAE,cAAc,EAAE,CAAC;CACvC,CAAC;AA8BF;;;;;;;;;;GAUG;AACH,wBAAgB,oBAAoB,CAAC,EAAE,SAAS,EAAE,YAAoB,EAAE,mBAA2B,EAAE,gBAAwB,EAAE,kBAAuB,EAAE,EAAE,yBAAyB,2CAi8ClL"}

package/dist/components/layouts/user_management/index.js

@@ -73,6 +73,8 @@ export function UserManagementLayout({ className, hrbacEnabled = false, multiTen
     const [selectedUser, setSelectedUser] = useState(null);
     const [usersActionLoading, setUsersActionLoading] = useState(false);
     const [userTypeUpdateLoading, setUserTypeUpdateLoading] = useState(false);
+    const [orgUpdateLoading, setOrgUpdateLoading] = useState(false);
+    const [availableOrgs, setAvailableOrgs] = useState([]);
     // Tab 3: Permissions state
     const [permissions, setPermissions] = useState([]);
     const [permissionsLoading, setPermissionsLoading] = useState(true);
@@ -112,6 +114,29 @@ export function UserManagementLayout({ className, hrbacEnabled = false, multiTen
         }
         void loadUsers();
     }, [showUsersTab, loadUsers]);
+    // Load organizations (only if multi-tenancy is enabled and user has permission)
+    useEffect(() => {
+        if (!multiTenancyEnabled || !showUsersTab) {
+            return;
+        }
+        const loadOrgs = async () => {
+            try {
+                const response = await fetch(`${apiBasePath}/org_management/orgs`);
+                const data = await response.json();
+                if (data.success && Array.isArray(data.orgs)) {
+                    setAvailableOrgs(data.orgs.map((org) => ({
+                        id: org.id,
+                        name: org.name,
+                    })));
+                }
+            }
+            catch (error) {
+                // Silently fail - orgs dropdown will just be empty
+                console.error("Failed to load organizations:", error);
+            }
+        };
+        void loadOrgs();
+    }, [multiTenancyEnabled, showUsersTab, apiBasePath]);
     // Load permissions (only if user has permission)
     useEffect(() => {
         if (!showPermissionsTab) {
@@ -263,6 +288,41 @@ export function UserManagementLayout({ className, hrbacEnabled = false, multiTen
             setUserTypeUpdateLoading(false);
         }
     };
+    // Handle org change
+    const handleOrgChange = async (newOrgId) => {
+        if (!selectedUser)
+            return;
+        setOrgUpdateLoading(true);
+        try {
+            const response = await fetch(`${apiBasePath}/user_management/users`, {
+                method: "PATCH",
+                headers: {
+                    "Content-Type": "application/json",
+                },
+                body: JSON.stringify({
+                    user_id: selectedUser.id,
+                    org_id: newOrgId || null,
+                }),
+            });
+            const data = await response.json();
+            if (data.success) {
+                toast.success("Organization updated successfully");
+                // Update local state
+                setSelectedUser(Object.assign(Object.assign({}, selectedUser), { org_id: newOrgId || null }));
+                // Reload users list to get updated root_org_id from server
+                await loadUsers();
+            }
+            else {
+                toast.error(data.error || "Failed to update organization");
+            }
+        }
+        catch (error) {
+            toast.error("Failed to update organization");
+        }
+        finally {
+            setOrgUpdateLoading(false);
+        }
+    };
     // Handle migrate permissions
     const handleMigratePermissions = async () => {
         var _a, _b;
@@ -552,7 +612,7 @@ export function UserManagementLayout({ className, hrbacEnabled = false, multiTen
                                                         minute: "2-digit",
                                                         second: "2-digit",
                                                         timeZoneName: "short",
-                                                    }) })) : (_jsx("span", { className: "text-muted-foreground", children: "-" })) })] }), userTypesEnabled && (_jsxs("div", { className: "cls_user_management_user_detail_field_user_type flex flex-col gap-2", children: [_jsx(Label, { className: "cls_user_management_user_detail_label font-semibold", children: "User Type" }), _jsxs("div", { className: "cls_user_management_user_detail_user_type_value flex items-center gap-2", children: [_jsxs(Select, { value: selectedUser.user_type || "", onValueChange: (value) => handleUserTypeChange(value), disabled: userTypeUpdateLoading, children: [_jsx(SelectTrigger, { className: "w-48", children: _jsx(SelectValue, { placeholder: "Select user type" }) }), _jsxs(SelectContent, { children: [_jsx(SelectItem, { value: "", children: "None" }), availableUserTypes.map((type) => (_jsx(SelectItem, { value: type.key, children: type.label }, type.key)))] })] }), userTypeUpdateLoading && (_jsx(Loader2, { className: "h-4 w-4 animate-spin text-muted-foreground" }))] })] }))] })) }), _jsx(DialogFooter, { className: "cls_user_management_user_detail_dialog_footer", children: _jsx(Button, { onClick: () => setUserDetailDialogOpen(false), variant: "outline", className: "cls_user_management_user_detail_dialog_close", children: "Close" }) })] }) }), _jsx(Dialog, { open: assignRolesDialogOpen, onOpenChange: setAssignRolesDialogOpen, children: _jsxs(DialogContent, { className: "cls_user_management_assign_roles_dialog max-w-4xl max-h-[80vh] overflow-y-auto", children: [_jsxs(DialogHeader, { children: [_jsx(DialogTitle, { children: "Assign Roles to User" }), _jsxs(DialogDescription, { children: ["Select roles to assign to ", (selectedUser === null || selectedUser === void 0 ? void 0 : selectedUser.name) || (selectedUser === null || selectedUser === void 0 ? void 0 : selectedUser.email_address), ". Check the roles you want to assign, then click Save."] })] }), _jsx("div", { className: "cls_user_management_assign_roles_dialog_content py-4", children: _jsx(RolesMatrix, { add_button_enabled: false, role_name_selection_enabled: true, permissions_read_only: true, show_save_cancel: true, user_id: selectedUser === null || selectedUser === void 0 ? void 0 : selectedUser.id, onSave: (data) => {
+                                                    }) })) : (_jsx("span", { className: "text-muted-foreground", children: "-" })) })] }), userTypesEnabled && (_jsxs("div", { className: "cls_user_management_user_detail_field_user_type flex flex-col gap-2", children: [_jsx(Label, { className: "cls_user_management_user_detail_label font-semibold", children: "User Type" }), _jsxs("div", { className: "cls_user_management_user_detail_user_type_value flex items-center gap-2", children: [_jsxs(Select, { value: selectedUser.user_type || "", onValueChange: (value) => handleUserTypeChange(value), disabled: userTypeUpdateLoading, children: [_jsx(SelectTrigger, { className: "w-48", children: _jsx(SelectValue, { placeholder: "Select user type" }) }), _jsxs(SelectContent, { children: [_jsx(SelectItem, { value: "", children: "None" }), availableUserTypes.map((type) => (_jsx(SelectItem, { value: type.key, children: type.label }, type.key)))] })] }), userTypeUpdateLoading && (_jsx(Loader2, { className: "h-4 w-4 animate-spin text-muted-foreground" }))] })] })), multiTenancyEnabled && (_jsxs("div", { className: "cls_user_management_user_detail_field_org flex flex-col gap-2", children: [_jsx(Label, { className: "cls_user_management_user_detail_label font-semibold", children: "Organization" }), _jsxs("div", { className: "cls_user_management_user_detail_org_value flex items-center gap-2", children: [_jsxs(Select, { value: selectedUser.org_id || "", onValueChange: (value) => handleOrgChange(value), disabled: orgUpdateLoading, children: [_jsx(SelectTrigger, { className: "w-64", children: _jsx(SelectValue, { placeholder: "Select organization" }) }), _jsxs(SelectContent, { children: [_jsx(SelectItem, { value: "", children: "None" }), availableOrgs.map((org) => (_jsx(SelectItem, { value: org.id, children: org.name }, org.id)))] })] }), orgUpdateLoading && (_jsx(Loader2, { className: "h-4 w-4 animate-spin text-muted-foreground" }))] })] }))] })) }), _jsx(DialogFooter, { className: "cls_user_management_user_detail_dialog_footer", children: _jsx(Button, { onClick: () => setUserDetailDialogOpen(false), variant: "outline", className: "cls_user_management_user_detail_dialog_close", children: "Close" }) })] }) }), _jsx(Dialog, { open: assignRolesDialogOpen, onOpenChange: setAssignRolesDialogOpen, children: _jsxs(DialogContent, { className: "cls_user_management_assign_roles_dialog max-w-4xl max-h-[80vh] overflow-y-auto", children: [_jsxs(DialogHeader, { children: [_jsx(DialogTitle, { children: "Assign Roles to User" }), _jsxs(DialogDescription, { children: ["Select roles to assign to ", (selectedUser === null || selectedUser === void 0 ? void 0 : selectedUser.name) || (selectedUser === null || selectedUser === void 0 ? void 0 : selectedUser.email_address), ". Check the roles you want to assign, then click Save."] })] }), _jsx("div", { className: "cls_user_management_assign_roles_dialog_content py-4", children: _jsx(RolesMatrix, { add_button_enabled: false, role_name_selection_enabled: true, permissions_read_only: true, show_save_cancel: true, user_id: selectedUser === null || selectedUser === void 0 ? void 0 : selectedUser.id, onSave: (data) => {
                                     // Data is already saved by RolesMatrix component
                                     console.log("User roles saved:", data);
                                     // Refresh users list to show updated roles

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hazo_auth",
-  "version": "4.5.0",
+  "version": "4.5.2",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "type": "module",