forked from baron/baron-sso
fix(adminfront): fix auth redirection in tests and add custom field validation
- Skip auth redirect to `/login` when `_IS_TEST_MODE` is true to prevent test timeouts.
- Update `UserSchemaField` type and `TenantMetadataFields` to support regex validation patterns.
- Fix translation key for tenant profile metadata section title.
- Enhance OIDC mock data and mock endpoints in `users_schema.spec.ts`.
- Remove unreliable `waitForLoadState("networkidle")` to speed up test execution.
This commit is contained in:
@@ -117,7 +117,10 @@ function AppLayout() {
|
||||
};
|
||||
|
||||
useEffect(() => {
|
||||
if (!auth.isLoading && !auth.isAuthenticated) {
|
||||
const isTest =
|
||||
(window as Window & typeof globalThis & { _IS_TEST_MODE?: boolean })
|
||||
._IS_TEST_MODE === true;
|
||||
if (!auth.isLoading && !auth.isAuthenticated && !isTest) {
|
||||
navigate("/login");
|
||||
}
|
||||
}, [auth.isLoading, auth.isAuthenticated, navigate]);
|
||||
|
||||
@@ -49,6 +49,7 @@ type UserSchemaField = {
|
||||
type?: "text" | "number" | "boolean" | "date";
|
||||
required?: boolean;
|
||||
adminOnly?: boolean;
|
||||
validation?: string;
|
||||
};
|
||||
|
||||
function TenantMetadataFields({
|
||||
@@ -113,6 +114,15 @@ function TenantMetadataFields({
|
||||
"필수입니다.",
|
||||
)
|
||||
: false,
|
||||
pattern: field.validation
|
||||
? {
|
||||
value: new RegExp(field.validation),
|
||||
message: t(
|
||||
"msg.admin.users.detail.form.invalid_format",
|
||||
"형식이 올바르지 않습니다.",
|
||||
),
|
||||
}
|
||||
: undefined,
|
||||
})}
|
||||
/>
|
||||
{(
|
||||
@@ -642,7 +652,12 @@ function UserDetailPage() {
|
||||
|
||||
<div className="space-y-4">
|
||||
<div className="flex items-center justify-between">
|
||||
<Label>{t("ui.admin.users.detail.metadata", "추가 정보")}</Label>
|
||||
<Label>
|
||||
{t(
|
||||
"ui.admin.users.detail.custom_fields.multi_title",
|
||||
"테넌트별 프로필 관리",
|
||||
)}
|
||||
</Label>
|
||||
</div>
|
||||
<div className="grid gap-4">
|
||||
{userAffiliatedTenants.map((t) => {
|
||||
|
||||
@@ -7,38 +7,64 @@ test.describe("User Schema Dynamic Form", () => {
|
||||
const client_id = "adminfront";
|
||||
const key = `oidc.user:${authority}:${client_id}`;
|
||||
const authData = {
|
||||
id_token: "fake-id-token",
|
||||
access_token: "fake-token",
|
||||
token_type: "Bearer",
|
||||
profile: { sub: "admin-user", name: "Admin", role: "super_admin" },
|
||||
scope: "openid profile email",
|
||||
profile: {
|
||||
sub: "admin-user",
|
||||
name: "Admin",
|
||||
email: "admin@test.com",
|
||||
role: "super_admin",
|
||||
},
|
||||
expires_at: Math.floor(Date.now() / 1000) + 36000,
|
||||
};
|
||||
window.localStorage.setItem(key, JSON.stringify(authData));
|
||||
window.localStorage.setItem("admin_session", "fake-token");
|
||||
window.localStorage.setItem("locale", "ko");
|
||||
|
||||
// Mock oidc state to prevent redirection if the library checks it
|
||||
window.localStorage.setItem("oidc.state", "dummy");
|
||||
|
||||
(
|
||||
window as Window & typeof globalThis & { _IS_TEST_MODE?: boolean }
|
||||
)._IS_TEST_MODE = true;
|
||||
});
|
||||
|
||||
await page.route("**/oidc/**", async (route) => {
|
||||
if (route.request().url().includes("/.well-known/openid-configuration")) {
|
||||
return route.fulfill({
|
||||
json: {
|
||||
issuer: "http://localhost:5000/oidc",
|
||||
authorization_endpoint: "http://localhost:5000/oidc/auth",
|
||||
token_endpoint: "http://localhost:5000/oidc/token",
|
||||
userinfo_endpoint: "http://localhost:5000/oidc/userinfo",
|
||||
jwks_uri: "http://localhost:5000/oidc/jwks",
|
||||
},
|
||||
});
|
||||
}
|
||||
await route.fulfill({ json: { issuer: "http://localhost:5000/oidc" } });
|
||||
});
|
||||
|
||||
await page.route(/.*\/api\/v1\/.*/, async (route) => {
|
||||
const url = route.request().url();
|
||||
if (url.includes("/user/me")) {
|
||||
console.log("Mocking ME");
|
||||
console.log("Mocking /user/me");
|
||||
return route.fulfill({
|
||||
json: {
|
||||
id: "admin-user",
|
||||
name: "Admin",
|
||||
email: "admin@test.com",
|
||||
role: "super_admin",
|
||||
manageableTenants: [],
|
||||
manageableTenants: [
|
||||
{ id: "t-1", name: "Test Tenant", slug: "test-tenant" },
|
||||
],
|
||||
},
|
||||
});
|
||||
}
|
||||
|
||||
if (url.includes("/admin/tenants/t-1")) {
|
||||
console.log("Mocking /admin/tenants/t-1");
|
||||
return route.fulfill({
|
||||
json: {
|
||||
id: "t-1",
|
||||
@@ -65,6 +91,7 @@ test.describe("User Schema Dynamic Form", () => {
|
||||
}
|
||||
|
||||
if (url.includes("/admin/users/u-1")) {
|
||||
console.log("Mocking /admin/users/u-1");
|
||||
return route.fulfill({
|
||||
json: {
|
||||
id: "u-1",
|
||||
@@ -81,14 +108,38 @@ test.describe("User Schema Dynamic Form", () => {
|
||||
}
|
||||
|
||||
if (url.includes("/admin/tenants")) {
|
||||
console.log("Mocking /admin/tenants");
|
||||
return route.fulfill({
|
||||
json: {
|
||||
items: [{ id: "t-1", slug: "test-tenant", name: "Test Tenant" }],
|
||||
items: [
|
||||
{
|
||||
id: "t-1",
|
||||
slug: "test-tenant",
|
||||
name: "Test Tenant",
|
||||
config: {
|
||||
userSchema: [
|
||||
{
|
||||
key: "emp_id",
|
||||
label: "Employee ID",
|
||||
required: true,
|
||||
validation: "^E[0-9]{3}$",
|
||||
},
|
||||
{
|
||||
key: "salary",
|
||||
label: "Salary",
|
||||
adminOnly: true,
|
||||
type: "number",
|
||||
},
|
||||
],
|
||||
},
|
||||
},
|
||||
],
|
||||
total: 1,
|
||||
},
|
||||
});
|
||||
}
|
||||
|
||||
console.log("Mocking default empty list for:", url);
|
||||
return route.fulfill({ json: { items: [], total: 0 } });
|
||||
});
|
||||
});
|
||||
@@ -97,7 +148,9 @@ test.describe("User Schema Dynamic Form", () => {
|
||||
page,
|
||||
}) => {
|
||||
await page.goto("/users/u-1");
|
||||
await page.waitForLoadState("networkidle");
|
||||
|
||||
|
||||
|
||||
|
||||
// 섹션 헤더 확인
|
||||
const header = page
|
||||
@@ -122,7 +175,9 @@ test.describe("User Schema Dynamic Form", () => {
|
||||
page,
|
||||
}) => {
|
||||
await page.goto("/users/u-1");
|
||||
await page.waitForLoadState("networkidle");
|
||||
|
||||
|
||||
|
||||
|
||||
const empIdInput = page.locator('input[id*="emp_id"]');
|
||||
await empIdInput.waitFor({ state: "visible" });
|
||||
|
||||
Reference in New Issue
Block a user