Merge pull request #608 from ZIMkaRU/feature/resolve-folder-request-access-on-mac-when-exporting

jeojoe · web-flow · commit 98b5e256fe62 · 2026-03-25T17:15:51.000+07:00
Resolve folder request access on mac when exporting
diff --git a/build/entitlements.mac.plist b/build/entitlements.mac.plist
@@ -8,6 +8,10 @@
     <true/>
     <key>com.apple.security.network.server</key>
     <true/>
+    <key>com.apple.security.app-sandbox</key>
+    <true/>
+    <key>com.apple.security.files.downloads.read-write</key>
+    <true/>
     <key>com.apple.security.files.user-selected.read-only</key>
     <true/>
     <key>com.apple.security.files.user-selected.read-write</key>
@@ -24,6 +28,8 @@
     <true/>
     <key>com.apple.security.cs.allow-jit</key>
     <true/>
+    <key>com.apple.security.cs.signer-programmatic-determination</key>
+    <true/>
     <key>com.apple.security.cs.allow-dyld-environment-variables</key>
     <true/>
     <key>com.apple.security.cs.debugger</key>
diff --git a/build/entitlements.mas.inherit.plist b/build/entitlements.mas.inherit.plist
diff --git a/build/locales/en.lproj/InfoPlist.strings b/build/locales/en.lproj/InfoPlist.strings
@@ -0,0 +1 @@
+NSDownloadsFolderUsageDescription = "This app saves downloaded reports directly to your Downloads folder for your convenience";
diff --git a/build/locales/es.lproj/InfoPlist.strings b/build/locales/es.lproj/InfoPlist.strings
@@ -0,0 +1 @@
+NSDownloadsFolderUsageDescription = "Esta aplicación guarda los informes descargados directamente en tu carpeta de Descargas para tu comodidad";
diff --git a/build/locales/pt_BR.lproj/InfoPlist.strings b/build/locales/pt_BR.lproj/InfoPlist.strings
@@ -0,0 +1 @@
+NSDownloadsFolderUsageDescription = "Este aplicativo salva relatórios baixados diretamente na sua pasta de Downloads para sua conveniência";
diff --git a/build/locales/ru.lproj/InfoPlist.strings b/build/locales/ru.lproj/InfoPlist.strings
@@ -0,0 +1 @@
+NSDownloadsFolderUsageDescription = "Это приложение сохраняет скачанные отчеты прямо в папку Загрузки для вашего удобства";
diff --git a/build/locales/vi.lproj/InfoPlist.strings b/build/locales/vi.lproj/InfoPlist.strings
@@ -0,0 +1 @@
+NSDownloadsFolderUsageDescription = "Ứng dụng này lưu các báo cáo đã tải xuống trực tiếp vào thư mục Tải xuống của bạn để thuận tiện cho bạn";
diff --git a/build/locales/zh_CN.lproj/InfoPlist.strings b/build/locales/zh_CN.lproj/InfoPlist.strings
@@ -0,0 +1 @@
+NSDownloadsFolderUsageDescription = "为了您的方便，此应用程序将下载的报告直接保存到您的“下载”文件夹中。";
diff --git a/build/locales/zh_TW.lproj/InfoPlist.strings b/build/locales/zh_TW.lproj/InfoPlist.strings
@@ -0,0 +1 @@
+NSDownloadsFolderUsageDescription = "為了您的方便，此應用程式將下載的報告直接保存到您的「下載」檔案夾中。";
diff --git a/electron-builder-config.js b/electron-builder-config.js
@@ -177,7 +177,18 @@ module.exports = {
     hardenedRuntime: true,
     gatekeeperAssess: false,
     entitlements: 'build/entitlements.mac.plist',
-    entitlementsInherit: 'build/entitlements.mas.inherit.plist',
+    entitlementsInherit: 'build/entitlements.mac.plist',
+    extendInfo: {
+      NSDownloadsFolderUsageDescription: 'This app saves downloaded reports directly to your Downloads folder for your convenience',
+      CFBundleLocalizations: ['en', 'es', 'pt_BR', 'ru', 'vi', 'zh_CN', 'zh_TW']
+    },
+    extraResources: [
+      {
+        from: 'build/locales',
+        to: 'Resources',
+        filter: ['*.lproj']
+      }
+    ],
     category: 'public.app-category.finance',
     minimumSystemVersion: '11',
     darkModeSupport: true,
diff --git a/src/helpers/index.js b/src/helpers/index.js
@@ -24,6 +24,7 @@ const platformIdentifiers = require('./platform-identifiers')
 const envIdentifiers = require('./env-identifiers')
 const isWaylandSession = require('./is-wayland-session')
 const forceX11OnWayland = require('./force-x11-on-wayland')
+const migrateDbFilesToSandboxOnMacOS = require('./migrate-db-files-to-sandbox-on-macos')
 
 module.exports = {
   getFreePort,
@@ -43,5 +44,6 @@ module.exports = {
   platformIdentifiers,
   envIdentifiers,
   isWaylandSession,
-  forceX11OnWayland
+  forceX11OnWayland,
+  migrateDbFilesToSandboxOnMacOS
 }
diff --git a/src/helpers/migrate-db-files-to-sandbox-on-macos.js b/src/helpers/migrate-db-files-to-sandbox-on-macos.js
@@ -0,0 +1,85 @@
+'use strict'
+
+const { app } = require('electron')
+const fs = require('node:fs')
+const path = require('node:path')
+
+const getUserDataPath = require('./get-user-data-path')
+const productName = require('./product-name')
+const { IS_MAC } = require('./platform-identifiers')
+const {
+  DB_FILE_NAME,
+  DB_SHM_FILE_NAME,
+  DB_WAL_FILE_NAME,
+  SECRET_KEY_FILE_NAME
+} = require('../const')
+
+const filesToMigrate = [
+  DB_FILE_NAME,
+  DB_SHM_FILE_NAME,
+  DB_WAL_FILE_NAME,
+  SECRET_KEY_FILE_NAME
+]
+
+module.exports = () => {
+  if (!IS_MAC) {
+    return
+  }
+
+  const homeDir = app.getPath('home')
+  const oldDir = path
+    .join(homeDir, 'Library', 'Application Support', productName)
+  const newDir = getUserDataPath()
+
+  // If the paths match, Sandbox is turned off
+  if (oldDir === newDir) {
+    return
+  }
+
+  const hasOldDb = (
+    fs.existsSync(path.join(oldDir, DB_FILE_NAME)) &&
+    fs.existsSync(path.join(oldDir, SECRET_KEY_FILE_NAME))
+  )
+  const hasNewDb = (
+    fs.existsSync(path.join(newDir, DB_FILE_NAME)) &&
+    fs.existsSync(path.join(newDir, SECRET_KEY_FILE_NAME))
+  )
+
+  if (
+    !hasOldDb ||
+    hasNewDb
+  ) {
+    return
+  }
+
+  try {
+    if (!fs.existsSync(newDir)) {
+      fs.mkdirSync(newDir, { recursive: true })
+    }
+
+    for (const file of filesToMigrate) {
+      const oldFilePath = path.join(oldDir, file)
+      const newFilePath = path.join(newDir, file)
+
+      if (!fs.existsSync(oldFilePath)) {
+        continue
+      }
+
+      fs.copyFileSync(oldFilePath, newFilePath)
+    }
+  } catch (err) {
+    console.debug(err)
+
+    // Clean up if migration failed
+    for (const file of filesToMigrate) {
+      const newFilePath = path.join(newDir, file)
+
+      fs.rmSync(newFilePath, {
+        recursive: true,
+        force: true,
+        maxRetries: 5,
+        retryDelay: 500
+      })
+    }
+  }
+}
diff --git a/src/initialize-app.js b/src/initialize-app.js
@@ -44,7 +44,8 @@ const {
   manageConfigs,
   platformIdentifiers: {
     IS_WIN
-  }
+  },
+  migrateDbFilesToSandboxOnMacOS
 } = require('./helpers')
 const getUserDataPath = require('./helpers/get-user-data-path')
 const {
@@ -124,6 +125,7 @@ module.exports = async () => {
 
     await app.whenReady()
     await enforceMacOSAppLocation()
+    migrateDbFilesToSandboxOnMacOS()
 
     // https://www.electronjs.org/docs/latest/tutorial/notifications#windows
     if (IS_WIN) {
@@ -155,7 +157,8 @@ module.exports = async () => {
 
     await createMainWindow({
       pathToUserData,
-      pathToUserDocuments
+      pathToUserDocuments,
+      pathToUserDownloads
     })
     const portsMap = await getFreePort()
     const ipc = runServer({
diff --git a/src/window-creators/index.js b/src/window-creators/index.js
@@ -316,7 +316,8 @@ const _createChildWindow = async (
 
 const createMainWindow = async ({
   pathToUserData,
-  pathToUserDocuments
+  pathToUserDocuments,
+  pathToUserDownloads
 }) => {
   const createMenu = require('../create-menu')
   const titleBarOverlayOpt = IS_MAC
@@ -388,7 +389,12 @@ const createMainWindow = async ({
       .setTitle(`${title} - BFX API STAGING USED`)
   }
 
-  createMenu({ pathToUserData, pathToUserDocuments })
+  createMenu({
+    pathToUserData,
+    pathToUserDocuments: IS_MAC
+      ? pathToUserDownloads
+      : pathToUserDocuments
+  })
 
   appStates.isMainWinMaximized = isMaximized
   appStates.isMainWinFullScreen = isFullScreen

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+NSDownloadsFolderUsageDescription = "This app saves downloaded reports directly to your Downloads folder for your convenience";`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+NSDownloadsFolderUsageDescription = "Esta aplicación guarda los informes descargados directamente en tu carpeta de Descargas para tu comodidad";`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+NSDownloadsFolderUsageDescription = "Это приложение сохраняет скачанные отчеты прямо в папку Загрузки для вашего удобства";`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+NSDownloadsFolderUsageDescription = "Ứng dụng này lưu các báo cáo đã tải xuống trực tiếp vào thư mục Tải xuống của bạn để thuận tiện cho bạn";`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+NSDownloadsFolderUsageDescription = "为了您的方便，此应用程序将下载的报告直接保存到您的“下载”文件夹中。";`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+NSDownloadsFolderUsageDescription = "為了您的方便，此應用程式將下載的報告直接保存到您的「下載」檔案夾中。";`