diff --git a/apps/server/src/index.ts b/apps/server/src/index.ts index 193c3da..821d556 100644 --- a/apps/server/src/index.ts +++ b/apps/server/src/index.ts @@ -1,3 +1,5 @@ +import "./loadEnv.ts"; + import { createServer } from "node:http"; import express from "express"; diff --git a/apps/server/src/loadEnv.ts b/apps/server/src/loadEnv.ts new file mode 100644 index 0000000..01a5120 --- /dev/null +++ b/apps/server/src/loadEnv.ts @@ -0,0 +1,13 @@ +import path from "node:path"; +import { fileURLToPath } from "node:url"; + +const ROOT = path.resolve( + path.dirname(fileURLToPath(import.meta.url)), + "../../..", +); + +try { + process.loadEnvFile(path.join(ROOT, ".env")); +} catch { + // No .env file present — fine, values may come from the real environment. +} diff --git a/scripts/oktassoAuth.ts b/scripts/oktassoAuth.ts index 4112ee7..a6a1d78 100644 --- a/scripts/oktassoAuth.ts +++ b/scripts/oktassoAuth.ts @@ -47,6 +47,7 @@ const DEFAULT_REFRESH_AFTER_MS = Number(env("OKTASSO_REFRESH_AFTER_MS")); const CACHE_DIR = path.join(os.homedir(), ".cache", "tangle-deploy"); const CACHE_FILE = path.join(CACHE_DIR, "oktasso_token.json"); +const OKTASSO_TOKEN_NAME = env("AUTH_JWT_TOKEN_COOKIE_NAME"); export interface OktassoHeaders { cookie: string; @@ -143,7 +144,7 @@ async function runAuthFlow( ); const expiry = new Date(Date.now() + 24 * 60 * 60 * 1000); return { - cookie: `OKTASSO_TOKEN=${oktassoToken}`, + cookie: `${OKTASSO_TOKEN_NAME}=${oktassoToken}`, expiry: formatExpiry(expiry), }; }