Browse Source

fix docs, fix cookie

pull/1697/head
Bernd Storath 5 months ago
parent
commit
20972b12ea
  1. 13
      .github/workflows/deploy.yml
  2. 13
      src/server/utils/session.ts

13
.github/workflows/deploy.yml

@ -71,3 +71,16 @@ jobs:
cd docs cd docs
git fetch origin gh-pages --depth=1 git fetch origin gh-pages --depth=1
mike deploy --push --update-aliases ${{ github.ref_name }} latest 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

13
src/server/utils/session.ts

@ -7,12 +7,19 @@ export type WGSession = Partial<{
const name = 'wg-easy'; const name = 'wg-easy';
// TODO: don't set secure to false by default
export async function useWGSession(event: H3Event, rememberMe = false) { export async function useWGSession(event: H3Event, rememberMe = false) {
const sessionConfig = await Database.general.getSessionConfig(); const sessionConfig = await Database.general.getSessionConfig();
return useSession<WGSession>(event, { return useSession<WGSession>(event, {
password: sessionConfig.sessionPassword, password: sessionConfig.sessionPassword,
name, 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<WGSession>(event, { return getSession<WGSession>(event, {
password: sessionConfig.sessionPassword, password: sessionConfig.sessionPassword,
name, name,
cookie: {}, cookie: {
secure: false,
},
}); });
} }

Loading…
Cancel
Save