@social-mail/social-mail-client 1.8.324 → 1.8.325

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@social-mail/social-mail-client",
-  "version": "1.8.324",
+  "version": "1.8.325",
   "description": "",
   "main": "index.js",
   "scripts": {

package/src/common/FileUploader.ts

@@ -20,7 +20,6 @@ export interface IUploadRequest {
 export interface IUploadRequestParams {
     file: File,
     url: string,
-    sha256?: string,
     extra?: any,
     folder?: string,
     cancelToken?: CancelToken,
@@ -64,9 +63,6 @@ export default class FileUploader {
 
     private async tryUpload3(req: IUploadRequestParams) {
         let lastError;
-        if(!req.sha256) {
-            req.sha256 = await this.sha256(req.file);
-        }
         for (let index = 0; index < 3; index++) {
             try {
                 return await this.tryUpload(req);
@@ -77,12 +73,11 @@ export default class FileUploader {
         throw lastError;
     }
 
-    private tryUpload({ file, url, sha256, extra, folder, cancelToken, progress }: IUploadRequestParams) {
+    private tryUpload({ file, url, extra, folder, cancelToken, progress }: IUploadRequestParams) {
         return new Promise<IUploadResult>((resolve, reject) => {
 
             const body = new FormData();
             body.append(file.name, file, file.name);
-            body.append("sha256", sha256);
             const xhr = new XMLHttpRequest();
                 const onError = () => {
                 reject(new Error(xhr.responseText || "Error"));

package/src/services/files/LocalFileService.tsx

@@ -77,7 +77,7 @@ export default class LocalFileService extends TaskManager {
         return detail.files;
     }
 
-    async sha256(blob: Blob) {
+    async getSha256(blob: Blob) {
         const msgBuffer = await blob.arrayBuffer();
         const hashBuffer = await crypto.subtle.digest('SHA-256', msgBuffer);
 
@@ -88,7 +88,7 @@ export default class LocalFileService extends TaskManager {
         return hashHex;
     }
 
-    async uploadFileParts(file: File, extra, cancelToken?: CancelToken, progress?: (n) => void): Promise<IUploadedFile> {
+    async uploadFileParts(file: File, extra, sha256, cancelToken?: CancelToken, progress?: (n) => void): Promise<IUploadedFile> {
 
         let size = file.size;
         const parts = [] as IUploadRequest[];
@@ -119,6 +119,7 @@ export default class LocalFileService extends TaskManager {
         const { parentID, appFileID, folder } = extra;
         const appFile = await FetchBuilder.post(apiPath("/api/upload"))
             .form("name", name)
+            .form("sha256", sha256)
             .form("tempKeys", JSON.stringify(tempKeys))
             .form("contentType", file.type)
             .query("parentID", parentID)
@@ -152,9 +153,7 @@ export default class LocalFileService extends TaskManager {
             extra = JSON.parse(extra);
         }
 
-
-
-        const sha256 = await this.sha256(file);
+        const sha256 = await this.getSha256(file);
 
         if (extra?.parentID) {
             const existing = await this.entityService.query(AppFile, "children", extra.parentID, folder ? folder + "/" + file.name : file.name, sha256)
@@ -174,7 +173,7 @@ export default class LocalFileService extends TaskManager {
                 extra ??= {};
                 extra.folder = folder;
             }
-            return await this.uploadFileParts(file, extra, ct, progress);
+            return await this.uploadFileParts(file, extra, sha256, ct, progress);
         }
 
         return new Promise<IUploadedFile>((resolve, reject) => {