From 778b06a411466997812e735d3bc89bcdf12ffde1 Mon Sep 17 00:00:00 2001
From: Elias Bouassaba <ebouassaba@gmail.com>
Date: Sat, 15 Jun 2024 02:04:21 +0200
Subject: [PATCH] fix(webdav): update client models

---
 ui/src/client/api/snapshot.ts         | 6 ------
 webdav/src/client/api.ts              | 8 ++------
 webdav/src/handler/handle-head.ts     | 2 +-
 webdav/src/handler/handle-propfind.ts | 8 ++++----
 webdav/src/infra/error.ts             | 1 +
 5 files changed, 8 insertions(+), 17 deletions(-)

diff --git a/ui/src/client/api/snapshot.ts b/ui/src/client/api/snapshot.ts
index 6cb8989ae..bef8357a3 100644
--- a/ui/src/client/api/snapshot.ts
+++ b/ui/src/client/api/snapshot.ts
@@ -72,12 +72,6 @@ export type ImageProps = {
   height: number
 }
 
-export type Thumbnail = {
-  base64: string
-  width: number
-  height: number
-}
-
 export type ListQueryParams = {
   file_id: string
   page?: string
diff --git a/webdav/src/client/api.ts b/webdav/src/client/api.ts
index 3fa45e06c..2822ae1a7 100644
--- a/webdav/src/client/api.ts
+++ b/webdav/src/client/api.ts
@@ -28,13 +28,9 @@ export type File = {
   name: string
   type: FileType
   parentId: string
-  version: number
-  original?: Download
-  preview?: Download
-  thumbnail?: Thumbnail
-  snapshots: Snapshot[]
   permission: PermissionType
   isShared: boolean
+  snapshot?: Snapshot
   createTime: string
   updateTime?: string
 }
@@ -258,7 +254,7 @@ export class FileAPI {
     return new Promise<void>((resolve, reject) => {
       const ws = createWriteStream(outputPath)
       const request = get(
-        `${API_URL}/v2/files/${file.id}/original${file.original.extension}?access_token=${this.token.access_token}`,
+        `${API_URL}/v2/files/${file.id}/original${file.snapshot.original.extension}?access_token=${this.token.access_token}`,
         (response) => {
           response.pipe(ws)
           ws.on('finish', () => {
diff --git a/webdav/src/handler/handle-head.ts b/webdav/src/handler/handle-head.ts
index d79ebca8d..f4a7f199e 100644
--- a/webdav/src/handler/handle-head.ts
+++ b/webdav/src/handler/handle-head.ts
@@ -23,7 +23,7 @@ async function handleHead(
     const file = await new FileAPI(token).getByPath(decodeURIComponent(req.url))
     if (file.type === FileType.File) {
       res.statusCode = 200
-      res.setHeader('Content-Length', file.original.size)
+      res.setHeader('Content-Length', file.snapshot.original.size)
       res.end()
     } else {
       res.statusCode = 200
diff --git a/webdav/src/handler/handle-propfind.ts b/webdav/src/handler/handle-propfind.ts
index b5e6e8b55..d1e1222f0 100644
--- a/webdav/src/handler/handle-propfind.ts
+++ b/webdav/src/handler/handle-propfind.ts
@@ -32,8 +32,8 @@ async function handlePropfind(
               <D:prop>
                 <D:resourcetype></D:resourcetype>
                 ${
-                  file.original
-                    ? `<D:getcontentlength>${file.original.size}</D:getcontentlength>`
+                  file.snapshot.original
+                    ? `<D:getcontentlength>${file.snapshot.original.size}</D:getcontentlength>`
                     : ''
                 }
                 <D:creationdate>${new Date(
@@ -81,8 +81,8 @@ async function handlePropfind(
                         item.type === FileType.Folder ? '<D:collection/>' : ''
                       }</D:resourcetype>
                       ${
-                        item.type === FileType.File && item.original
-                          ? `<D:getcontentlength>${item.original.size}</D:getcontentlength>`
+                        item.type === FileType.File && item.snapshot.original
+                          ? `<D:getcontentlength>${item.snapshot.original.size}</D:getcontentlength>`
                           : ''
                       }
                       <D:getlastmodified>${new Date(
diff --git a/webdav/src/infra/error.ts b/webdav/src/infra/error.ts
index 274b9f945..2aedb0980 100644
--- a/webdav/src/infra/error.ts
+++ b/webdav/src/infra/error.ts
@@ -16,4 +16,5 @@ export function handleError(err: any, res: ServerResponse) {
     res.statusCode = 500
     res.end()
   }
+  console.error(err)
 }