Slight crypto cleanup

Author: zefhemel

server/crypto.ts

@@ -1,7 +1,8 @@
 import { create, getNumericDate, verify } from "djwt";
 import type { KvPrimitives } from "$lib/data/kv_primitives.ts";
+import type { KvKey } from "@silverbulletmd/silverbullet/types";
 
-const jwtSecretKey = "jwtSecretKey";
+const jwtSecretKey: KvKey = ["jwtSecretKey"];
 
 export class JWTIssuer {
   private key!: CryptoKey;
@@ -11,7 +12,7 @@ export class JWTIssuer {
 
   // authString is only used to compare hashes to see if the auth has changed
   async init(authString: string) {
-    const [secret] = await this.kv.batchGet([[jwtSecretKey]]);
+    const [secret] = await this.kv.batchGet([jwtSecretKey]);
     if (!secret) {
       console.log("Generating new JWT secret key");
       return this.generateNewKey();
@@ -53,7 +54,7 @@ export class JWTIssuer {
       ["sign", "verify"],
     );
     await this.kv.batchSet([{
-      key: [jwtSecretKey],
+      key: jwtSecretKey,
       value: await crypto.subtle.exportKey("jwk", this.key),
     }]);
   }

server/http_server.ts

@@ -145,7 +145,6 @@ export class HttpServer {
     this.spaceServer = new SpaceServer(
       this.options,
       this.plugAssetBundle,
-      this.baseKvPrimitives,
     );
     await this.spaceServer.init();
 

server/space_server.ts

@@ -3,7 +3,6 @@ import { FilteredSpacePrimitives } from "../lib/spaces/filtered_space_primitives
 import { ReadOnlySpacePrimitives } from "../lib/spaces/ro_space_primitives.ts";
 import type { SpacePrimitives } from "../lib/spaces/space_primitives.ts";
 import type { AssetBundle } from "../lib/asset_bundle/bundle.ts";
-import type { KvPrimitives } from "$lib/data/kv_primitives.ts";
 import { JWTIssuer } from "./crypto.ts";
 import { compile as gitIgnoreCompiler } from "gitignore-parser";
 import { determineShellBackend, NotSupportedShell } from "./shell_backend.ts";
@@ -32,7 +31,6 @@ export class SpaceServer {
   constructor(
     options: ServerOptions,
     private plugAssetBundle: AssetBundle,
-    private kvPrimitives: KvPrimitives,
   ) {
     this.pagesPath = options.pagesPath;
     this.hostname = options.hostname;
@@ -42,7 +40,7 @@ export class SpaceServer {
     this.enableSpaceScript = options.enableSpaceScript;
     this.spaceIgnore = options.spaceIgnore;
 
-    this.jwtIssuer = new JWTIssuer(kvPrimitives);
+    this.jwtIssuer = new JWTIssuer(options.baseKvPrimitives);
 
     this.shellBackend = options.readOnly
       ? new NotSupportedShell() // No shell for read only mode