@actual-app/sync-server 25.5.0-alpha.2 → 25.5.0

package/README.md

@@ -28,12 +28,11 @@ actual-server [options]
 
 **Available options**
 
-| Command         | 	Description         |
-| -------------  |-------------|
-|`-h` or `--help` |Print this list and exit. |
-|`-v` or `--version` |Print this version and exit. |
-|`--config` |Path to the config file. |
-
+| Command             | Description                  |
+| ------------------- | ---------------------------- |
+| `-h` or `--help`    | Print this list and exit.    |
+| `-v` or `--version` | Print this version and exit. |
+| `--config`          | Path to the config file.     |
 
 **Examples**
 
@@ -43,7 +42,7 @@ Run with default configuration
 actual-server
 ```
 
-Runs with custom configuration
+Run with custom configuration
 
 ```bash
 actual-server --config ./config.json

package/bin/actual-server.js

@@ -1,9 +1,9 @@
 #!/usr/bin/env node
-import { existsSync } from 'node:fs';
+import { existsSync, readFileSync } from 'node:fs';
+import { dirname, resolve } from 'node:path';
+import { fileURLToPath } from 'node:url';
 import { parseArgs } from 'node:util';
 
-import packageJson from '../package.json' with { type: 'json' };
-
 const args = process.argv;
 
 const options = {
@@ -51,12 +51,38 @@ if (values.help) {
 }
 
 if (values.version) {
-  console.log('v' + packageJson.version);
+  const __dirname = dirname(fileURLToPath(import.meta.url));
+  const packageJsonPath = resolve(__dirname, '../package.json');
+  const packageJson = JSON.parse(readFileSync(packageJsonPath, 'utf-8'));
 
+  console.log('v' + packageJson.version);
   process.exit();
 }
 
-// Read the config argument if specified
+const setupDataDir = (dataDir = undefined) => {
+  if (process.env.ACTUAL_DATA_DIR) {
+    return; // Env variables must not be overwritten
+  }
+
+  if (dataDir) {
+    process.env.ACTUAL_DATA_DIR = dataDir; // Use the dir specified
+  } else {
+    // Setup defaults
+    if (existsSync('./data')) {
+      // The default data directory exists - use it
+      console.info('Found existing data directory');
+      process.env.ACTUAL_DATA_DIR = './data';
+    } else {
+      console.info(
+        'Using default data directory. You can specify a custom config with --config',
+      );
+      process.env.ACTUAL_DATA_DIR = './';
+    }
+
+    console.info(`Data directory: ${process.env.ACTUAL_DATA_DIR}`);
+  }
+};
+
 if (values.config) {
   const configExists = existsSync(values.config);
 
@@ -66,19 +92,25 @@ if (values.config) {
     );
 
     process.exit();
-  } else if (values.config) {
+  } else {
     console.log(`Loading config from ${values.config}`);
+    const configJson = JSON.parse(readFileSync(values.config, 'utf-8'));
     process.env.ACTUAL_CONFIG_PATH = values.config;
+    setupDataDir(configJson.dataDir);
   }
 } else {
-  // No config specified, use reasonable defaults
-  console.info(
-    'Using default config. You can specify a custom config with --config',
-  );
-  process.env.ACTUAL_DATA_DIR = './';
-  console.info(
-    'user-files and server-files will be created in the current directory',
-  );
+  // If no config is specified, check for a default config in the current directory
+  const defaultConfigJsonFile = './config.json';
+  const configExists = existsSync(defaultConfigJsonFile);
+
+  if (configExists) {
+    console.info('Found config.json in the current directory');
+    const configJson = JSON.parse(readFileSync(defaultConfigJsonFile, 'utf-8'));
+    process.env.ACTUAL_CONFIG_PATH = defaultConfigJsonFile;
+    setupDataDir(configJson.dataDir);
+  } else {
+    setupDataDir(); // No default config exists - setup data dir with defaults
+  }
 }
 
 // start the sync server

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@actual-app/sync-server",
-  "version": "25.5.0-alpha.2",
+  "version": "25.5.0",
   "license": "MIT",
   "description": "actual syncing server",
   "bin": {
@@ -20,7 +20,7 @@
     "start": "node app",
     "start-monitor": "nodemon app",
     "build": "tsc",
-    "test": "NODE_ENV=test NODE_OPTIONS='--experimental-vm-modules --trace-warnings' jest  --coverage",
+    "test": "NODE_ENV=test NODE_OPTIONS='--experimental-vm-modules --trace-warnings' vitest",
     "db:migrate": "NODE_ENV=development node src/run-migrations.js up",
     "db:downgrade": "NODE_ENV=development node src/run-migrations.js down",
     "db:test-migrate": "NODE_ENV=test node src/run-migrations.js up",
@@ -31,7 +31,7 @@
   },
   "dependencies": {
     "@actual-app/crdt": "2.1.0",
-    "@actual-app/web": "25.3.1",
+    "@actual-app/web": "25.5.0",
     "bcrypt": "^5.1.1",
     "better-sqlite3": "^11.9.1",
     "body-parser": "^1.20.3",
@@ -62,14 +62,14 @@
     "@types/cors": "^2.8.17",
     "@types/express": "^5.0.0",
     "@types/express-actuator": "^1.8.3",
-    "@types/jest": "^29.5.14",
     "@types/node": "^22.14.0",
     "@types/supertest": "^2.0.16",
     "@types/uuid": "^9.0.8",
-    "http-proxy-middleware": "^3.0.3",
-    "jest": "^29.7.0",
+    "@vitest/coverage-v8": "3.1.1",
+    "http-proxy-middleware": "^3.0.5",
     "nodemon": "^3.1.9",
     "supertest": "^6.3.4",
-    "typescript": "^5.8.2"
+    "typescript": "^5.8.2",
+    "vitest": "^3.0.2"
   }
 }

package/src/accounts/openid.js

@@ -1,7 +1,11 @@
 import { generators, Issuer } from 'openid-client';
 import { v4 as uuidv4 } from 'uuid';
 
-import { clearExpiredSessions, getAccountDb } from '../account-db.js';
+import {
+  clearExpiredSessions,
+  getAccountDb,
+  listLoginMethods,
+} from '../account-db.js';
 import { config } from '../load-config.js';
 import {
   getUserByUsername,
@@ -99,10 +103,13 @@ export async function loginWithOpenIdSetup(
     [''],
   );
   if (countUsersWithUserName === 0) {
-    const valid = checkPassword(firstTimeLoginPassword);
+    const methods = listLoginMethods();
+    if (methods.some(authMethod => authMethod.method === 'password')) {
+      const valid = checkPassword(firstTimeLoginPassword);
 
-    if (!valid) {
-      return { error: 'invalid-password' };
+      if (!valid) {
+        return { error: 'invalid-password' };
+      }
     }
   }
 

package/src/app-account.js

@@ -84,7 +84,7 @@ app.post('/login', async (req, res) => {
       break;
     }
     case 'openid': {
-      if (!isValidRedirectUrl(req.body.return_url)) {
+      if (!isValidRedirectUrl(req.body.returnUrl)) {
         res
           .status(400)
           .send({ status: 'error', reason: 'Invalid redirect URL' });
@@ -92,14 +92,14 @@ app.post('/login', async (req, res) => {
       }
 
       const { error, url } = await loginWithOpenIdSetup(
-        req.body.return_url,
+        req.body.returnUrl,
         req.body.password,
       );
       if (error) {
         res.status(400).send({ status: 'error', reason: error });
         return;
       }
-      res.send({ status: 'ok', data: { redirect_url: url } });
+      res.send({ status: 'ok', data: { returnUrl: url } });
       return;
     }
 

package/src/app-gocardless/README.md

@@ -1,198 +1,198 @@
-# Integration new bank
-
-If the default bank integration does not work for you, you can integrate a new bank by following these steps.
-
-1. Find in [this google doc](https://docs.google.com/spreadsheets/d/1ogpzydzotOltbssrc3IQ8rhBLlIZbQgm5QCiiNJrkyA/edit#gid=489769432) what is the identifier of the bank which you want to integrate.
-
-2. Launch frontend and backend server.
-
-3. In the frontend, create a new linked account selecting the institution which you are interested in.
-
-   This will trigger the process of fetching the data from the bank and will log the data in the backend. Use this data to fill the logic of the bank class.
-
-4. Create new a bank class based on an existing example in `app-gocardless/banks`.
-
-   Name of the file and class should follow the existing patterns and be created based on the ID of the integrated institution, found in step 1.
-
-5. Fill the logic of `normalizeAccount`, `normalizeTransaction`, `sortTransactions`, and `calculateStartingBalance` functions.
-   You do not need to fill every function, only those which are necessary for the integration to work.
-
-   You should do it based on the data which you found in the logs.
-
-   Example logs which help you to fill:
-
-   - `normalizeAccount` function:
-
-     ```log
-     Available account properties for new institution integration {
-       account: '{
-         "iban": "PL00000000000000000987654321",
-         "currency": "PLN",
-         "ownerName": "John Example",
-         "displayName": "Product name",
-         "product": "Daily account",
-         "usage": "PRIV",
-         "ownerAddressUnstructured": [
-           "POL",
-           "UL. Example 1",
-           "00-000 Warsaw"
-         ],
-         "id": "XXXXXXXX-XXXX-XXXXX-XXXXXX-XXXXXXXXX",
-         "created": "2023-01-18T12:15:16.502446Z",
-         "last_accessed": null,
-         "institution_id": "MBANK_RETAIL_BREXPLPW",
-         "status": "READY",
-         "owner_name": "",
-         "institution": {
-           "id": "MBANK_RETAIL_BREXPLPW",
-           "name": "mBank Retail",
-           "bic": "BREXPLPW",
-           "transaction_total_days": "90",
-           "countries": [
-             "PL"
-           ],
-           "logo": "https://cdn.nordigen.com/ais/MBANK_RETAIL_BREXCZPP.png",
-           "supported_payments": {},
-           "supported_features": [
-             "access_scopes",
-             "business_accounts",
-             "card_accounts",
-             "corporate_accounts",
-             "pending_transactions",
-             "private_accounts"
-           ]
-         }
-       }'
-     }
-     ```
-
-   - `sortTransactions` function:
-
-     ```log
-     Available (first 10) transactions properties for new integration of institution in sortTransactions function
-     {
-       top10SortedTransactions: '[
-         {
-           "transactionId": "20220101001",
-           "bookingDate": "2022-01-01",
-           "valueDate": "2022-01-01",
-           "transactionAmount": {
-             "amount": "5.01",
-             "currency": "EUR"
-           },
-           "creditorName": "JOHN EXAMPLE",
-           "creditorAccount": {
-             "iban": "PL00000000000000000987654321"
-           },
-           "debtorName": "CHRIS EXAMPLE",
-           "debtorAccount": {
-             "iban": "PL12345000000000000987654321"
-           },
-           "remittanceInformationUnstructured": "TEST BANK TRANSFER",
-           "remittanceInformationUnstructuredArray": [
-             "TEST BANK TRANSFER"
-           ],
-           "balanceAfterTransaction": {
-             "balanceAmount": {
-               "amount": "448.52",
-               "currency": "EUR"
-             },
-             "balanceType": "interimBooked"
-           },
-           "internalTransactionId": "casfib7720c2a02c0331cw2"
-         }
-       ]'
-     }
-     ```
-
-   - `calculateStartingBalance` function:
-
-     ```log
-     Available (first 10) transactions properties for new integration of institution in calculateStartingBalance function {
-       balances: '[
-         {
-           "balanceAmount": {
-             "amount": "448.52",
-             "currency": "EUR"
-           },
-           "balanceType": "forwardAvailable"
-         },
-         {
-           "balanceAmount": {
-             "amount": "448.52",
-             "currency": "EUR"
-           },
-           "balanceType": "interimBooked"
-         }
-       ]',
-         top10SortedTransactions: '[
-         {
-           "transactionId": "20220101001",
-           "bookingDate": "2022-01-01",
-           "valueDate": "2022-01-01",
-           "transactionAmount": {
-             "amount": "5.01",
-             "currency": "EUR"
-           },
-           "creditorName": "JOHN EXAMPLE",
-           "creditorAccount": {
-             "iban": "PL00000000000000000987654321"
-           },
-           "debtorName": "CHRIS EXAMPLE",
-           "debtorAccount": {
-             "iban": "PL12345000000000000987654321"
-           },
-           "remittanceInformationUnstructured": "TEST BANK TRANSFER",
-           "remittanceInformationUnstructuredArray": [
-             "TEST BANK TRANSFER"
-           ],
-           "balanceAfterTransaction": {
-             "balanceAmount": {
-               "amount": "448.52",
-               "currency": "EUR"
-             },
-             "balanceType": "interimBooked"
-           },
-           "internalTransactionId": "casfib7720c2a02c0331cw2"
-         }
-       ]'
-     }
-     ```
-
-6. Add new bank integration to `BankFactory` class in file `actual-server/app-gocardless/bank-factory.js`
-
-7. Remember to add tests for new bank integration in
-
-## normalizeTransaction
-
-This is the most commonly used override as it allows you to change the data that is returned to the client.
-
-Please follow the following patterns when implementing a custom normalizeTransaction method:
-
-1. If you need to edit the values of transaction fields (excluding the transaction amount) do not mutate the original transaction object. Instead, create a shallow copy and make your changes there.
-2. End the function by returning the result of calling the fallback normalizeTransaction method from integration-bank.js
-
-E.g.
-
-```js
-import Fallback from './integration-bank.js';
-
-export default {
-  ...
-
-  normalizeTransaction(transaction, booked) {
-    // create a shallow copy of the transaction object
-    const editedTrans = { ...transaction };
-
-    // make any changes required to the copy
-    editedTrans.remittanceInformationUnstructured = transaction.remittanceInformationStructured;
-
-    // call the fallback method, passing in your edited transaction as the 3rd parameter
-    // this will calculate the date, payee name and notes fields based on your changes
-    // but leave the original fields available for mapping in the UI
-    return Fallback.normalizeTransaction(transaction, booked, editedTrans);
-  }
-
-  ...
-}
-```
+# Integration new bank
+
+If the default bank integration does not work for you, you can integrate a new bank by following these steps.
+
+1. Find in [this google doc](https://docs.google.com/spreadsheets/d/1ogpzydzotOltbssrc3IQ8rhBLlIZbQgm5QCiiNJrkyA/edit#gid=489769432) what is the identifier of the bank which you want to integrate.
+
+2. Launch frontend and backend server.
+
+3. In the frontend, create a new linked account selecting the institution which you are interested in.
+
+   This will trigger the process of fetching the data from the bank and will log the data in the backend. Use this data to fill the logic of the bank class.
+
+4. Create new a bank class based on an existing example in `app-gocardless/banks`.
+
+   Name of the file and class should follow the existing patterns and be created based on the ID of the integrated institution, found in step 1.
+
+5. Fill the logic of `normalizeAccount`, `normalizeTransaction`, `sortTransactions`, and `calculateStartingBalance` functions.
+   You do not need to fill every function, only those which are necessary for the integration to work.
+
+   You should do it based on the data which you found in the logs.
+
+   Example logs which help you to fill:
+
+   - `normalizeAccount` function:
+
+     ```log
+     Available account properties for new institution integration {
+       account: '{
+         "iban": "PL00000000000000000987654321",
+         "currency": "PLN",
+         "ownerName": "John Example",
+         "displayName": "Product name",
+         "product": "Daily account",
+         "usage": "PRIV",
+         "ownerAddressUnstructured": [
+           "POL",
+           "UL. Example 1",
+           "00-000 Warsaw"
+         ],
+         "id": "XXXXXXXX-XXXX-XXXXX-XXXXXX-XXXXXXXXX",
+         "created": "2023-01-18T12:15:16.502446Z",
+         "last_accessed": null,
+         "institution_id": "MBANK_RETAIL_BREXPLPW",
+         "status": "READY",
+         "owner_name": "",
+         "institution": {
+           "id": "MBANK_RETAIL_BREXPLPW",
+           "name": "mBank Retail",
+           "bic": "BREXPLPW",
+           "transaction_total_days": "90",
+           "countries": [
+             "PL"
+           ],
+           "logo": "https://cdn.nordigen.com/ais/MBANK_RETAIL_BREXCZPP.png",
+           "supported_payments": {},
+           "supported_features": [
+             "access_scopes",
+             "business_accounts",
+             "card_accounts",
+             "corporate_accounts",
+             "pending_transactions",
+             "private_accounts"
+           ]
+         }
+       }'
+     }
+     ```
+
+   - `sortTransactions` function:
+
+     ```log
+     Available (first 10) transactions properties for new integration of institution in sortTransactions function
+     {
+       top10SortedTransactions: '[
+         {
+           "transactionId": "20220101001",
+           "bookingDate": "2022-01-01",
+           "valueDate": "2022-01-01",
+           "transactionAmount": {
+             "amount": "5.01",
+             "currency": "EUR"
+           },
+           "creditorName": "JOHN EXAMPLE",
+           "creditorAccount": {
+             "iban": "PL00000000000000000987654321"
+           },
+           "debtorName": "CHRIS EXAMPLE",
+           "debtorAccount": {
+             "iban": "PL12345000000000000987654321"
+           },
+           "remittanceInformationUnstructured": "TEST BANK TRANSFER",
+           "remittanceInformationUnstructuredArray": [
+             "TEST BANK TRANSFER"
+           ],
+           "balanceAfterTransaction": {
+             "balanceAmount": {
+               "amount": "448.52",
+               "currency": "EUR"
+             },
+             "balanceType": "interimBooked"
+           },
+           "internalTransactionId": "casfib7720c2a02c0331cw2"
+         }
+       ]'
+     }
+     ```
+
+   - `calculateStartingBalance` function:
+
+     ```log
+     Available (first 10) transactions properties for new integration of institution in calculateStartingBalance function {
+       balances: '[
+         {
+           "balanceAmount": {
+             "amount": "448.52",
+             "currency": "EUR"
+           },
+           "balanceType": "forwardAvailable"
+         },
+         {
+           "balanceAmount": {
+             "amount": "448.52",
+             "currency": "EUR"
+           },
+           "balanceType": "interimBooked"
+         }
+       ]',
+         top10SortedTransactions: '[
+         {
+           "transactionId": "20220101001",
+           "bookingDate": "2022-01-01",
+           "valueDate": "2022-01-01",
+           "transactionAmount": {
+             "amount": "5.01",
+             "currency": "EUR"
+           },
+           "creditorName": "JOHN EXAMPLE",
+           "creditorAccount": {
+             "iban": "PL00000000000000000987654321"
+           },
+           "debtorName": "CHRIS EXAMPLE",
+           "debtorAccount": {
+             "iban": "PL12345000000000000987654321"
+           },
+           "remittanceInformationUnstructured": "TEST BANK TRANSFER",
+           "remittanceInformationUnstructuredArray": [
+             "TEST BANK TRANSFER"
+           ],
+           "balanceAfterTransaction": {
+             "balanceAmount": {
+               "amount": "448.52",
+               "currency": "EUR"
+             },
+             "balanceType": "interimBooked"
+           },
+           "internalTransactionId": "casfib7720c2a02c0331cw2"
+         }
+       ]'
+     }
+     ```
+
+6. Add new bank integration to `BankFactory` class in file `actual-server/app-gocardless/bank-factory.js`
+
+7. Remember to add tests for new bank integration in
+
+## normalizeTransaction
+
+This is the most commonly used override as it allows you to change the data that is returned to the client.
+
+Please follow the following patterns when implementing a custom normalizeTransaction method:
+
+1. If you need to edit the values of transaction fields (excluding the transaction amount) do not mutate the original transaction object. Instead, create a shallow copy and make your changes there.
+2. End the function by returning the result of calling the fallback normalizeTransaction method from integration-bank.js
+
+E.g.
+
+```js
+import Fallback from './integration-bank.js';
+
+export default {
+  ...
+
+  normalizeTransaction(transaction, booked) {
+    // create a shallow copy of the transaction object
+    const editedTrans = { ...transaction };
+
+    // make any changes required to the copy
+    editedTrans.remittanceInformationUnstructured = transaction.remittanceInformationStructured;
+
+    // call the fallback method, passing in your edited transaction as the 3rd parameter
+    // this will calculate the date, payee name and notes fields based on your changes
+    // but leave the original fields available for mapping in the UI
+    return Fallback.normalizeTransaction(transaction, booked, editedTrans);
+  }
+
+  ...
+}
+```

package/src/app-gocardless/banks/commerzbank_cobadeff.js

@@ -1,4 +1,5 @@
 import Fallback from './integration-bank.js';
+import { escapeRegExp } from './util/escape-regexp.js';
 
 /** @type {import('./bank.interface.js').IBank} */
 export default {
@@ -38,7 +39,9 @@ export default {
     // Clean up remittanceInformation, deduplicate payee (removing slashes ...
     // ... that are added to the remittanceInformation field), and ...
     // ... remove clutter like "End-to-End-Ref.: NOTPROVIDED"
-    const payee = transaction.creditorName || transaction.debtorName || '';
+    const payee = escapeRegExp(
+      transaction.creditorName || transaction.debtorName || '',
+    );
     editedTrans.remittanceInformationUnstructured =
       editedTrans.remittanceInformationUnstructured
         .replace(/\s*(,)?\s+/g, '$1 ')

package/src/app-gocardless/banks/seb_kort_bank_ab.js

@@ -10,6 +10,7 @@ export default {
     'SEB_KORT_AB_NO_SKHSFI21',
     'SEB_KORT_AB_SE_SKHSFI21',
     'SEB_CARD_ESSESESS',
+    'NORDIC_CHOICE_CLUB_NO_SKHSFI21',
   ],
 
   /**

package/src/app-gocardless/banks/tests/commerzbank_cobadeff.spec.js

@@ -106,5 +106,28 @@ describe('CommerzbankCobadeff', () => {
         'CREDITOR00BIC CREDITOR000IBAN DESCRIPTION, Dauerauftrag',
       );
     });
+
+    it('correctly uses regex on payee with special characters', () => {
+      const transaction = {
+        endToEndId: '1234567890',
+        mandateId: '1234567890',
+        bookingDate: '2025-04-18',
+        valueDate: '2025-04-18',
+        transactionAmount: {
+          amount: '-1',
+          currency: 'EUR',
+        },
+        creditorName: 'Netto Marken-Discount Halle (Saale',
+        remittanceInformationUnstructured: 'Example',
+        remittanceInformationUnstructuredArray: ['Example'],
+        remittanceInformationStructured: 'Example',
+        // internalTransactionId: '3815213adb654baeadfb231c853',
+      };
+      const normalizedTransaction = CommerzbankCobadeff.normalizeTransaction(
+        transaction,
+        false,
+      );
+      expect(normalizedTransaction.notes).toEqual('Example');
+    });
   });
 });

package/src/app-gocardless/banks/tests/integration_bank.spec.js

@@ -1,5 +1,3 @@
-import { jest } from '@jest/globals';
-
 import {
   mockExtendAccountsAboutInstitutions,
   mockInstitution,
@@ -10,7 +8,7 @@ describe('IntegrationBank', () => {
   let consoleSpy;
 
   beforeEach(() => {
-    consoleSpy = jest.spyOn(console, 'debug');
+    consoleSpy = vi.spyOn(console, 'debug');
   });
 
   describe('normalizeAccount', () => {

package/src/app-gocardless/banks/tests/spk_marburg_biedenkopf_heladef1mar.spec.js

@@ -201,9 +201,8 @@ describe('SpkMarburgBiedenkopfHeladef1mar', () => {
         normalizeTransactions[a] = normalizeTransactions[b];
         normalizeTransactions[b] = swap;
       };
-      swap(1, 4);
-      swap(3, 6);
-      swap(0, 7);
+      swap(1, 3);
+      swap(0, 2);
       const sortedTransactions =
         SpkMarburgBiedenkopfHeladef1mar.sortTransactions(normalizeTransactions);
       expect(sortedTransactions).toEqual(originalOrder);

package/src/app-gocardless/banks/tests/ssk_dusseldorf_dussdeddxxx.spec.js

@@ -1,12 +1,10 @@
-import { jest } from '@jest/globals';
-
 import SskDusseldorfDussdeddxxx from '../ssk_dusseldorf_dussdeddxxx.js';
 
 describe('ssk_dusseldorf_dussdeddxxx', () => {
   let consoleSpy;
 
   beforeEach(() => {
-    consoleSpy = jest.spyOn(console, 'debug');
+    consoleSpy = vi.spyOn(console, 'debug');
   });
 
   afterEach(() => {

package/src/app-gocardless/banks/util/escape-regexp.js

@@ -0,0 +1,4 @@
+// Escape special characters in the string to create a valid regular expression
+export function escapeRegExp(string) {
+  return string.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
+}

package/src/app-gocardless/link.html

@@ -1,18 +1,18 @@
-<!doctype html>
-<html lang="en">
-  <head>
-    <meta charset="utf-8" />
-    <title>Actual</title>
-  </head>
-  <body>
-    <script>
-      window.close();
-    </script>
-
-    <p>Please wait...</p>
-    <p>
-      The window should close automatically. If nothing happened you can close
-      this window or tab.
-    </p>
-  </body>
-</html>
+<!doctype html>
+<html lang="en">
+  <head>
+    <meta charset="utf-8" />
+    <title>Actual</title>
+  </head>
+  <body>
+    <script>
+      window.close();
+    </script>
+
+    <p>Please wait...</p>
+    <p>
+      The window should close automatically. If nothing happened you can close
+      this window or tab.
+    </p>
+  </body>
+</html>

package/src/app-gocardless/services/tests/gocardless-service.spec.js

@@ -1,5 +1,3 @@
-import { jest } from '@jest/globals';
-
 import {
   AccessDeniedError,
   AccountNotLinkedToRequisition,
@@ -51,29 +49,29 @@ describe('goCardlessService', () => {
   let setTokenSpy;
 
   beforeEach(() => {
-    getInstitutionsSpy = jest.spyOn(client, 'getInstitutions');
-    getInstitutionSpy = jest.spyOn(client, 'getInstitutionById');
-    getRequisitionsSpy = jest.spyOn(client, 'getRequisitionById');
-    deleteRequisitionsSpy = jest.spyOn(client, 'deleteRequisition');
-    createRequisitionSpy = jest.spyOn(client, 'initSession');
-    getBalancesSpy = jest.spyOn(client, 'getBalances');
-    getTransactionsSpy = jest.spyOn(client, 'getTransactions');
-    getDetailsSpy = jest.spyOn(client, 'getDetails');
-    getMetadataSpy = jest.spyOn(client, 'getMetadata');
-    setTokenSpy = jest.spyOn(goCardlessService, 'setToken');
+    getInstitutionsSpy = vi.spyOn(client, 'getInstitutions');
+    getInstitutionSpy = vi.spyOn(client, 'getInstitutionById');
+    getRequisitionsSpy = vi.spyOn(client, 'getRequisitionById');
+    deleteRequisitionsSpy = vi.spyOn(client, 'deleteRequisition');
+    createRequisitionSpy = vi.spyOn(client, 'initSession');
+    getBalancesSpy = vi.spyOn(client, 'getBalances');
+    getTransactionsSpy = vi.spyOn(client, 'getTransactions');
+    getDetailsSpy = vi.spyOn(client, 'getDetails');
+    getMetadataSpy = vi.spyOn(client, 'getMetadata');
+    setTokenSpy = vi.spyOn(goCardlessService, 'setToken');
   });
 
   afterEach(() => {
-    jest.resetAllMocks();
+    vi.resetAllMocks();
   });
 
   describe('#getLinkedRequisition', () => {
     it('returns requisition', async () => {
       setTokenSpy.mockResolvedValue();
 
-      jest
-        .spyOn(goCardlessService, 'getRequisition')
-        .mockResolvedValue(mockRequisition);
+      vi.spyOn(goCardlessService, 'getRequisition').mockResolvedValue(
+        mockRequisition,
+      );
 
       expect(
         await goCardlessService.getLinkedRequisition(requisitionId),
@@ -83,9 +81,10 @@ describe('goCardlessService', () => {
     it('throws RequisitionNotLinked error if requisition status is different than LN', async () => {
       setTokenSpy.mockResolvedValue();
 
-      jest
-        .spyOn(goCardlessService, 'getRequisition')
-        .mockResolvedValue({ ...mockRequisition, status: 'ER' });
+      vi.spyOn(goCardlessService, 'getRequisition').mockResolvedValue({
+        ...mockRequisition,
+        status: 'ER',
+      });
 
       await expect(() =>
         goCardlessService.getLinkedRequisition(requisitionId),
@@ -95,30 +94,31 @@ describe('goCardlessService', () => {
 
   describe('#getRequisitionWithAccounts', () => {
     it('returns combined data', async () => {
-      jest
-        .spyOn(goCardlessService, 'getRequisition')
-        .mockResolvedValue(mockRequisitionWithExampleAccounts);
-      jest
-        .spyOn(goCardlessService, 'getDetailedAccount')
-        .mockResolvedValueOnce(mockDetailedAccountExample1);
-      jest
-        .spyOn(goCardlessService, 'getDetailedAccount')
-        .mockResolvedValueOnce(mockDetailedAccountExample2);
-      jest
-        .spyOn(goCardlessService, 'getInstitution')
-        .mockResolvedValue(mockInstitution);
-      jest
-        .spyOn(goCardlessService, 'extendAccountsAboutInstitutions')
-        .mockResolvedValue([
-          {
-            ...mockExtendAccountsAboutInstitutions[0],
-            institution_id: 'NEWONE',
-          },
-          {
-            ...mockExtendAccountsAboutInstitutions[1],
-            institution_id: 'NEWONE',
-          },
-        ]);
+      vi.spyOn(goCardlessService, 'getRequisition').mockResolvedValue(
+        mockRequisitionWithExampleAccounts,
+      );
+      vi.spyOn(goCardlessService, 'getDetailedAccount').mockResolvedValueOnce(
+        mockDetailedAccountExample1,
+      );
+      vi.spyOn(goCardlessService, 'getDetailedAccount').mockResolvedValueOnce(
+        mockDetailedAccountExample2,
+      );
+      vi.spyOn(goCardlessService, 'getInstitution').mockResolvedValue(
+        mockInstitution,
+      );
+      vi.spyOn(
+        goCardlessService,
+        'extendAccountsAboutInstitutions',
+      ).mockResolvedValue([
+        {
+          ...mockExtendAccountsAboutInstitutions[0],
+          institution_id: 'NEWONE',
+        },
+        {
+          ...mockExtendAccountsAboutInstitutions[1],
+          institution_id: 'NEWONE',
+        },
+      ]);
 
       const response = await goCardlessService.getRequisitionWithAccounts(
         mockRequisitionWithExampleAccounts.id,
@@ -146,18 +146,18 @@ describe('goCardlessService', () => {
   describe('#getTransactionsWithBalance', () => {
     const requisitionId = mockRequisition.id;
     it('returns transaction with starting balance', async () => {
-      jest
-        .spyOn(goCardlessService, 'getLinkedRequisition')
-        .mockResolvedValue(mockRequisition);
-      jest
-        .spyOn(goCardlessService, 'getAccountMetadata')
-        .mockResolvedValue(mockAccountMetaData);
-      jest
-        .spyOn(goCardlessService, 'getTransactions')
-        .mockResolvedValue(mockTransactions);
-      jest
-        .spyOn(goCardlessService, 'getBalances')
-        .mockResolvedValue(mockedBalances);
+      vi.spyOn(goCardlessService, 'getLinkedRequisition').mockResolvedValue(
+        mockRequisition,
+      );
+      vi.spyOn(goCardlessService, 'getAccountMetadata').mockResolvedValue(
+        mockAccountMetaData,
+      );
+      vi.spyOn(goCardlessService, 'getTransactions').mockResolvedValue(
+        mockTransactions,
+      );
+      vi.spyOn(goCardlessService, 'getBalances').mockResolvedValue(
+        mockedBalances,
+      );
 
       expect(
         await goCardlessService.getTransactionsWithBalance(
@@ -216,9 +216,9 @@ describe('goCardlessService', () => {
     });
 
     it('throws AccountNotLinkedToRequisition error if requisition accounts not includes requested account', async () => {
-      jest
-        .spyOn(goCardlessService, 'getLinkedRequisition')
-        .mockResolvedValue(mockRequisition);
+      vi.spyOn(goCardlessService, 'getLinkedRequisition').mockResolvedValue(
+        mockRequisition,
+      );
 
       await expect(() =>
         goCardlessService.getTransactionsWithBalance({

package/src/app-simplefin/app-simplefin.js

@@ -352,67 +352,54 @@ async function getAccounts(
   noTransactions = false,
 ) {
   const sfin = parseAccessKey(accessKey);
-  const options = {
-    headers: {
-      Authorization: `Basic ${Buffer.from(
-        `${sfin.username}:${sfin.password}`,
-      ).toString('base64')}`,
-    },
+
+  const headers = {
+    Authorization: `Basic ${Buffer.from(
+      `${sfin.username}:${sfin.password}`,
+    ).toString('base64')}`,
   };
-  const params = [];
+
+  const params = new URLSearchParams();
   if (!noTransactions) {
     if (startDate) {
-      params.push(`start-date=${normalizeDate(startDate)}`);
+      params.append('start-date', normalizeDate(startDate));
     }
     if (endDate) {
-      params.push(`end-date=${normalizeDate(endDate)}`);
+      params.append('end-date', normalizeDate(endDate));
     }
-
-    params.push(`pending=1`);
+    params.append('pending', '1');
   } else {
-    params.push(`balances-only=1`);
+    params.append('balances-only', '1');
   }
 
   if (accounts) {
-    accounts.forEach(id => {
-      params.push(`account=${encodeURIComponent(id)}`);
-    });
+    for (const id of accounts) {
+      params.append('account', id);
+    }
   }
 
-  let queryString = '';
-  if (params.length > 0) {
-    queryString += '?' + params.join('&');
-  }
-  return new Promise((resolve, reject) => {
-    const req = https.request(
-      new URL(`${sfin.baseUrl}/accounts${queryString}`),
-      options,
-      res => {
-        let data = '';
-        res.on('data', d => {
-          data += d;
-        });
-        res.on('end', () => {
-          if (res.statusCode === 403) {
-            reject(new Error('Forbidden'));
-          } else {
-            try {
-              const results = JSON.parse(data);
-              results.sferrors = results.errors;
-              results.hasError = false;
-              results.errors = {};
-              resolve(results);
-            } catch (e) {
-              console.log(`Error parsing JSON response: ${data}`);
-              reject(e);
-            }
-          }
-        });
-      },
-    );
-    req.on('error', e => {
-      reject(e);
-    });
-    req.end();
+  const url = new URL(`${sfin.baseUrl}/accounts`);
+  url.search = params.toString();
+
+  const response = await fetch(url.toString(), {
+    method: 'GET',
+    headers,
+    redirect: 'follow',
   });
+
+  if (response.status === 403) {
+    throw new Error('Forbidden');
+  }
+
+  const text = await response.text();
+  try {
+    const results = JSON.parse(text);
+    results.sferrors = results.errors;
+    results.hasError = false;
+    results.errors = {};
+    return results;
+  } catch (e) {
+    console.log(`Error parsing JSON response: ${text}`);
+    throw e;
+  }
 }

package/src/app-sync/tests/services/files-service.test.js

@@ -33,20 +33,17 @@ describe('FilesService', () => {
     accountDb.mutate('DELETE FROM files');
   };
 
-  beforeAll(done => {
+  beforeAll(() => {
     accountDb = getAccountDb();
     filesService = new FilesService(accountDb);
-    done();
   });
 
-  beforeEach(done => {
+  beforeEach(() => {
     insertToyExampleData();
-    done();
   });
 
-  afterEach(done => {
+  afterEach(() => {
     clearDatabase();
-    done();
   });
 
   test('get should return a file', () => {

package/src/app.js

@@ -108,10 +108,14 @@ function parseHTTPSConfig(value) {
 }
 
 export async function run() {
-  if (config.openId) {
+  const openIdConfig = config?.getProperties()?.openId;
+  if (
+    openIdConfig?.discoveryURL ||
+    openIdConfig?.issuer?.authorization_endpoint
+  ) {
     console.log('OpenID configuration found. Preparing server to use it');
     try {
-      const { error } = await bootstrap({ openId: config.openId }, true);
+      const { error } = await bootstrap({ openId: openIdConfig }, true);
       if (error) {
         console.log(error);
       } else {

package/src/sql/messages.sql

@@ -1,9 +1,9 @@
-
-CREATE TABLE messages_binary
-  (timestamp TEXT PRIMARY KEY,
-   is_encrypted BOOLEAN,
-   content bytea);
-
-CREATE TABLE messages_merkles
-  (id INTEGER PRIMARY KEY,
-   merkle TEXT);
+
+CREATE TABLE messages_binary
+  (timestamp TEXT PRIMARY KEY,
+   is_encrypted BOOLEAN,
+   content bytea);
+
+CREATE TABLE messages_merkles
+  (id INTEGER PRIMARY KEY,
+   merkle TEXT);