-
-
- Erledigt am {formatDate(data.entry.execution.created_at, true)} von
- :
-
-
-
+
+
+ Erledigt am {formatDate(data.entry.execution.created_at, true)} von
+ :
+
+
+
+
+
{/if}
+
+
diff --git a/src/routes/(app)/entry/[id]/+page.ts b/src/routes/(app)/entry/[id]/+page.ts
index af28d20..204d7cf 100644
--- a/src/routes/(app)/entry/[id]/+page.ts
+++ b/src/routes/(app)/entry/[id]/+page.ts
@@ -4,10 +4,8 @@ import { loadWrap } from "$lib/shared/util";
import type { PageLoad } from "./$types";
export const load: PageLoad = async (event) => {
- const entry = await loadWrap(async () => {
- const id = ZUrlEntityId.parse(event.params.id);
- return trpc(event).entry.get.query(id);
- });
+ const id = ZUrlEntityId.parse(event.params.id);
+ const entry = await loadWrap(async () => trpc(event).entry.get.query(id));
return { entry };
};
diff --git a/src/routes/(app)/entry/[id]/versions/+page.svelte b/src/routes/(app)/entry/[id]/versions/+page.svelte
deleted file mode 100644
index aa5833f..0000000
--- a/src/routes/(app)/entry/[id]/versions/+page.svelte
+++ /dev/null
@@ -1,71 +0,0 @@
-
-
-
- Eintrag #{entryId} - Versionen
-
-
-
-
-
- {#each data.versions as version}
-
-
- , {formatDate(version.created_at, true)}
-
- {#if version.category}
-
- {/if}
- {#if version.text.length > 0}
-
-
Text
-
- {#each version.text as change}
-
- {change.value}
-
- {/each}
-
-
- {/if}
- {#if version.date !== undefined}
-
-
Datum
-
{formatDate(version.date)}
-
- {/if}
- {#if version.priority !== undefined}
-
-
Priorität
-
{formatBool(version.priority)}
-
- {/if}
-
- {/each}
-
-
-
diff --git a/src/routes/(app)/entry/[id]/versions/+page.ts b/src/routes/(app)/entry/[id]/versions/+page.ts
deleted file mode 100644
index d7b5129..0000000
--- a/src/routes/(app)/entry/[id]/versions/+page.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-import { ZUrlEntityId } from "$lib/shared/model/validation";
-import { trpc } from "$lib/shared/trpc";
-import { loadWrap } from "$lib/shared/util";
-import type { PageLoad } from "./$types";
-
-export const load: PageLoad = async (event) => {
- const id = ZUrlEntityId.parse(event.params.id);
- const versions = await loadWrap(async () => trpc(event).entry.versionsDiff.query(id));
-
- return { versions };
-};
diff --git a/src/routes/(app)/logout/+page.server.ts b/src/routes/(app)/logout/+page.server.ts
index d26ef15..43e8f07 100644
--- a/src/routes/(app)/logout/+page.server.ts
+++ b/src/routes/(app)/logout/+page.server.ts
@@ -6,6 +6,6 @@ export const actions: Actions = {
default: async (event) => {
const callbackUrl = baseUrl(event.url) + "/login?noAuto=1";
- return makeAuthjsRequest(event, "signout", { callbackUrl });
+ return makeAuthjsRequest(event, "/auth/signout", { callbackUrl });
},
};
diff --git a/src/routes/+layout.server.ts b/src/routes/+layout.server.ts
index ade60e6..8812099 100644
--- a/src/routes/+layout.server.ts
+++ b/src/routes/+layout.server.ts
@@ -2,6 +2,6 @@ import type { LayoutServerLoad } from "./$types";
export const load: LayoutServerLoad = async (event) => {
return {
- session: event.locals.session,
+ session: await event.locals.getSession(),
};
};
diff --git a/src/routes/login/+page.server.ts b/src/routes/login/+page.server.ts
index 9299c86..fda0244 100644
--- a/src/routes/login/+page.server.ts
+++ b/src/routes/login/+page.server.ts
@@ -1,40 +1,11 @@
-import type { Actions, RequestEvent } from "./$types";
+import type { Actions } from "./$types";
import { makeAuthjsRequest } from "$lib/server/auth";
import { baseUrl } from "$lib/shared/util";
-import type { PageServerLoad } from "./$types";
-
-/**
- * This cookie stores the timestamp of the last automatic login.
- * It is used to prevent infinite redirect loops in case the authentication fails.
- */
-const COOKIE_NAME = "autoLoginTs";
-
-async function doLogin(event: RequestEvent) {
- const callbackUrl = event.url.searchParams.get("returnURL") ?? baseUrl(event.url);
-
- return makeAuthjsRequest(event, "signin/keycloak", { callbackUrl });
-}
-
-// Try to login the user using OIDC
-export const load: PageServerLoad = async (event) => {
- // the noAuto URL parameter disables auto-login
- if (event.url.searchParams.get("noAuto")) return;
-
- let autoLoginTs = null;
- const autoLoginTsStr = event.cookies.get(COOKIE_NAME);
- if (autoLoginTsStr) {
- autoLoginTs = parseInt(autoLoginTsStr);
- }
-
- const now = Date.now();
- if (!autoLoginTs || autoLoginTs + 15000 < now) {
- event.cookies.set(COOKIE_NAME, now.toString(), { path: "/login" });
- return doLogin(event);
- }
-};
export const actions: Actions = {
default: async (event) => {
- return doLogin(event);
+ const callbackUrl = event.url.searchParams.get("returnURL") ?? baseUrl(event.url);
+
+ return makeAuthjsRequest(event, "/auth/signin/keycloak", { callbackUrl });
},
};
diff --git a/src/routes/login/+page.svelte b/src/routes/login/+page.svelte
index 0d37816..f8341cf 100644
--- a/src/routes/login/+page.svelte
+++ b/src/routes/login/+page.svelte
@@ -1,5 +1,37 @@