Merge branch 'master' into sf-key-accesskey

app.js

@@ -1,8 +1,10 @@
-import run from './src/app.js';
 import runMigrations from './src/migrations.js';
 
 runMigrations()
-  .then(run)
+  .then(() => {
+    //import the app here becasue initial migrations need to be run first - they are dependencies of the app.js
+    import('./src/app.js').then((app) => app.default()); // run the app
+  })
   .catch((err) => {
     console.log('Error starting app:', err);
     process.exit(1);

package.json

@@ -1,6 +1,6 @@
 {
   "name": "actual-sync",
-  "version": "24.10.1",
+  "version": "24.11.0",
   "license": "MIT",
   "description": "actual syncing server",
   "type": "module",
@@ -21,7 +21,7 @@
   },
   "dependencies": {
     "@actual-app/crdt": "2.1.0",
-    "@actual-app/web": "24.10.1",
+    "@actual-app/web": "24.11.0",
     "bcrypt": "^5.1.1",
     "better-sqlite3": "^9.6.0",
     "body-parser": "^1.20.3",

src/app-gocardless/banks/easybank-bawaatww.js

@@ -10,7 +10,7 @@ export default {
 
   institutionIds: ['EASYBANK_BAWAATWW'],
 
-  accessValidForDays: 180,
+  accessValidForDays: 179,
 
   // If date is same, sort by transactionId
   sortTransactions: (transactions = []) =>

src/app-simplefin/app-simplefin.js

@@ -48,7 +48,7 @@ app.post(
     }
 
     try {
-      const accounts = await getAccounts(accessKey, null, null, true);
+      const accounts = await getAccounts(accessKey, null, null, null, true);
 
       res.send({
         status: 'ok',
@@ -91,7 +91,11 @@ app.post(
       : startDate;
     let results;
     try {
-      results = await getTransactions(accessKey, new Date(earliestStartDate));
+      results = await getTransactions(
+        accessKey,
+        Array.isArray(accountId) ? accountId : [accountId],
+        new Date(earliestStartDate),
+      );
     } catch (e) {
       if (e.message === 'Forbidden') {
         invalidToken(res);
@@ -297,12 +301,12 @@ async function getAccessKey(base64Token) {
   });
 }
 
-async function getTransactions(accessKey, startDate, endDate) {
+async function getTransactions(accessKey, accounts, startDate, endDate) {
   const now = new Date();
   startDate = startDate || new Date(now.getFullYear(), now.getMonth(), 1);
   endDate = endDate || new Date(now.getFullYear(), now.getMonth() + 1, 1);
   console.log(`${getDate(startDate)} - ${getDate(endDate)}`);
-  return await getAccounts(accessKey, startDate, endDate);
+  return await getAccounts(accessKey, accounts, startDate, endDate);
 }
 
 function getDate(date) {
@@ -315,6 +319,7 @@ function normalizeDate(date) {
 
 async function getAccounts(
   accessKey,
+  accounts,
   startDate,
   endDate,
   noTransactions = false,
@@ -341,6 +346,12 @@ async function getAccounts(
     params.push(`balances-only=1`);
   }
 
+  if (accounts) {
+    accounts.forEach((id) => {
+      params.push(`account=${encodeURIComponent(id)}`);
+    });
+  }
+
   let queryString = '';
   if (params.length > 0) {
     queryString += '?' + params.join('&');

yarn.lock

@@ -16,10 +16,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@actual-app/web@npm:24.10.1":
-  version: 24.10.1
-  resolution: "@actual-app/web@npm:24.10.1"
-  checksum: 10c0/6eccc2cc22edd895d1661ee847ca5518a4ba29b8585c991c3da933c2ec4590dbfced02f5d3710cb4feb18bc124bbfcad021dc942650f4bef8855d6c4c883fa28
+"@actual-app/web@npm:24.11.0":
+  version: 24.11.0
+  resolution: "@actual-app/web@npm:24.11.0"
+  checksum: 10c0/d6a49d3a2c0539dd41c1caef917f1afa48584af0746ca9f8db3b76fa8c154c081277818bf6a0ec85aeb9d724d3eb4132c13217e6a0725dd730992b57d9e57e97
   languageName: node
   linkType: hard
 
@@ -1531,7 +1531,7 @@ __metadata:
   resolution: "actual-sync@workspace:."
   dependencies:
     "@actual-app/crdt": "npm:2.1.0"
-    "@actual-app/web": "npm:24.10.1"
+    "@actual-app/web": "npm:24.11.0"
     "@babel/preset-typescript": "npm:^7.20.2"
     "@types/bcrypt": "npm:^5.0.2"
     "@types/better-sqlite3": "npm:^7.6.7"