diff --git a/src/routes/(app)/+page.svelte b/src/routes/(app)/+page.svelte
index 1c155e1..e840d93 100644
--- a/src/routes/(app)/+page.svelte
+++ b/src/routes/(app)/+page.svelte
@@ -4,11 +4,9 @@
import { defaultFilterUrl } from "$lib/shared/util";
- import { getSavedFilters } from "$lib/stores";
+ import { savedFilters } from "$lib/stores";
export let data: PageData;
-
- const savedFilters = getSavedFilters();
diff --git a/src/routes/(app)/entry/[id]/+page.server.ts b/src/routes/(app)/entry/[id]/+page.server.ts
index 3f7e31c..49aa997 100644
--- a/src/routes/(app)/entry/[id]/+page.server.ts
+++ b/src/routes/(app)/entry/[id]/+page.server.ts
@@ -5,7 +5,7 @@ import { superValidate, message } from "sveltekit-superforms";
import { ZUrlEntityId } from "$lib/shared/model/validation";
import { trpc } from "$lib/shared/trpc";
-import { humanDate, loadWrap, moveEntryTodoDate } from "$lib/shared/util";
+import { loadWrap, moveEntryTodoDate } from "$lib/shared/util";
import { SchemaNewExecution } from "./schema";
@@ -22,21 +22,18 @@ export const actions: Actions = {
const done = todoDays === null;
const nTodoDays = todoDays ? parseInt(todoDays.toString()) : 0;
- if (form.data.text.length > 0) {
+ await loadWrap(async () => {
await trpc(event).entry.newExecution.mutate({
id,
old_execution_id: form.data.old_execution_id,
execution: { text: form.data.text, done: todoDays === null },
});
- }
- const newTodoDate = await moveEntryTodoDate(id, nTodoDays, event);
+ await moveEntryTodoDate(id, nTodoDays, event);
+ });
- if (newTodoDate) {
- return message(form, `Eintrag auf ${humanDate(newTodoDate)} verschoben`);
+ if (nTodoDays > 0) {
+ return message(form, `Eintrag um ${nTodoDays} Tage in die Zukunft verschoben`);
}
- if (form.data.text.length > 0) {
- return message(form, done ? "Eintrag erledigt" : "Eintrag mit Notiz versehen");
- }
- return { form };
+ return message(form, done ? "Eintrag erledigt" : "Eintrag mit Notiz versehen");
}),
};
diff --git a/src/routes/(app)/entry/[id]/+page.svelte b/src/routes/(app)/entry/[id]/+page.svelte
index 3616ca3..f93e323 100644
--- a/src/routes/(app)/entry/[id]/+page.svelte
+++ b/src/routes/(app)/entry/[id]/+page.svelte
@@ -1,4 +1,5 @@
+
+
+
+
+
diff --git a/tests/e2e/_test.ts b/tests/e2e/_test.ts
deleted file mode 100644
index d0ed5a2..0000000
--- a/tests/e2e/_test.ts
+++ /dev/null
@@ -1,90 +0,0 @@
-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
index 9d51f53..3150585 100644
--- a/tests/e2e/login.test.ts
+++ b/tests/e2e/login.test.ts
@@ -1,27 +1,39 @@
-import {
- test, expect, isLoggedIn, OIDC_BASE_URL,
-} from "./_test";
+import { test, expect } from "@playwright/test";
-test("login", async ({ login: page, account }) => {
+import {
+ isLoggedIn, loginIfNecessary, loginWithToken, USERNAME, OIDC_BASE_URL,
+} from "$tests/helpers/login";
+
+test.describe.configure({ mode: "serial" }); // Parallel account creation may cause issues
+
+test("login", async ({ page }) => {
await page.goto("/");
+ await loginIfNecessary(page);
await expect(page).toHaveTitle("Visitenbuch");
- await expect(page.locator("h1.heading")).toHaveText("Hallo, " + account.name);
+ await expect(page.locator("h1.heading")).toHaveText("Hallo, Lucy Login");
// Test cases may create more entries
expect(parseInt(await page.getByTestId("n-entries-todo").innerText()))
.toBeGreaterThanOrEqual(193);
});
-test("logout", async ({ login: page, baseURL }) => {
+test("loginWithToken", async ({ page }) => {
+ await loginWithToken(page);
await page.goto("/");
+ await expect(page).toHaveTitle("Visitenbuch");
+ await expect(page.locator("h1.heading")).toHaveText("Hallo, " + USERNAME);
+ // Test cases may create more entries
+ expect(parseInt(await page.getByTestId("n-entries-todo").innerText()))
+ .toBeGreaterThanOrEqual(193);
+});
+
+test("logout", async ({ page, baseURL }) => {
+ await page.goto("/");
+ await loginIfNecessary(page);
+
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.locator('button[value="yes"]').click();
await page.waitForURL("/login?noAuto=1");
await expect(page.getByTestId("btn-login")).toBeVisible();
expect(await isLoggedIn(page)).toBe(false);
diff --git a/tests/e2e/plan.test.ts b/tests/e2e/plan.test.ts
index 62aa555..3c6fcff 100644
--- a/tests/e2e/plan.test.ts
+++ b/tests/e2e/plan.test.ts
@@ -1,6 +1,9 @@
-import { test, expect } from "./_test";
+import { test, expect } from "@playwright/test";
-test("filter", async ({ login: page }) => {
+import { loginWithToken } from "$tests/helpers/login";
+
+test("filter", async ({ page }) => {
+ await loginWithToken(page);
await page.goto("/plan");
await expect(page).toHaveTitle("Planung");
diff --git a/tests/helpers/login.ts b/tests/helpers/login.ts
new file mode 100644
index 0000000..3521ee9
--- /dev/null
+++ b/tests/helpers/login.ts
@@ -0,0 +1,58 @@
+import { encode } from "@auth/core/jwt";
+import { expect, type Page } from "@playwright/test";
+
+import { prisma } from "$lib/server/prisma";
+
+const AUTH_COOKIE = "authjs.session-token";
+
+export const OIDC_BASE_URL = "http://localhost:9090/interaction/";
+export const USERNAME = "Tico Testboy";
+export const USER_EMAIL = "t.testboy@example.org";
+
+export async function loginIfNecessary(page: Page) {
+ if (page.url().startsWith(OIDC_BASE_URL)) {
+ await page.locator('input[name="login"]').fill("Lucy Login");
+ 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);
+ }
+}
+
+export async function isLoggedIn(page: Page): Promise {
+ const cookies = await page.context().cookies();
+ return cookies.findIndex((c) => c.name === AUTH_COOKIE) !== -1;
+}
+
+/**
+ * Create a session token (Cookie: authjs.session-token) to use for E2E tests
+ * so we dont have to step through the login system every time
+ */
+export async function newSessionToken(user_id: number): Promise {
+ const user = await prisma.user.findUniqueOrThrow({
+ select: { email: true, name: true },
+ where: { id: user_id },
+ });
+ 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(),
+ },
+ });
+}
+
+export async function loginWithToken(page: Page, user_id = 1) {
+ const token = await newSessionToken(user_id);
+ await page.context().addCookies([{
+ name: AUTH_COOKIE,
+ value: token,
+ domain: "localhost",
+ path: "/",
+ httpOnly: true,
+ sameSite: "Lax",
+ }]);
+}
diff --git a/vite.config.ts b/vite.config.ts
index 195765a..9d34322 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -23,8 +23,7 @@ export default defineConfig({
createViteLicensePlugin({
additionalFiles: {
"oss-licenses.html": (packages) => {
- let res = `
-
+ let res = `
Visitenbuch - Lizenzen
@@ -32,12 +31,6 @@ export default defineConfig({
Open-Source-Lizenzen
JSON-formatted license list
`;
- const escapeHTML = (s: string | null) => s ? s.replaceAll("&", "&")
- .replaceAll("<", "<")
- .replaceAll(">", ">")
- .replaceAll('"', """)
- .replaceAll("'", "'") : "";
-
for (const _p of packages) {
type LicenseMetaExt = LicenseMeta & {
repository: string | null,
@@ -61,13 +54,13 @@ export default defineConfig({
}
res += `\n`;
- res += `
\n`;
+ res += `
\n`;
res += `
\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 += `| 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 += `
\n`;
res += "