자잘한 리팩토링 2 및 TopBar가 상단에 고정되지 않던 버그 수정

This commit is contained in:
static
2025-01-09 04:52:52 +09:00
parent 8873337ede
commit c25d42d515
8 changed files with 70 additions and 72 deletions

View File

@@ -1,11 +1,5 @@
import { callPostApi } from "$lib/hooks";
import {
encodeToBase64,
generateDataKey,
wrapDataKey,
encryptData,
encryptString,
} from "$lib/modules/crypto";
import { generateDataKey, wrapDataKey, encryptData, encryptString } from "$lib/modules/crypto";
import type {
DirectoryRenameRequest,
DirectoryCreateRequest,
@@ -28,42 +22,46 @@ export const requestDirectoryCreation = async (
masterKey: MasterKey,
) => {
const { dataKey, dataKeyVersion } = await generateDataKey();
const nameEncrypted = await encryptData(new TextEncoder().encode(name), dataKey);
const nameEncrypted = await encryptString(name, dataKey);
await callPostApi<DirectoryCreateRequest>("/api/directory/create", {
parentId,
mekVersion: masterKey.version,
dek: await wrapDataKey(dataKey, masterKey.key),
dekVersion: dataKeyVersion.toISOString(),
name: encodeToBase64(nameEncrypted.ciphertext),
name: nameEncrypted.ciphertext,
nameIv: nameEncrypted.iv,
});
};
export const requestFileUpload = (file: File, parentId: "root" | number, masterKey: MasterKey) => {
return new Promise<void>(async (resolve, reject) => {
const { dataKey, dataKeyVersion } = await generateDataKey();
const fileEncrypted = await encryptData(await file.arrayBuffer(), dataKey);
const nameEncrypted = await encryptString(file.name, dataKey);
export const requestFileUpload = async (
file: File,
parentId: "root" | number,
masterKey: MasterKey,
) => {
const { dataKey, dataKeyVersion } = await generateDataKey();
const fileEncrypted = await encryptData(await file.arrayBuffer(), dataKey);
const nameEncrypted = await encryptString(file.name, dataKey);
const form = new FormData();
form.set(
"metadata",
JSON.stringify({
parentId,
mekVersion: masterKey.version,
dek: await wrapDataKey(dataKey, masterKey.key),
dekVersion: dataKeyVersion.toISOString(),
contentType: file.type,
contentIv: fileEncrypted.iv,
name: nameEncrypted.ciphertext,
nameIv: nameEncrypted.iv,
} satisfies FileUploadRequest),
);
form.set("content", new Blob([fileEncrypted.ciphertext]));
const form = new FormData();
form.set(
"metadata",
JSON.stringify({
parentId,
mekVersion: masterKey.version,
dek: await wrapDataKey(dataKey, masterKey.key),
dekVersion: dataKeyVersion.toISOString(),
contentType: file.type,
contentIv: fileEncrypted.iv,
name: nameEncrypted.ciphertext,
nameIv: nameEncrypted.iv,
} satisfies FileUploadRequest),
);
form.set("content", new Blob([fileEncrypted.ciphertext]));
return new Promise<void>((resolve, reject) => {
// TODO: Progress, Scheduling, ...
const xhr = new XMLHttpRequest();
const xhr = new XMLHttpRequest();
xhr.addEventListener("load", () => {
if (xhr.status === 200) {
resolve();