From 20972b12eab7db89f9f82119d8ba91e12ff328f9 Mon Sep 17 00:00:00 2001 From: Bernd Storath <999999bst@gmail.com> Date: Wed, 5 Mar 2025 08:32:35 +0100 Subject: [PATCH] fix docs, fix cookie --- .github/workflows/deploy.yml | 13 +++++++++++++ src/server/utils/session.ts | 13 +++++++++++-- 2 files changed, 24 insertions(+), 2 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 82d23344..1189d2e8 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -71,3 +71,16 @@ jobs: cd docs git fetch origin gh-pages --depth=1 mike deploy --push --update-aliases ${{ github.ref_name }} latest + + # Extract version numbers (remove 'v' prefix) + DOCS_VERSION=${GITHUB_REF#refs/tags/} # e.g. v1.2.3 or v1.2.3-beta + MINOR_VERSION=$(echo $DOCS_VERSION | cut -d. -f1,2) # e.g. v1.2 + + # Check if it's a stable release (only numbers, no '-') + if [[ "$DOCS_VERSION" =~ ^v[0-9]+\.[0-9]+\.[0-9]+$ ]]; then + echo "Stable release detected: $DOCS_VERSION" + mike deploy --push --update-aliases $MINOR_VERSION latest + else + echo "Prerelease detected: $DOCS_VERSION" + mike deploy --push --update-aliases Pre-release + fi diff --git a/src/server/utils/session.ts b/src/server/utils/session.ts index f1b1d128..8931ccf7 100644 --- a/src/server/utils/session.ts +++ b/src/server/utils/session.ts @@ -7,12 +7,19 @@ export type WGSession = Partial<{ const name = 'wg-easy'; +// TODO: don't set secure to false by default + export async function useWGSession(event: H3Event, rememberMe = false) { const sessionConfig = await Database.general.getSessionConfig(); return useSession(event, { password: sessionConfig.sessionPassword, name, - cookie: { maxAge: rememberMe ? sessionConfig.sessionTimeout : undefined }, + // TODO: add session expiration + // maxAge: undefined + cookie: { + maxAge: rememberMe ? sessionConfig.sessionTimeout : undefined, + secure: false, + }, }); } @@ -21,7 +28,9 @@ export async function getWGSession(event: H3Event) { return getSession(event, { password: sessionConfig.sessionPassword, name, - cookie: {}, + cookie: { + secure: false, + }, }); }