Fixed permission issues in MAS releases (Security Scoped Bookmarks)

.github/workflows/code-scan.yml

@@ -28,31 +28,31 @@ jobs:
         uses: github/codeql-action/upload-sarif@v3
         with:
           sarif_file: results.sarif
-  codecov:
-    needs: njsscan
-    name: Codecov
-    runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        language: ['javascript']
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@master
-      - name: Set up latest available Nodejs
-        uses: actions/setup-node@master
-      - name: Install dependencies
-        run: yarn install
-      - name: Build
-        run: yarn build
-      - name: Run tests
-        run: yarn run test
-      - name: Upload coverage reports to Codecov
-        uses: codecov/codecov-action@v4
-        env:
-          CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
+  # codecov:
+  #   needs: njsscan
+  #   name: Codecov
+  #   runs-on: ubuntu-latest
+  #   strategy:
+  #     fail-fast: false
+  #     matrix:
+  #       language: ['javascript']
+  #   steps:
+  #     - name: Checkout code
+  #       uses: actions/checkout@master
+  #     - name: Set up latest available Nodejs
+  #       uses: actions/setup-node@master
+  #     - name: Install dependencies
+  #       run: yarn install
+  #     - name: Build
+  #       run: yarn build
+  #     - name: Run tests
+  #       run: yarn run test
+  #     - name: Upload coverage reports to Codecov
+  #       uses: codecov/codecov-action@v4
+  #       env:
+  #         CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
   codeql:
-    needs: Codecov
+    needs: njsscan
     name: CodeQL
     runs-on: ubuntu-latest
     strategy:

electron-builder.yml

@@ -1,7 +1,7 @@
 directories:
   output: dist
   buildResources: build
-buildVersion: '54'
+buildVersion: '56'
 asar: true
 mac:
   appId: com.todotxt.sleek

package.json

@@ -1,7 +1,7 @@
 {
   "name": "sleek",
   "productName": "sleek",
-  "version": "2.0.16-rc.2",
+  "version": "2.0.16",
   "description": "todo.txt manager for Linux, Windows and MacOS, free and open-source (FOSS)",
   "synopsis": "todo.txt manager for Linux, Windows and MacOS, free and open-source (FOSS)",
   "keywords": [
@@ -39,7 +39,7 @@
     "postinstall": "electron-builder install-app-deps",
     "build:unpack": "yarn build && electron-builder --dir",
     "mas": "yarn build && electron-builder build -m mas --universal --publish never",
-    "masdev": "yarn build && electron-builder build -m mas-dev --universal --publish never",
+    "masdev": "yarn build && electron-builder build -m mas-dev --publish never",
     "peggy": "peggy --format es --dts --output ./src/main/modules/Filters/FilterLang.ts ./src/main/modules/Filters/FilterLang.pegjs"
   },
   "dependencies": {

src/main/index.ts

@@ -4,7 +4,8 @@ import path from 'path'
 import fs from 'fs'
 import { config } from './config.js'
 import { createMenu } from './modules/Menu.js'
-import { createFileWatcher, watcher } from './modules/File/Watcher.js'
+import { createFileWatcher, watcher } from './modules/File/Watcher'
+import { addFile } from './modules/File/File'
 import { createTray } from './modules/Tray.js'
 import macIcon from '../../resources/icon.icns?asset'
 import windowsIcon from '../../resources/icon.ico?asset'
@@ -201,10 +202,13 @@ const handleBeforeQuit = () => {
   app.releaseSingleInstanceLock()
 }
 
-// const handleOpenFile = (path) => {
-//   console.log(typeof path)
-//   if(path) addFile(path, null);
-// };
+const handleOpenFile = (path) => {
+  try {
+    if(path) addFile(path, null);
+  } catch(error) {
+    console.error(error)
+  }
+};
 
 app
   .whenReady()
@@ -214,14 +218,16 @@ app
     eventListeners.handleCreateWindow = handleCreateWindow
     eventListeners.handleWindowAllClosed = handleWindowAllClosed
     eventListeners.handleBeforeQuit = handleBeforeQuit
-    //eventListeners.handleOpenFile = handleOpenFile;
+    eventListeners.handleOpenFile = handleOpenFile
   })
   .catch(console.error)
 
 app
   .on('window-all-closed', handleWindowAllClosed)
   .on('before-quit', handleBeforeQuit)
   .on('activate', handleCreateWindow)
-//.on('open-file', () => handleOpenFile(path));
-
+  .on('open-file', (event, path) => {
+    event.preventDefault()
+    handleOpenFile(path)
+  })
 export { mainWindow, handleCreateWindow, eventListeners }

src/main/modules/File/File.tsx

@@ -7,20 +7,15 @@ import path from 'path'
 import { mainWindow } from '../../index'
 
 function readFileContent(filePath: string, bookmark: string | null): string | Error {
-  const stopAccessingSecurityScopedResource =
-    process.mas && bookmark ? app.startAccessingSecurityScopedResource(bookmark) : null
   const fileContent = fs.readFileSync(filePath, 'utf8')
-
-  if (stopAccessingSecurityScopedResource && process.mas && bookmark) {
-    stopAccessingSecurityScopedResource()
-  }
-
   return fileContent
 }
 
 function addFile(filePath: string, bookmark: string | null) {
-  if (process.mas && !bookmark)
-    throw new Error('The Mac App Store release requires you to open files using the file dialog')
+  if (!bookmark) {
+    mainWindow!.webContents.send('responseFromMainProcess', 'The Mac App Store release requires you to open files from within the app')    
+    throw new Error('The Mac App Store release requires you to open files from within the app')
+  }
 
   const files: FileObject[] = config.get('files')
   const existingFileIndex = files.findIndex((file) => file.todoFilePath === filePath)

src/main/modules/File/Watcher.tsx

@@ -1,4 +1,5 @@
 import chokidar, { FSWatcher } from 'chokidar'
+import { app } from 'electron'
 import { dataRequest, searchString } from '../DataRequest/DataRequest'
 import { config } from '../../config'
 import { handleError } from '../../util'
@@ -18,6 +19,17 @@ function createFileWatcher(files: FileObject[]): void {
     config.set('files', files)
   }
 
+  if (process.mas) {
+    files.forEach((file) => {
+      if (file.todoFileBookmark) {
+        app.startAccessingSecurityScopedResource(file.todoFileBookmark)
+      }
+      if (file.doneFileBookmark) {
+        app.startAccessingSecurityScopedResource(file.doneFileBookmark)
+      }
+    })
+  }
+
   watcher = chokidar.watch(
     files.map((file) => file.todoFilePath),
     config.get('chokidarOptions')

src/main/modules/File/Write.tsx

@@ -7,14 +7,7 @@ import { config } from '../../config'
 import { replaceSpeakingDatesWithAbsoluteDates } from '../Date'
 
 function writeToFile(string: string, filePath: string, bookmark: string | null) {
-  const stopAccessingSecurityScopedResource =
-    process.mas && bookmark ? app.startAccessingSecurityScopedResource(bookmark) : null
-
   fs.writeFileSync(filePath, string, 'utf-8')
-
-  if (stopAccessingSecurityScopedResource && process.mas && bookmark) {
-    stopAccessingSecurityScopedResource()
-  }
 }
 
 function removeLineFromFile(lineNumber: number) {