From cb38d1ec6026df971cadf30c2126757cf9f51cfa Mon Sep 17 00:00:00 2001
From: TimofeyBoyko <fognir742@gmail.com>
Date: Wed, 24 Aug 2022 19:53:00 +0300
Subject: [PATCH] Plugins: update response

---
 .../ASC.WebPlugins/src/guards/plugin.guard.ts |  2 --
 .../src/plugins/plugins.controller.ts         | 23 ++++++++++++-------
 .../src/plugins/plugins.service.ts            |  2 +-
 common/ASC.WebPlugins/src/utils/storage.ts    |  2 +-
 4 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/common/ASC.WebPlugins/src/guards/plugin.guard.ts b/common/ASC.WebPlugins/src/guards/plugin.guard.ts
index 976652ad51..4758140687 100644
--- a/common/ASC.WebPlugins/src/guards/plugin.guard.ts
+++ b/common/ASC.WebPlugins/src/guards/plugin.guard.ts
@@ -8,8 +8,6 @@ export class PluginGuard implements CanActivate {
   canActivate(
     context: ExecutionContext
   ): boolean | Promise<boolean> | Observable<boolean> {
-    console.log(config);
-
     return config?.plugins?.enabled === "true";
   }
 }
diff --git a/common/ASC.WebPlugins/src/plugins/plugins.controller.ts b/common/ASC.WebPlugins/src/plugins/plugins.controller.ts
index ede7219ae9..87722fa978 100644
--- a/common/ASC.WebPlugins/src/plugins/plugins.controller.ts
+++ b/common/ASC.WebPlugins/src/plugins/plugins.controller.ts
@@ -31,14 +31,15 @@ export class PluginsController {
   constructor(private pluginsService: PluginsService) {}
 
   @Get()
-  async findAll(): Promise<Plugin[]> {
+  async findAll(): Promise<{ response: Plugin[] }> {
     const plugins: Plugin[] = await this.pluginsService.findAll();
-    return plugins;
+    return { response: plugins };
   }
 
   @Put("activate/:id")
-  async activate(@Param("id") id: number): Promise<Plugin> {
-    return this.pluginsService.activate(id);
+  async activate(@Param("id") id: number): Promise<{ response: Plugin }> {
+    const plugin: Plugin = await this.pluginsService.activate(id);
+    return { response: plugin };
   }
 
   @Post("upload")
@@ -48,14 +49,20 @@ export class PluginsController {
       storage: storage,
     })
   )
-  upload(@UploadedFiles() files: Express.Multer.File[]) {
-    return this.pluginsService.upload(files[0].originalname, files[0].filename);
+  async upload(
+    @UploadedFiles() files: Express.Multer.File[]
+  ): Promise<{ response: Plugin }> {
+    const plugin = await this.pluginsService.upload(
+      files[0].originalname,
+      files[0].filename
+    );
+    return { response: plugin };
   }
 
   @Delete("delete/:id")
   @UseGuards(PluginDeleteGuard)
-  delete(@Param("id") id: number) {
-    this.pluginsService.delete(id);
+  async delete(@Param("id") id: number) {
+    await this.pluginsService.delete(id);
   }
 }
 
diff --git a/common/ASC.WebPlugins/src/plugins/plugins.service.ts b/common/ASC.WebPlugins/src/plugins/plugins.service.ts
index d37b65cd65..6bf70b114d 100644
--- a/common/ASC.WebPlugins/src/plugins/plugins.service.ts
+++ b/common/ASC.WebPlugins/src/plugins/plugins.service.ts
@@ -57,7 +57,7 @@ export class PluginsService {
 
     const dir = path.join(
       __dirname,
-      "../../../../public/scripts/",
+      "../../../../../../../public/scripts",
       `${fileName}`
     );
 
diff --git a/common/ASC.WebPlugins/src/utils/storage.ts b/common/ASC.WebPlugins/src/utils/storage.ts
index 6aaf12497c..66cd7b5177 100644
--- a/common/ASC.WebPlugins/src/utils/storage.ts
+++ b/common/ASC.WebPlugins/src/utils/storage.ts
@@ -3,7 +3,7 @@ import * as path from "path";
 
 const storage = diskStorage({
   destination: function (req, file, cb) {
-    const dir = path.join(__dirname, "../../../../public/scripts");
+    const dir = path.join(__dirname, "../../../../../../../public/scripts");
 
     cb(null, dir);
   },