pangolin_mirror/pangolin
1
0
Fork 0
mirror of https://github.com/fosrl/pangolin.git synced 2026-03-03 01:06:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' into clients-pops

Browse Source
This commit is contained in:
Owen
2025-06-10 13:00:20 -04:00
parent d523ebe0e0 3503cc3338
commit 0537992603
282 changed files with 6489 additions and 3540 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
server/routers/org/createOrg.ts
View File

@@ -12,13 +12,13 @@ import {
roleActions,
roles,
userOrgs,
users
} from "@server/db/schemas";
users,
actions
} from "@server/db";
import response from "@server/lib/response";
import HttpCode from "@server/types/HttpCode";
import createHttpError from "http-errors";
import logger from "@server/logger";
import { createAdminRole } from "@server/setup/ensureActions";
import config from "@server/lib/config";
import { fromError } from "zod-validation-error";
import { defaultRoleAllowedActions } from "../role";
@@ -159,14 +159,40 @@ export async function createOrg(
org = newOrg[0];
const roleId = await createAdminRole(newOrg[0].orgId);
// Create admin role within the same transaction
const [insertedRole] = await trx
.insert(roles)
.values({
orgId: newOrg[0].orgId,
isAdmin: true,
name: "Admin",
description: "Admin role with the most permissions"
})
.returning({ roleId: roles.roleId });
if (!roleId) {
if (!insertedRole || !insertedRole.roleId) {
error = "Failed to create Admin role";
trx.rollback();
return;
}
const roleId = insertedRole.roleId;
// Get all actions and create role actions
const actionIds = await trx.select().from(actions).execute();
if (actionIds.length > 0) {
await trx
.insert(roleActions)
.values(
actionIds.map((action) => ({
roleId,
actionId: action.actionId,
orgId: newOrg[0].orgId
}))
);
}
await trx.insert(orgDomains).values(
allDomains.map((domain) => ({
orgId: newOrg[0].orgId,
@@ -236,7 +262,7 @@ export async function createOrg(
return next(
createHttpError(
HttpCode.INTERNAL_SERVER_ERROR,
"Failed to createo org"
"Failed to create org"
)
);
}