Fix various bugs

Author: kirilpopov

src/configs/config.controller.ts

@@ -2,7 +2,7 @@ import { Controller, Headers, Get, Query, Post, Body } from '@nestjs/common';
 import { FileBasedConfigService } from './config.service';
 import { ApiOkResponse, ApiOperation, ApiTags } from '@nestjs/swagger';
 import { GetConfigsRequestDto } from './dto/get-configs-request.dto';
-import { GetConfigsResponsetDto } from './dto/get-configs-response.dto';
+import { GetConfigsResponseDto } from './dto/get-configs-response.dto';
 
 @ApiTags('Configurations')
 @Controller("configs")
@@ -15,7 +15,7 @@ export class ConfigController {
   })
   @ApiOkResponse({
     description: 'Successfully retrieved configurations.',
-    type: GetConfigsResponsetDto
+    type: GetConfigsResponseDto
   })
   async get(@Body() config : GetConfigsRequestDto): Promise<Record<string, string>> {
      let configsParam: string = config.configs ?? "*";

src/configs/config.service.ts

@@ -58,7 +58,8 @@ export class FileBasedConfigService {
       if (!existsSync(filePath)) {
         return defaultResult;
       }
-      return readFilePromisified(join(filePath), "utf8");
+      const content = await readFilePromisified(filePath, "utf8");
+      return json5.parse(content);
     } catch {
       return defaultResult;
     }

src/configs/dto/get-configs-response.dto.ts

@@ -1,6 +1,6 @@
 import { ApiProperty } from "@nestjs/swagger";
 
-export class GetConfigsResponsetDto {
+export class GetConfigsResponseDto {
     @ApiProperty({
         description: 'Overriding JSON configuration for the `system.json` file of io.Connect Desktop.',
     })

src/layouts/layouts.service.ts

@@ -21,7 +21,7 @@ const unlinkFilePromisified = promisify(unlink);
 export class FileBasedLayoutsService {
 
 
-  private layoutsFolder = process.env.APPS_FOLDER || "./configuration/layouts";
+  private layoutsFolder = process.env.LAYOUTS_FOLDER || "./configuration/layouts";
   private defaultLayoutType = "default";
 
   async getAll(): Promise<LayoutDto[]> {
@@ -83,9 +83,9 @@ export class FileBasedLayoutsService {
       console.error("Error deleting old layout file:", error);
     }
 
-    layout.name = newName;
-    this.saveLayout(layout);
-  }
+    layout.name = newName;
+    await this.saveLayout(layout);
+  }
 
   getLayoutPath(layout: LayoutDto): string {
     return join(this.layoutsFolder, this.getLayoutName(layout));

src/main.ts

@@ -14,6 +14,6 @@ async function bootstrap() {
   const document = SwaggerModule.createDocument(app, config);
   SwaggerModule.setup('api', app, document);
 
-  await app.listen(process.env.PORT ?? 8004);
+  await app.listen(process.env.SERVER_PORT ?? 8004);
 }
 bootstrap();

src/prefs/prefs.controller.ts

@@ -57,10 +57,10 @@ export class PrefsController {
   })
   removeApp(@Body() removeRequest: RemoveAppPrefsRequestDto): Promise<void> {
     console.log("Removing prefs", removeRequest);
-    if (!removeRequest.app) {
-      return this.service.remove(removeRequest.app);
-    } else {
-      return this.service.clear();
-    }
-  }
-}
+    if (removeRequest.app) {
+      return this.service.remove(removeRequest.app);
+    } else {
+      return this.service.clear();
+    }
+  }
+}

src/prefs/prefs.service.ts

@@ -71,10 +71,10 @@ export class FileBasedPrefsService {
   public async clear(): Promise<void> {
     let files = await readDirPromisfied(this.folder);
     files = files.filter(f => f.endsWith(".json"));
-    files.map((f) => {
-      unlinkFilePromisified(join(this.folder, f));
-    });
-  }
+    await Promise.all(
+      files.map(f => unlinkFilePromisified(join(this.folder, f)))
+    );
+  }
 
   private fullPath(app: string) {
     const fileName = `${app}.json`;