Refresh HiveGrid Cloud reference snapshot

This commit is contained in:
david committed 2026-08-03 15:31:14 +02:00
1 parent 5e99e14772
commit 7f88026f79
5955 files changed
+1177325 -188362

No files matched your search

@@ -1,11 +1,12 @@
import { getTenantUserType } from "./db/tenants.db.server";
import { getTenantIdFromUrl, resolveTenantLookupSource } from "./services/.server/urlService";
import { getUserInfo } from "./session.server";
import { getUserInfo, getValidatedServerSession } from "./session.server";
import { db } from "./db.server";
import { getUserRoleInTenant } from "./db/permissions/userRoles.db.server";
import { Params } from "react-router";
import { DefaultAppRoles } from "~/application/dtos/shared/DefaultAppRoles";
import { loadRequiredWebConfig } from "@hivegrid/config";
import { runWithRlsContext } from "@hivegrid/db/rls-context.server";
import { getHostRoutingContextFromRequest } from "./app/HostRouting.server";
const webConfig = loadRequiredWebConfig();
@@ -23,7 +24,7 @@ export async function requireAuth({ request, params, adminOnly }: { request: Req
const userInfo = await getUserInfo(request);
const hostContext = getHostRoutingContextFromRequest(request);
if (hostContext === "admin") {
return await requireSuperAdmin({ request });
return requireAdminConsoleIdentityForUser(request, userInfo);
}
const tenantLookupSource = resolveTenantLookupSource({ request, params });
@@ -34,13 +35,7 @@ export async function requireAuth({ request, params, adminOnly }: { request: Req
}
const member = await getTenantUserType(userInfo.userId, tenantId);
if (!member) {
const [isSuperAdmin, user] = await Promise.all([
getIsSuperAdminByUserId(userInfo.userId),
db.user.findUnique({ where: { id: userInfo.userId }, select: { admin: true } }),
]);
if (!isSuperAdmin && !user?.admin) {
throw Response.json(UNAUTHORIZED_ENVELOPE, { status: 401 });
}
throw Response.json(UNAUTHORIZED_ENVELOPE, { status: 401 });
}
}
@@ -54,16 +49,29 @@ export async function requireAuth({ request, params, adminOnly }: { request: Req
return { ...userInfo };
}
export async function requireSuperAdmin({ request }: { request: Request }) {
export async function requireAdminConsoleIdentity({ request }: { request: Request }) {
const userInfo = await getUserInfo(request);
return requireAdminConsoleIdentityForUser(request, userInfo);
}
async function requireAdminConsoleIdentityForUser(request: Request, userInfo: Awaited<ReturnType<typeof getUserInfo>>) {
if (!userInfo.userId) {
throw Response.json(UNAUTHORIZED_ENVELOPE, { status: 401 });
}
const isSuperAdmin = await db.adminUser.findUnique({ where: { userId: userInfo.userId } });
const validatedSession = await getValidatedServerSession(request, userInfo);
if (!validatedSession || !("adminUser" in validatedSession) || validatedSession.adminUserId !== userInfo.userId) {
throw Response.json(UNAUTHORIZED_ENVELOPE, { status: 401 });
}
return { ...userInfo, adminIdentity: validatedSession.adminUser };
}
export async function requireSuperAdmin({ request }: { request: Request }) {
const adminIdentity = await requireAdminConsoleIdentity({ request });
const isSuperAdmin = await getIsSuperAdminByUserId(adminIdentity.userId!);
if (!isSuperAdmin) {
throw Response.json(UNAUTHORIZED_ENVELOPE, { status: 401 });
}
return { ...userInfo, isSuperAdmin };
return { ...adminIdentity, isSuperAdmin };
}
export async function getIsSuperUserOrAdmin({ request, params }: { request: Request; params: Params }) {
@@ -71,9 +79,6 @@ export async function getIsSuperUserOrAdmin({ request, params }: { request: Requ
const tenantId = await getTenantIdFromUrl(params);
if (!userId || !tenantId) return false;
const isSuperAdmin = await getIsSuperAdmin({ request });
if (isSuperAdmin) return true;
const isSuperUser = await getUserRoleInTenant(userId, tenantId, DefaultAppRoles.SuperUser);
if (isSuperUser) return true;
@@ -85,9 +90,6 @@ export async function getIsSuperUserOrAdmin({ request, params }: { request: Requ
export async function getIsSuperUserOrAdminByIds({ userId, tenantId }: { userId: string; tenantId: string }) {
if (!userId || !tenantId) return false;
const isSuperAdmin = await db.adminUser.findUnique({ where: { userId: userId } });
if (isSuperAdmin) return true;
const isSuperUser = await getUserRoleInTenant(userId, tenantId, DefaultAppRoles.SuperUser);
if (isSuperUser) return true;
@@ -97,15 +99,23 @@ export async function getIsSuperUserOrAdminByIds({ userId, tenantId }: { userId:
}
export async function getIsSuperAdmin({ request }: { request: Request }) {
const { userId } = await getUserInfo(request);
if (!userId) return false;
return getIsSuperAdminByUserId(userId);
try {
const identity = await requireAdminConsoleIdentity({ request });
return getIsSuperAdminByUserId(identity.userId!);
} catch {
return false;
}
}
export async function getIsSuperAdminByUserId(userId: string) {
if (!userId) return false;
const isSuperAdmin = await db.adminUser.findUnique({ where: { userId } });
return !!isSuperAdmin;
const isSuperAdmin = await runWithRlsContext({ userId }, () =>
db.adminUserRole.findFirst({
where: { adminUserId: userId, user: { status: "active" }, role: { systemKey: "super_admin", active: true } },
select: { adminUserId: true },
})
);
return isSuperAdmin !== null;
}
export async function requireSuperUserOrAdmin({ request, params }: { request: Request; params: Params }) {