fix: API session key to session string

kapobajza · Sep 10, 2024 · 8d5a557 · 8d5a557
1 parent 173d367
commit 8d5a557
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 9 deletions.
diff --git a/apps/api/package.json b/apps/api/package.json
@@ -6,7 +6,7 @@
   "scripts": {
     "dev": "tsx watch ./src/start.ts",
     "start": "tsx ./src/start.ts",
-    "start:prod": "tsx build.ts && node ./dist/start.js",
+    "start:prod": "tsx build.ts && cp session_key_prod dist/session_key && node ./dist/start.js",
     "migrate": "node-pg-migrate",
     "tsc": "tsc",
     "test": "vitest",

diff --git a/apps/api/src/app.ts b/apps/api/src/app.ts
@@ -1,5 +1,4 @@
 import path from "path";
-import fs from "fs";
 
 import {
   serializerCompiler as zodSerializerCompiler,
@@ -13,7 +12,6 @@ import { type FastifyInstance } from "fastify";
 import type { Pool } from "pg";
 import { ZodError } from "zod";
 import FastifyAuth from "@fastify/auth";
-import { getRelativeMonoRepoPath } from "@zdnevnik/scripting";
 
 import type { AppEnv } from "./types";
 
@@ -71,9 +69,7 @@ export async function buildApp(
   }
 
   await fastify.register(SecureSession, {
-    key: fs.readFileSync(
-      path.join(getRelativeMonoRepoPath("api"), "session_key"),
-    ),
+    key: Buffer.from(opts.env.SESSION_SECRET, "hex"),
     cookieName: opts.env.SESSION_COOKIE_NAME,
     cookie: {
       httpOnly: true,

diff --git a/apps/api/src/env/util.ts b/apps/api/src/env/util.ts
@@ -10,6 +10,7 @@ export const envSchema = {
     "SESSION_COOKIE_NAME",
     "SESSION_COOKIE_DOMAIN",
     "SESSION_COOKIE_MAX_AGE",
+    "SESSION_SECRET",
   ],
   properties: {
     DATABASE_URL: {
@@ -27,7 +28,7 @@ export const envSchema = {
     PORT: {
       type: "integer",
     },
-    SESSION_KEY_FILE: {
+    SESSION_SECRET: {
       type: "string",
     },
   },

diff --git a/package.json b/package.json
@@ -21,7 +21,8 @@
     "sv:dev": "pnpm --filter sveltastic vite",
     "sv:dev:translations": "pnpm --filter sveltastic dev:translations",
     "sv:test": "pnpm --filter sveltastic test",
-    "sv:test:ui": "pnpm --filter sveltastic test:ui"
+    "sv:test:ui": "pnpm --filter sveltastic test:ui",
+    "update_env": "ZDNEVNIK_SSH_CONNECTION=$ZDNEVNIK_SSH_CONNECTION ZDNEVNIK_DESTINATION_DIR=$ZDNEVNIK_DESTINATION_DIR node ./scripts/update_env.js"
   },
   "keywords": [],
   "author": "",

diff --git a/scripts/update_env.js b/scripts/update_env.js
@@ -70,7 +70,7 @@ function main() {
     const { stderr } = spawnSync("scp", [`${from}`, `${to}`]);
 
     if (stderr.length > 0) {
-      console.error(stderr);
+      console.error(stderr.toString("utf8").trim());
     } else {
       console.log("Done!");
     }