Update hivegrid-cloud reference to latest main
Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
This commit is contained in:
1 parent
e98d38e716
commit
7b21524c86
3781 files changed
+373484
-225607
No files matched your search
+20
-3
@@ -1,8 +1,8 @@
|
||||
// @vitest-environment node
|
||||
import { beforeEach, describe, expect, it, vi } from "vitest";
|
||||
|
||||
vi.mock("@toolctrl/config", async () => {
|
||||
const actual = await vi.importActual<typeof import("@toolctrl/config")>("@toolctrl/config");
|
||||
vi.mock("@hivegrid/config", async () => {
|
||||
const actual = await vi.importActual<typeof import("@hivegrid/config")>("@hivegrid/config");
|
||||
return {
|
||||
...actual,
|
||||
loadRequiredWebConfig: () => ({ nodeEnv: "production" }),
|
||||
@@ -26,6 +26,9 @@ vi.mock("./db.server", () => ({
|
||||
adminUser: {
|
||||
findUnique: vi.fn(),
|
||||
},
|
||||
user: {
|
||||
findUnique: vi.fn(),
|
||||
},
|
||||
},
|
||||
}));
|
||||
vi.mock("./db/permissions/userRoles.db.server", () => ({
|
||||
@@ -83,6 +86,7 @@ describe("requireAuth tenant-source routing", () => {
|
||||
vi.mocked(getTenantIdFromUrl).mockResolvedValue("tenant-1");
|
||||
vi.mocked(getTenantUserType).mockResolvedValue({ status: 2, type: 1 });
|
||||
vi.mocked(db.adminUser.findUnique).mockResolvedValue(null);
|
||||
vi.mocked(db.user.findUnique).mockResolvedValue({ admin: false });
|
||||
vi.mocked(getUserRoleInTenant).mockResolvedValue(null);
|
||||
});
|
||||
|
||||
@@ -102,9 +106,10 @@ describe("requireAuth tenant-source routing", () => {
|
||||
|
||||
expect(getTenantUserType).toHaveBeenCalledWith("user-1", "tenant-1");
|
||||
expect(db.adminUser.findUnique).toHaveBeenCalledWith({ where: { userId: "user-1" } });
|
||||
expect(db.user.findUnique).toHaveBeenCalledWith({ where: { id: "user-1" }, select: { admin: true } });
|
||||
});
|
||||
|
||||
it("allows operator admins to inspect app-host tenant requests without membership", async () => {
|
||||
it("allows AdminUser operators to inspect app-host tenant requests without membership", async () => {
|
||||
vi.mocked(getTenantUserType).mockResolvedValueOnce(null);
|
||||
vi.mocked(db.adminUser.findUnique).mockResolvedValueOnce({ userId: "user-1" });
|
||||
|
||||
@@ -112,6 +117,18 @@ describe("requireAuth tenant-source routing", () => {
|
||||
|
||||
expect(getTenantUserType).toHaveBeenCalledWith("user-1", "tenant-1");
|
||||
expect(db.adminUser.findUnique).toHaveBeenCalledWith({ where: { userId: "user-1" } });
|
||||
expect(db.user.findUnique).toHaveBeenCalledWith({ where: { id: "user-1" }, select: { admin: true } });
|
||||
});
|
||||
|
||||
it("allows user.admin operators to inspect app-host tenant requests without membership", async () => {
|
||||
vi.mocked(getTenantUserType).mockResolvedValueOnce(null);
|
||||
vi.mocked(db.user.findUnique).mockResolvedValueOnce({ admin: true });
|
||||
|
||||
await expect(requireAuth({ request: makeRequest(env.WEB_APP_HOST, "/acme/dashboard"), params: { tenant: "acme" } })).resolves.toEqual(userSession);
|
||||
|
||||
expect(getTenantUserType).toHaveBeenCalledWith("user-1", "tenant-1");
|
||||
expect(db.adminUser.findUnique).toHaveBeenCalledWith({ where: { userId: "user-1" } });
|
||||
expect(db.user.findUnique).toHaveBeenCalledWith({ where: { id: "user-1" }, select: { admin: true } });
|
||||
});
|
||||
|
||||
it("keeps admin-host paths on the super-admin branch", async () => {
|
||||
|
||||
Reference in new issue
Block a user