Merge remote-tracking branch 'origin/LEAP-850-fix-credentials-file-pe…

…rmissions' into approval-temp
Noovolari · Sep 12, 2023 · 032ed99 · 032ed99
2 parents 1be099b + 6e5dae6
commit 032ed99
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 2 deletions.
diff --git a/packages/core/src/services/file-service.spec.ts b/packages/core/src/services/file-service.spec.ts
@@ -134,6 +134,15 @@ describe("File Service", () => {
     expect(nativeService.fs.writeFileSync).toHaveBeenNthCalledWith(1, newPath, data);
   });
 
+  test("writeFileSyncWithOptions", () => {
+    const data = "fake-content";
+    const newPath = "new-path";
+    const options = { mode: "600" };
+    const fileService = new FileService(nativeService);
+    fileService.writeFileSyncWithOptions(newPath, data, options);
+    expect(nativeService.fs.writeFileSync).toHaveBeenCalledWith(newPath, data, options);
+  });
+
   test("removeFileSync, if file exists", () => {
     const path = "path";
     const fileService = new FileService(nativeService);

diff --git a/packages/core/src/services/file-service.ts b/packages/core/src/services/file-service.ts
@@ -110,6 +110,10 @@ export class FileService {
     return this.nativeService.fs.writeFileSync(filePath, content);
   }
 
+  writeFileSyncWithOptions(filePath: string, content: string, options: any): any {
+    return this.nativeService.fs.writeFileSync(filePath, content, options);
+  }
+
   /**
    * Remove a file in a synchronous way
    *

diff --git a/packages/desktop-app/src/app/app.component.ts b/packages/desktop-app/src/app/app.component.ts
@@ -245,15 +245,15 @@ export class AppComponent implements OnInit {
 
     if (check) {
       this.fileService.renameSync(oldAwsCredentialsPath, newAwsCredentialsPath);
-      this.fileService.writeFileSync(oldAwsCredentialsPath, "");
+      this.fileService.writeFileSyncWithOptions(oldAwsCredentialsPath, "", { mode: "600" });
       this.appService.getDialog().showMessageBox({
         type: "info",
         icon: __dirname + "/assets/images/Leapp.png",
         // eslint-disable-next-line max-len
         message: "You had a previous credential file. We made a backup of the old one in the same directory before starting.",
       });
     } else if (!this.fileService.existsSync(this.awsCoreService.awsCredentialPath())) {
-      this.fileService.writeFileSync(this.awsCoreService.awsCredentialPath(), "");
+      this.fileService.writeFileSyncWithOptions(this.awsCoreService.awsCredentialPath(), "", { mode: "600" });
     }
   }