Fixed provisioning and publishing issues related to new API version. (#…

…859)
Azure · Aug 27, 2020 · 3a8e27b · 3a8e27b
1 parent f300e6d
commit 3a8e27b
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 48 deletions.
diff --git a/src/components/content/content.ts b/src/components/content/content.ts
@@ -20,7 +20,7 @@ export class ContentWorkshop {
         private readonly authenticator: IAuthenticator,
         private readonly settingsProvider: ISettingsProvider,
         private readonly logger: Logger
-    ) {}
+    ) { }
 
     public async publish(): Promise<void> {
         this.logger.trackEvent("Click: Publish website");
@@ -30,9 +30,10 @@ export class ContentWorkshop {
         }
 
         try {
-			const accessToken = await this.authenticator.getAccessToken();
+            const accessToken = await this.authenticator.getAccessToken();
+
+            const publishRootUrl = await this.settingsProvider.getSetting<string>("backendUrl") || "";
 
-			const publishRootUrl = await this.settingsProvider.getSetting<string>("backendUrl"); 
             const response = await this.httpClient.send({
                 url: publishRootUrl + "/publish",
                 method: "POST",

diff --git a/src/components/filesystemBlobStorage.ts b/src/components/filesystemBlobStorage.ts
@@ -1,6 +1,5 @@
 import * as fs from "fs";
 import * as path from "path";
-import * as mkdirp from "mkdirp";
 import { IBlobStorage } from "@paperbits/common/persistence";
 
 export class FileSystemBlobStorage implements IBlobStorage {
@@ -10,25 +9,16 @@ export class FileSystemBlobStorage implements IBlobStorage {
         this.basePath = basePath;
     }
 
-    public uploadBlob(blobPath: string, content: Uint8Array): Promise<void> {
-        return new Promise<void>((resolve, reject) => {
-            const fullpath = `${this.basePath}/${blobPath}`.replace("//", "/");
+    public async uploadBlob(blobPath: string, content: Uint8Array): Promise<void> {
+        const fullpath = `${this.basePath}/${blobPath}`.replace("//", "/");
 
-            mkdirp(path.dirname(fullpath), (error) => {
-                if (error) {
-                    reject(error);
-                    throw error;
-                }
-                else {
-                    fs.writeFile(fullpath, Buffer.from(content), error => {
-                        if (error) {
-                            reject(error);
-                        }
-                        resolve();
-                    });
-                }
-            });
-        });
+        try {
+            await fs.promises.mkdir(path.dirname(fullpath), { recursive: true });
+            await fs.promises.writeFile(fullpath, Buffer.from(content.buffer));
+        }
+        catch (error) {
+            console.error(error);
+        }
     }
 
     public downloadBlob(blobPath: string): Promise<Uint8Array> {
@@ -83,30 +73,7 @@ export class FileSystemBlobStorage implements IBlobStorage {
         throw new Error("Not supported");
     }
 
-    public async deleteBlob(filename?: string): Promise<void> {
-        const deletePath = filename && `${this.basePath}/${filename}`.replace("//", "/") || this.basePath;
-        if (fs.existsSync(deletePath)) {
-            if (fs.lstatSync(deletePath).isFile()) {
-                fs.unlinkSync(deletePath);
-            } else {
-                this.deleteFolderRecursive(deletePath);
-            }
-        }
-    }
-
-    private deleteFolderRecursive(path: string) {
-        if (fs.existsSync(path)) {
-            fs.readdirSync(path).forEach((file) => {
-                const curPath = path + "/" + file;
-
-                if (fs.lstatSync(curPath).isDirectory()) { // recurse      
-                    this.deleteFolderRecursive(curPath);
-                } else { // delete file      
-                    fs.unlinkSync(curPath);
-                }
-            });
-
-            fs.rmdirSync(path);
-        }
+    public async deleteBlob(filename: string): Promise<void> {
+        return null;
     }
 }
diff --git a/src/services/provisioningService.ts b/src/services/provisioningService.ts
@@ -57,7 +57,7 @@ export class ProvisionService {
                         { name: "Content-Type", value: "application/json" },
                         { name: "Authorization", value: accessToken }
                     ],
-                    body: JSON.stringify(contentItem)
+                    body: JSON.stringify({ properties: contentItem })
                 };
 
                 const response = await this.httpClient.send(request);