forked from baron/baron-sso
feat(user): support fixed UUID registration and enhance bulk import results
- Added support for fixed UUIDs during bulk registration (Search-first + ExternalID mapping) - Implemented idempotency and visibility restoration for soft-deleted users - Enhanced bulk upload UI to show 'New/Updated/Unchanged' status and modified fields - Added logic to reclaim identifiers (login_id) from colliding records - Added frontend E2E and backend unit tests for UUID integrity and conflict handling - Fixed i18n, formatting, and mock tests to satisfy code-check - Applied 'go fix' for 'omitzero' tags and general Go standards
This commit is contained in:
@@ -112,7 +112,7 @@ test.describe("Users Bulk Upload Secondary Emails", () => {
|
||||
|
||||
await page.getByTestId("bulk-start-btn").click();
|
||||
|
||||
await expect(page.getByText(/성공|Success/i)).toBeVisible();
|
||||
await expect(page.getByText(/성공|Success/i).first()).toBeVisible();
|
||||
|
||||
expect(bulkPayload).not.toBeNull();
|
||||
expect(bulkPayload.users).toHaveLength(1);
|
||||
|
||||
178
adminfront/tests/users_bulk_uuid.spec.ts
Normal file
178
adminfront/tests/users_bulk_uuid.spec.ts
Normal file
@@ -0,0 +1,178 @@
|
||||
import { expect, test } from "@playwright/test";
|
||||
|
||||
test.describe("Users Bulk Upload UUID Support", () => {
|
||||
test.beforeEach(async ({ page }) => {
|
||||
await page.addInitScript(() => {
|
||||
window.localStorage.setItem("locale", "ko");
|
||||
window.localStorage.setItem("admin_session", "fake-token");
|
||||
(
|
||||
window as Window & typeof globalThis & { _IS_TEST_MODE?: boolean }
|
||||
)._IS_TEST_MODE = true;
|
||||
|
||||
const authority = "http://localhost:5000/oidc";
|
||||
const client_id = "adminfront";
|
||||
const key = `oidc.user:${authority}:${client_id}`;
|
||||
const authData = {
|
||||
access_token: "fake-token",
|
||||
token_type: "Bearer",
|
||||
profile: { sub: "admin-user", name: "Admin", role: "super_admin" },
|
||||
expires_at: Math.floor(Date.now() / 1000) + 36000,
|
||||
};
|
||||
window.localStorage.setItem(key, JSON.stringify(authData));
|
||||
});
|
||||
|
||||
await page.route("**/api/v1/**", async (route) => {
|
||||
const url = route.request().url();
|
||||
const headers = { "Access-Control-Allow-Origin": "*" };
|
||||
|
||||
if (url.includes("/user/me")) {
|
||||
return route.fulfill({
|
||||
json: {
|
||||
id: "admin-user",
|
||||
name: "Admin",
|
||||
role: "super_admin",
|
||||
manageableTenants: [],
|
||||
},
|
||||
headers,
|
||||
});
|
||||
}
|
||||
if (url.includes("/admin/users")) {
|
||||
if (!url.includes("/bulk")) {
|
||||
return route.fulfill({
|
||||
json: { items: [], total: 0, limit: 50, offset: 0 },
|
||||
headers,
|
||||
});
|
||||
}
|
||||
}
|
||||
if (url.includes("/admin/tenants")) {
|
||||
return route.fulfill({
|
||||
json: { items: [], total: 0, limit: 100, offset: 0 },
|
||||
headers,
|
||||
});
|
||||
}
|
||||
return route.fulfill({ json: { items: [], total: 0 }, headers });
|
||||
});
|
||||
|
||||
await page.route("**/oidc/**", async (route) => {
|
||||
await route.fulfill({ json: { issuer: "http://localhost:5000/oidc" } });
|
||||
});
|
||||
});
|
||||
|
||||
test("should include UUID in bulk upload payload when provided in CSV", async ({
|
||||
page,
|
||||
}) => {
|
||||
let bulkPayload = "";
|
||||
const testUuid = "550e8400-e29b-41d4-a716-446655440000";
|
||||
|
||||
await page.route("**/api/v1/admin/users/bulk", async (route) => {
|
||||
bulkPayload = route.request().postData() ?? "";
|
||||
return route.fulfill({
|
||||
json: {
|
||||
results: [
|
||||
{ email: "uuid@test.com", success: true, userId: testUuid },
|
||||
],
|
||||
},
|
||||
headers: { "Access-Control-Allow-Origin": "*" },
|
||||
});
|
||||
});
|
||||
|
||||
await page.goto("/users");
|
||||
await page.getByTestId("user-data-mgmt-btn").click();
|
||||
await page
|
||||
.getByRole("menuitem", { name: /일괄 임포트|Bulk Import/i })
|
||||
.click();
|
||||
|
||||
await page.locator('input[type="file"]').setInputFiles({
|
||||
name: "users_uuid.csv",
|
||||
mimeType: "text/csv",
|
||||
buffer: Buffer.from(
|
||||
`email,name,uuid\nuuid@test.com,UUID User,${testUuid}\n`,
|
||||
),
|
||||
});
|
||||
|
||||
await page.getByTestId("bulk-start-btn").click();
|
||||
await expect(page.getByText("uuid@test.com")).toBeVisible();
|
||||
|
||||
const payload = JSON.parse(bulkPayload);
|
||||
expect(payload.users[0].uuid).toBe(testUuid);
|
||||
expect(payload.users[0].id).toBe(testUuid);
|
||||
});
|
||||
|
||||
test("should support 'id' column as UUID if format matches", async ({
|
||||
page,
|
||||
}) => {
|
||||
let bulkPayload = "";
|
||||
const testUuid = "550e8400-e29b-41d4-a716-446655440001";
|
||||
|
||||
await page.route("**/api/v1/admin/users/bulk", async (route) => {
|
||||
bulkPayload = route.request().postData() ?? "";
|
||||
return route.fulfill({
|
||||
json: {
|
||||
results: [
|
||||
{ email: "id-uuid@test.com", success: true, userId: testUuid },
|
||||
],
|
||||
},
|
||||
headers: { "Access-Control-Allow-Origin": "*" },
|
||||
});
|
||||
});
|
||||
|
||||
await page.goto("/users");
|
||||
await page.getByTestId("user-data-mgmt-btn").click();
|
||||
await page
|
||||
.getByRole("menuitem", { name: /일괄 임포트|Bulk Import/i })
|
||||
.click();
|
||||
|
||||
await page.locator('input[type="file"]').setInputFiles({
|
||||
name: "users_id.csv",
|
||||
mimeType: "text/csv",
|
||||
buffer: Buffer.from(
|
||||
`email,name,id\nid-uuid@test.com,ID UUID User,${testUuid}\n`,
|
||||
),
|
||||
});
|
||||
|
||||
await page.getByTestId("bulk-start-btn").click();
|
||||
|
||||
const payload = JSON.parse(bulkPayload);
|
||||
expect(payload.users[0].uuid).toBe(testUuid);
|
||||
expect(payload.users[0].id).toBe(testUuid);
|
||||
});
|
||||
|
||||
test("should show conflict error message when UUID already exists", async ({
|
||||
page,
|
||||
}) => {
|
||||
const testUuid = "550e8400-e29b-41d4-a716-446655440002";
|
||||
const conflictMsg = `Conflict: UUID already exists (${testUuid})`;
|
||||
|
||||
await page.route("**/api/v1/admin/users/bulk", async (route) => {
|
||||
return route.fulfill({
|
||||
json: {
|
||||
results: [
|
||||
{
|
||||
email: "conflict@test.com",
|
||||
success: false,
|
||||
message: conflictMsg,
|
||||
},
|
||||
],
|
||||
},
|
||||
headers: { "Access-Control-Allow-Origin": "*" },
|
||||
});
|
||||
});
|
||||
|
||||
await page.goto("/users");
|
||||
await page.getByTestId("user-data-mgmt-btn").click();
|
||||
await page
|
||||
.getByRole("menuitem", { name: /일괄 임포트|Bulk Import/i })
|
||||
.click();
|
||||
|
||||
await page.locator('input[type="file"]').setInputFiles({
|
||||
name: "users_conflict.csv",
|
||||
mimeType: "text/csv",
|
||||
buffer: Buffer.from(
|
||||
`email,name,uuid\nconflict@test.com,Conflict User,${testUuid}\n`,
|
||||
),
|
||||
});
|
||||
|
||||
await page.getByTestId("bulk-start-btn").click();
|
||||
await expect(page.getByText(conflictMsg)).toBeVisible();
|
||||
});
|
||||
});
|
||||
Reference in New Issue
Block a user