{#if data.groupByStation}
{#if first.patient.room}
Station {first.patient.room?.station.name}
diff --git a/src/routes/+layout.server.ts b/src/routes/+layout.server.ts
index bdc5805..6065cf5 100644
--- a/src/routes/+layout.server.ts
+++ b/src/routes/+layout.server.ts
@@ -1,5 +1,5 @@
import type { LayoutServerLoad } from "./$types";
-export const load: LayoutServerLoad = async (event) => ({
+export const load: LayoutServerLoad = (event) => ({
session: event.locals.session,
});
diff --git a/src/routes/+layout.svelte b/src/routes/+layout.svelte
index a18fc7e..acdea48 100644
--- a/src/routes/+layout.svelte
+++ b/src/routes/+layout.svelte
@@ -1,5 +1,5 @@
-
+
diff --git a/src/routes/login/+page.svelte b/src/routes/login/+page.svelte
index 0d37816..0e1376f 100644
--- a/src/routes/login/+page.svelte
+++ b/src/routes/login/+page.svelte
@@ -5,6 +5,6 @@
Visitenbuch
diff --git a/tests/e2e/_test.ts b/tests/e2e/_test.ts
new file mode 100644
index 0000000..d0ed5a2
--- /dev/null
+++ b/tests/e2e/_test.ts
@@ -0,0 +1,90 @@
+import { encode } from "@auth/core/jwt";
+import { test as base, expect, type Page } from "@playwright/test";
+
+import { prisma } from "$lib/server/prisma";
+
+export const OIDC_BASE_URL = process.env.KEYCLOAK_ISSUER + "/";
+const AUTH_COOKIE = "authjs.session-token";
+
+type Account = {
+ id: number;
+ name: string;
+ email: string;
+ accessToken: string | null;
+};
+
+export async function isLoggedIn(page: Page): Promise
{
+ const cookies = await page.context().cookies();
+ return cookies.findIndex((c) => c.name === AUTH_COOKIE) !== -1;
+}
+
+async function newSessionToken(user: Account): Promise {
+ return encode({
+ salt: AUTH_COOKIE,
+ secret: process.env.AUTH_SECRET!,
+ token: {
+ name: user.name,
+ email: user.email,
+ sub: user.id.toString(),
+ id: user.id.toString(),
+ accessToken: user.accessToken,
+ },
+ });
+}
+
+export const test = base.extend({
+ account: [async ({ browser }, use, workerInfo) => {
+ // Unique username
+ const name = "user" + workerInfo.workerIndex;
+ const email = name + "@example.org";
+
+ // Create the account
+ const page = await browser.newPage();
+ await page.goto("/");
+
+ if (page.url().startsWith(OIDC_BASE_URL)) {
+ await page.locator('input[name="login"]').fill(name);
+ await page.locator('input[name="password"]').fill("1234");
+ await page.locator("button.login-submit").click();
+ await page.getByRole("button", { name: "Continue" }).click();
+ expect(await isLoggedIn(page)).toBe(true);
+ }
+
+ // Get user data
+ const user = await prisma.user.findUniqueOrThrow({
+ select: {
+ id: true,
+ accounts: {
+ select: { access_token: true },
+ where: { provider: "keycloak" },
+ },
+ },
+ where: { email },
+ });
+ expect(user.accounts.length).toBe(1);
+
+ // Use the account data when calling the fixture
+ await use({
+ id: user.id, name, email, accessToken: user.accounts[0].access_token,
+ });
+ }, { scope: "worker" }],
+}).extend<{
+ login: Page,
+}>({
+ login: async ({ page, account }, use) => {
+ const token = await newSessionToken(account);
+ await page.context().addCookies([{
+ name: AUTH_COOKIE,
+ value: token,
+ domain: "localhost",
+ path: "/",
+ httpOnly: true,
+ sameSite: "Lax",
+ }]);
+ await use(page);
+ },
+});
+
+export { expect } from "@playwright/test";
diff --git a/tests/e2e/login.test.ts b/tests/e2e/login.test.ts
new file mode 100644
index 0000000..9d51f53
--- /dev/null
+++ b/tests/e2e/login.test.ts
@@ -0,0 +1,37 @@
+import {
+ test, expect, isLoggedIn, OIDC_BASE_URL,
+} from "./_test";
+
+test("login", async ({ login: page, account }) => {
+ await page.goto("/");
+ await expect(page).toHaveTitle("Visitenbuch");
+ await expect(page.locator("h1.heading")).toHaveText("Hallo, " + account.name);
+ // Test cases may create more entries
+ expect(parseInt(await page.getByTestId("n-entries-todo").innerText()))
+ .toBeGreaterThanOrEqual(193);
+});
+
+test("logout", async ({ login: page, baseURL }) => {
+ await page.goto("/");
+
+ await page.goto("/logout");
+ await page.getByTestId("btn-logout").click();
+
+ // Sometimes the OIDC provider asks for login confirmation
+ if (page.url().startsWith(OIDC_BASE_URL)) {
+ await page.locator('button[value="yes"]').click();
+ }
+
+ await page.waitForURL("/login?noAuto=1");
+ await expect(page.getByTestId("btn-login")).toBeVisible();
+ expect(await isLoggedIn(page)).toBe(false);
+
+ // Check if application is not accessible if unauthorized
+ await page.goto("/plan");
+ expect(page.url() === baseURL + "/login?returnURL=%2Fplan" || page.url().startsWith(OIDC_BASE_URL)).toBe(true);
+
+ // Check if TRPC API is not accessible if unauthorized
+ const apiResponse = await page.context().request.get("/trpc/savedFilter.getAll");
+ expect(apiResponse.status()).toBe(401);
+ expect(await apiResponse.json()).toMatchObject({ error: { message: "not logged in" } });
+});
diff --git a/tests/e2e/plan.test.ts b/tests/e2e/plan.test.ts
new file mode 100644
index 0000000..62aa555
--- /dev/null
+++ b/tests/e2e/plan.test.ts
@@ -0,0 +1,25 @@
+import { test, expect } from "./_test";
+
+test("filter", async ({ login: page }) => {
+ await page.goto("/plan");
+ await expect(page).toHaveTitle("Planung");
+
+ const filterbar = page.locator(".filterbar-outer");
+ const filterIn = filterbar.getByPlaceholder("Filter");
+ await filterIn.click();
+ await filterbar.getByRole("option", { name: "Kategorie" }).click();
+ await filterbar.getByRole("option", { name: "Laborabnahme" }).click();
+ await filterIn.click();
+ await filterbar.getByRole("option", { name: "Zimmer" }).click();
+ await filterbar.getByRole("option", { name: "R1.5" }).click();
+ await filterIn.click();
+ await filterbar.getByRole("option", { name: "Autor" }).click();
+ await filterbar.getByRole("option", { name: "Akeem Wisozk" }).click();
+
+ await expect(page).toHaveURL("http://localhost:4173/plan?filter%5Bcategory%5D%5B0%5D%5Bid%5D=1&filter%5Bcategory%5D%5B0%5D%5Bname%5D=Laborabnahme&filter%5Broom%5D%5B0%5D%5Bid%5D=5&filter%5Broom%5D%5B0%5D%5Bname%5D=R1.5&filter%5Bauthor%5D%5B0%5D%5Bid%5D=5&filter%5Bauthor%5D%5B0%5D%5Bname%5D=Akeem%20Wisozk");
+
+ const table = page.getByTestId("entry-table");
+ const firstRow = table.locator("tbody > tr").first();
+
+ await expect(firstRow.locator("td > a").first()).toHaveText("275");
+});
diff --git a/tests/helpers/generate-mockdata.ts b/tests/helpers/generate-mockdata.ts
index 260f1f9..412d09f 100644
--- a/tests/helpers/generate-mockdata.ts
+++ b/tests/helpers/generate-mockdata.ts
@@ -1,6 +1,7 @@
/* eslint-disable no-await-in-loop */
import fs from "fs";
import path from "path";
+import { performance } from "perf_hooks";
import { fileURLToPath } from "url";
import { faker } from "@faker-js/faker";
@@ -29,9 +30,17 @@ function randomId(len: number): number {
return faker.number.int({ min: 1, max: len - 1 });
}
+function randomUserId(): number {
+ return randomId(N_USERS) + 1;
+}
+
+/** Reset database and create extensive test data for development and E2E tests */
export default async () => {
+ const startTime = performance.now();
+
// Reset database
await prisma.$transaction([
+ prisma.savedFilter.deleteMany(),
prisma.entryExecution.deleteMany(),
prisma.entryVersion.deleteMany(),
prisma.entry.deleteMany(),
@@ -58,9 +67,16 @@ export default async () => {
const entryMockdata: MockEntry[] = file
.trim()
.split("\n")
- .map((l) => JSON.parse(l));
+ .map((l) => JSON.parse(l) as MockEntry);
- for (let i = 1; i <= N_USERS; i++) {
+ await prisma.user.create({
+ data: {
+ id: 1,
+ name: "Tico Testboy",
+ email: "t.testboy@example.com",
+ },
+ });
+ for (let i = 2; i <= N_USERS + 1; i++) {
const firstName = faker.person.firstName();
const lastName = faker.person.lastName();
@@ -109,7 +125,7 @@ export default async () => {
await prisma.entryVersion.create({
data: {
entry_id: entry.id,
- author_id: randomId(N_USERS),
+ author_id: randomUserId(),
category_id: CATEGORY_IDS[e.category],
date: todo_date,
priority,
@@ -123,7 +139,7 @@ export default async () => {
await prisma.entryVersion.create({
data: {
entry_id: entry.id,
- author_id: randomId(N_USERS),
+ author_id: randomUserId(),
category_id: CATEGORY_IDS[e.category],
date: todo_date,
priority,
@@ -137,7 +153,7 @@ export default async () => {
await prisma.entryExecution.create({
data: {
entry_id: entry.id,
- author_id: randomId(N_USERS),
+ author_id: randomUserId(),
text: e.result,
created_at: faker.date.soon({ refDate: todo_date, days: 2 }),
},
@@ -146,7 +162,7 @@ export default async () => {
await prisma.$transaction([
prisma.$executeRawUnsafe(
- `alter sequence users_id_seq restart with ${N_USERS + 1}`,
+ `alter sequence users_id_seq restart with ${N_USERS + 2}`,
),
prisma.$executeRawUnsafe(
`alter sequence categories_id_seq restart with ${CATEGORIES.length + 1}`,
@@ -162,4 +178,6 @@ export default async () => {
),
]);
}
+ // eslint-disable-next-line no-console
+ console.log(`Generated mock data in ${performance.now() - startTime} ms`);
};
diff --git a/tests/helpers/reset-db.ts b/tests/helpers/reset-db.ts
index a7d12f8..54889b7 100644
--- a/tests/helpers/reset-db.ts
+++ b/tests/helpers/reset-db.ts
@@ -4,6 +4,7 @@ import {
CATEGORIES, ROOMS, STATIONS, USERS,
} from "./testdata";
+/** Reset database and create basic test data for integration tests */
export default async () => {
await prisma.$transaction([
prisma.savedFilter.deleteMany(),
diff --git a/tests/integration/query/category.ts b/tests/integration/query/category.ts
index 2e17793..b5fb658 100644
--- a/tests/integration/query/category.ts
+++ b/tests/integration/query/category.ts
@@ -26,7 +26,7 @@ test("get categories", async () => {
test("delete categories", async () => {
await deleteCategory(6);
- expect(getCategory(6)).rejects.toThrowError("No Category found");
+ await expect(getCategory(6)).rejects.toThrowError("No Category found");
});
test("hide category", async () => {
diff --git a/tests/integration/query/entry.ts b/tests/integration/query/entry.ts
index 78c87d4..9c2422d 100644
--- a/tests/integration/query/entry.ts
+++ b/tests/integration/query/entry.ts
@@ -149,7 +149,7 @@ test("create entry version (wrong old vid)", async () => {
});
const entry = await getEntry(eId);
- expect(async () => {
+ await expect(async () => {
await newEntryVersion(
1,
eId,
@@ -202,7 +202,7 @@ test("create entry execution (wrong old xid)", async () => {
});
const x1 = await newEntryExecution(1, eId, { text: "x1", done: true }, null);
- expect(async () => newEntryExecution(1, eId, { text: "x2", done: true }, x1 + 1)).rejects.toThrowError(new ErrorConflict("old execution id does not match"));
+ await expect(async () => newEntryExecution(1, eId, { text: "x2", done: true }, x1 + 1)).rejects.toThrowError(new ErrorConflict("old execution id does not match"));
});
test("get entries", async () => {
diff --git a/tests/integration/query/patient.ts b/tests/integration/query/patient.ts
index f039870..42fec28 100644
--- a/tests/integration/query/patient.ts
+++ b/tests/integration/query/patient.ts
@@ -49,7 +49,7 @@ test("update patient", async () => {
test("delete patient", async () => {
await deletePatient(1);
- expect(async () => getPatient(1)).rejects.toThrowError("No Patient found");
+ await expect(async () => getPatient(1)).rejects.toThrowError("No Patient found");
});
test("delete patient (restricted)", async () => {
@@ -64,7 +64,7 @@ test("delete patient (restricted)", async () => {
},
});
- expect(async () => deletePatient(pId)).rejects.toThrowError();
+ await expect(async () => deletePatient(pId)).rejects.toThrowError();
});
test("hide patient", async () => {
diff --git a/tests/integration/query/room.ts b/tests/integration/query/room.ts
index b730a3f..5dd7695 100644
--- a/tests/integration/query/room.ts
+++ b/tests/integration/query/room.ts
@@ -37,7 +37,7 @@ test("update room", async () => {
test("delete room", async () => {
await deleteRoom(ROOMS[3].id);
- expect(async () => getRoom(ROOMS[3].id)).rejects.toThrowError("No Room found");
+ await expect(async () => getRoom(ROOMS[3].id)).rejects.toThrowError("No Room found");
});
test("hide room", async () => {
diff --git a/tests/integration/query/savedFilter.ts b/tests/integration/query/savedFilter.ts
index c7c02cc..8c27a64 100644
--- a/tests/integration/query/savedFilter.ts
+++ b/tests/integration/query/savedFilter.ts
@@ -96,7 +96,7 @@ test("update filter", async () => {
});
test("update filter not found", async () => {
- expect(updateSavedFilter(1, "Hello World", 1)).rejects.toThrowError();
+ await expect(updateSavedFilter(1, "Hello World", 1)).rejects.toThrowError();
});
test("delete filter", async () => {
diff --git a/tests/integration/query/station.ts b/tests/integration/query/station.ts
index 65a8db9..b6b2270 100644
--- a/tests/integration/query/station.ts
+++ b/tests/integration/query/station.ts
@@ -25,7 +25,7 @@ test("update station", async () => {
test("delete station", async () => {
await deleteStation(S3.id);
- expect(async () => getStation(S3.id)).rejects.toThrowError("No Station found");
+ await expect(async () => getStation(S3.id)).rejects.toThrowError("No Station found");
});
test("hide station", async () => {
diff --git a/tests/integration/trpc/entry.ts b/tests/integration/trpc/entry.ts
index e609d21..c4bb8ab 100644
--- a/tests/integration/trpc/entry.ts
+++ b/tests/integration/trpc/entry.ts
@@ -16,7 +16,7 @@ test("create entry", async () => {
});
expect(eID).gt(0);
- const entry = await caller().entry.get(eID!);
+ const entry = await caller().entry.get(eID);
expect(entry.patient.id).toBe(1);
expect(entry.execution).toBeNull();
expect(entry.current_version.id).gt(0);
diff --git a/vite.config.js b/vite.config.ts
similarity index 56%
rename from vite.config.js
rename to vite.config.ts
index 6539b16..195765a 100644
--- a/vite.config.js
+++ b/vite.config.ts
@@ -2,12 +2,12 @@ import { exec } from "child_process";
import { promisify } from "util";
import { sveltekit } from "@sveltejs/kit/vite";
-import { createViteLicensePlugin } from "rollup-license-plugin";
+import { createViteLicensePlugin, type LicenseMeta } from "rollup-license-plugin";
import { defineConfig } from "vitest/config";
// Get current tag/commit and last commit date from git
const pexec = promisify(exec);
-let [version, lastmod] = (
+const [version, lastmod] = (
await Promise.allSettled([
pexec("git describe --tags || git rev-parse --short HEAD"),
pexec('git log -1 --format=%cd --date=format:"%Y-%m-%d %H:%M"'),
@@ -23,7 +23,8 @@ export default defineConfig({
createViteLicensePlugin({
additionalFiles: {
"oss-licenses.html": (packages) => {
- let res = `
+ let res = `
+
Visitenbuch - Lizenzen
@@ -31,13 +32,23 @@ export default defineConfig({
Open-Source-Lizenzen
JSON-formatted license list
`;
- for (const p of packages) {
- // @ts-expect-error repo not present in type definition
- let rp = p.repository;
- // @ts-expect-error author not present in type definition
- let aut = p.author;
- if (typeof aut === "object") {
- aut = aut.name;
+ const escapeHTML = (s: string | null) => s ? s.replaceAll("&", "&")
+ .replaceAll("<", "<")
+ .replaceAll(">", ">")
+ .replaceAll('"', """)
+ .replaceAll("'", "'") : "";
+
+ for (const _p of packages) {
+ type LicenseMetaExt = LicenseMeta & {
+ repository: string | null,
+ author: string | { name: string } | null
+ };
+ const p = _p as LicenseMetaExt;
+ const rp = p.repository;
+ let aut = null;
+ if (p.author) {
+ if (typeof p.author === "object" && p.author.name) aut = p.author.name;
+ else if (typeof p.author === "string") aut = p.author;
}
let repoUrl = null;
@@ -50,13 +61,13 @@ export default defineConfig({
}
res += `\n`;
- res += `
\n`;
+ res += `
\n`;
res += `
\n`;
- res += `| Version: | ${p.version} |
\n`;
- if (aut) res += `| Author: | ${aut} |
\n`;
- res += `| License: | ${p.license} |
\n`;
- if (repoUrl) res += `| Repository: | ${repoUrl} |
\n`;
- else if (rp) res += `| Repository: | ${rp} |
\n`;
+ res += `| Version: | ${escapeHTML(p.version)} |
\n`;
+ if (aut) res += `| Author: | ${escapeHTML(aut)} |
\n`;
+ res += `| License: | ${escapeHTML(p.license)} |
\n`;
+ if (repoUrl) res += `| Repository: | ${escapeHTML(repoUrl)} |
\n`;
+ else if (rp) res += `| Repository: | ${escapeHTML(rp)} |
\n`;
res += `
\n`;
res += "