Merge branch 'dev' into add-file-category

src/lib/server/db/file.ts

@@ -27,6 +27,7 @@ export interface NewFileParams {
   contentHmac: string | null;
   contentType: string;
   encContentIv: string;
+  encContentHash: string;
   encName: string;
   encNameIv: string;
   encCreatedAt: string | null;
@@ -130,14 +131,15 @@ export const unregisterDirectory = async (userId: number, directoryId: number) =
   return await db.transaction(
     async (tx) => {
       const unregisterFiles = async (parentId: number) => {
-        const files = await tx
+        return await tx
           .delete(file)
           .where(and(eq(file.userId, userId), eq(file.parentId, parentId)))
-          .returning({ path: file.path });
-        return files.map(({ path }) => path);
+          .returning({ id: file.id, path: file.path });
       };
-      const unregisterDirectoryRecursively = async (directoryId: number): Promise<string[]> => {
-        const filePaths = await unregisterFiles(directoryId);
+      const unregisterDirectoryRecursively = async (
+        directoryId: number,
+      ): Promise<{ id: number; path: string }[]> => {
+        const files = await unregisterFiles(directoryId);
         const subDirectories = await tx
           .select({ id: directory.id })
           .from(directory)
@@ -150,7 +152,7 @@ export const unregisterDirectory = async (userId: number, directoryId: number) =
         if (deleteRes.changes === 0) {
           throw new IntegrityError("Directory not found");
         }
-        return filePaths.concat(...subDirectoryFilePaths);
+        return files.concat(...subDirectoryFilePaths);
       };
       return await unregisterDirectoryRecursively(directoryId);
     },
@@ -198,11 +200,12 @@ export const registerFile = async (params: NewFileParams) => {
           userId: params.userId,
           mekVersion: params.mekVersion,
           hskVersion: params.hskVersion,
-          contentHmac: params.contentHmac,
-          contentType: params.contentType,
           encDek: params.encDek,
           dekVersion: params.dekVersion,
+          contentHmac: params.contentHmac,
+          contentType: params.contentType,
           encContentIv: params.encContentIv,
+          encContentHash: params.encContentHash,
           encName: { ciphertext: params.encName, iv: params.encNameIv },
           encCreatedAt:
             params.encCreatedAt && params.encCreatedAtIv

src/lib/server/db/schema/file.ts

@@ -61,6 +61,7 @@ export const file = sqliteTable(
     contentHmac: text("content_hmac"), // Base64
     contentType: text("content_type").notNull(),
     encContentIv: text("encrypted_content_iv").notNull(), // Base64
+    encContentHash: text("encrypted_content_hash").notNull(), // Base64
     encName: ciphertext("encrypted_name").notNull(),
     encCreatedAt: ciphertext("encrypted_created_at"),
     encLastModifiedAt: ciphertext("encrypted_last_modified_at").notNull(),

src/lib/server/db/schema/hsk.ts

@@ -1,4 +1,5 @@
 import { sqliteTable, text, integer, primaryKey, foreignKey } from "drizzle-orm/sqlite-core";
+import { client } from "./client";
 import { mek } from "./mek";
 import { user } from "./user";
 
@@ -32,7 +33,7 @@ export const hskLog = sqliteTable(
     hskVersion: integer("hmac_secret_key_version").notNull(),
     timestamp: integer("timestamp", { mode: "timestamp_ms" }).notNull(),
     action: text("action", { enum: ["create"] }).notNull(),
-    actionBy: integer("action_by").references(() => user.id),
+    actionBy: integer("action_by").references(() => client.id),
   },
   (t) => ({
     ref: foreignKey({