A local-first personal finance app
sync-server eslint --fix (#4362)
Matt Fiddamanad58561f4e37
diff --git a/packages/sync-server/migrations/1694360000000-create-folders.js b/packages/sync-server/migrations/1694360000000-create-folders.jsindex 2ba62b8df4..00cdea3478 100644--- a/packages/sync-server/migrations/1694360000000-create-folders.js+++ b/packages/sync-server/migrations/1694360000000-create-folders.js@@ -1,4 +1,5 @@import fs from 'node:fs/promises';+import config from '../src/load-config.js';async function ensureExists(path) {diff --git a/packages/sync-server/migrations/1719409568000-multiuser.js b/packages/sync-server/migrations/1719409568000-multiuser.jsindex 228bcdc89d..59d8e78c71 100644--- a/packages/sync-server/migrations/1719409568000-multiuser.js+++ b/packages/sync-server/migrations/1719409568000-multiuser.js@@ -1,6 +1,7 @@-import getAccountDb from '../src/account-db.js';import * as uuid from 'uuid';+import getAccountDb from '../src/account-db.js';+export const up = async function () {const accountDb = getAccountDb();diff --git a/packages/sync-server/src/account-db.js b/packages/sync-server/src/account-db.jsindex 1e2f22ac43..0ea069a606 100644--- a/packages/sync-server/src/account-db.js+++ b/packages/sync-server/src/account-db.js@@ -1,9 +1,11 @@import { join } from 'node:path';-import openDatabase from './db.js';-import config from './load-config.js';+import * as bcrypt from 'bcrypt';-import { bootstrapPassword, loginWithPassword } from './accounts/password.js';+import { bootstrapOpenId } from './accounts/openid.js';+import { bootstrapPassword, loginWithPassword } from './accounts/password.js';+import openDatabase from './db.js';+import config from './load-config.js';let _accountDb;@@ -17,14 +19,14 @@ export default function getAccountDb() {}export function needsBootstrap() {- let accountDb = getAccountDb();- let rows = accountDb.all('SELECT * FROM auth');+ const accountDb = getAccountDb();+ const rows = accountDb.all('SELECT * FROM auth');return rows.length === 0;}export function listLoginMethods() {- let accountDb = getAccountDb();- let rows = accountDb.all('SELECT method, display_name, active FROM auth');+ const accountDb = getAccountDb();+ const rows = accountDb.all('SELECT method, display_name, active FROM auth');return rows.map(r => ({method: r.method,active: r.active,@@ -33,8 +35,8 @@ export function listLoginMethods() {}export function getActiveLoginMethod() {- let accountDb = getAccountDb();- let { method } =+ const accountDb = getAccountDb();+ const { method } =accountDb.first('SELECT method FROM auth WHERE active = 1') || {};return method;}@@ -97,7 +99,7 @@ export async function bootstrap(loginSettings) {}if (passEnabled) {- let { error } = bootstrapPassword(loginSettings.password);+ const { error } = bootstrapPassword(loginSettings.password);if (error) {accountDb.mutate('ROLLBACK');return { error };@@ -105,7 +107,7 @@ export async function bootstrap(loginSettings) {}if (openIdEnabled) {- let { error } = await bootstrapOpenId(loginSettings.openId);+ const { error } = await bootstrapOpenId(loginSettings.openId);if (error) {accountDb.mutate('ROLLBACK');return { error };@@ -133,7 +135,7 @@ export async function enableOpenID(loginSettings) {return { error: 'invalid-login-settings' };}- let { error } = (await bootstrapOpenId(loginSettings.openId)) || {};+ const { error } = (await bootstrapOpenId(loginSettings.openId)) || {};if (error) {return { error };}@@ -146,7 +148,7 @@ export async function disableOpenID(loginSettings) {return { error: 'invalid-login-settings' };}- let accountDb = getAccountDb();+ const accountDb = getAccountDb();const { extra_data: passwordHash } =accountDb.first('SELECT extra_data FROM auth WHERE method = ?', ['password',@@ -161,14 +163,14 @@ export async function disableOpenID(loginSettings) {}if (passwordHash) {- let confirmed = bcrypt.compareSync(loginSettings.password, passwordHash);+ const confirmed = bcrypt.compareSync(loginSettings.password, passwordHash);if (!confirmed) {return { error: 'invalid-password' };}}- let { error } = (await bootstrapPassword(loginSettings.password)) || {};+ const { error } = (await bootstrapPassword(loginSettings.password)) || {};if (error) {return { error };}@@ -195,17 +197,17 @@ export async function disableOpenID(loginSettings) {}export function getSession(token) {- let accountDb = getAccountDb();+ const accountDb = getAccountDb();return accountDb.first('SELECT * FROM sessions WHERE token = ?', [token]);}export function getUserInfo(userId) {- let accountDb = getAccountDb();+ const accountDb = getAccountDb();return accountDb.first('SELECT * FROM users WHERE id = ?', [userId]);}export function getUserPermission(userId) {- let accountDb = getAccountDb();+ const accountDb = getAccountDb();const { role } = accountDb.first(`SELECT role FROM usersWHERE users.id = ?`,diff --git a/packages/sync-server/src/accounts/openid.js b/packages/sync-server/src/accounts/openid.jsindex 2080a3bcbb..d989966795 100644--- a/packages/sync-server/src/accounts/openid.js+++ b/packages/sync-server/src/accounts/openid.js@@ -1,12 +1,13 @@-import getAccountDb, { clearExpiredSessions } from '../account-db.js';-import * as uuid from 'uuid';import { generators, Issuer } from 'openid-client';+import * as uuid from 'uuid';++import getAccountDb, { clearExpiredSessions } from '../account-db.js';import finalConfig from '../load-config.js';-import { TOKEN_EXPIRATION_NEVER } from '../util/validate-user.js';import {getUserByUsername,transferAllFilesFromUser,} from '../services/user-service.js';+import { TOKEN_EXPIRATION_NEVER } from '../util/validate-user.js';export async function bootstrapOpenId(config) {if (!('issuer' in config)) {@@ -29,7 +30,7 @@ export async function bootstrapOpenId(config) {return { error: 'configuration-error' };}- let accountDb = getAccountDb();+ const accountDb = getAccountDb();try {accountDb.transaction(() => {accountDb.mutate('DELETE FROM auth WHERE method = ?', ['openid']);@@ -48,7 +49,7 @@ export async function bootstrapOpenId(config) {}async function setupOpenIdClient(config) {- let issuer =+ const issuer =typeof config.issuer === 'string'? await Issuer.discover(config.issuer): new Issuer({@@ -79,7 +80,7 @@ export async function loginWithOpenIdSetup(returnUrl) {return { error: 'invalid-return-url' };}- let accountDb = getAccountDb();+ const accountDb = getAccountDb();let config = accountDb.first('SELECT extra_data FROM auth WHERE method = ?', ['openid',]);@@ -137,7 +138,7 @@ export async function loginWithOpenIdFinalize(body) {return { error: 'missing-state' };}- let accountDb = getAccountDb();+ const accountDb = getAccountDb();let config = accountDb.first("SELECT extra_data FROM auth WHERE method = 'openid' AND active = 1",);@@ -158,7 +159,7 @@ export async function loginWithOpenIdFinalize(body) {return { error: 'openid-setup-failed' };}- let pendingRequest = accountDb.first(+ const pendingRequest = accountDb.first('SELECT code_verifier, return_url FROM pending_openid_requests WHERE state = ? AND expiry_time > ?',[body.state, Date.now()],);@@ -167,7 +168,7 @@ export async function loginWithOpenIdFinalize(body) {return { error: 'invalid-or-expired-state' };}- let { code_verifier, return_url } = pendingRequest;+ const { code_verifier, return_url } = pendingRequest;try {let tokenSet = null;@@ -201,7 +202,7 @@ export async function loginWithOpenIdFinalize(body) {let userId = null;try {accountDb.transaction(() => {- let { countUsersWithUserName } = accountDb.first(+ const { countUsersWithUserName } = accountDb.first('SELECT count(*) as countUsersWithUserName FROM users WHERE user_name <> ?',[''],);@@ -230,7 +231,7 @@ export async function loginWithOpenIdFinalize(body) {transferAllFilesFromUser(userId, userFromPasswordMethod.user_id);}} else {- let { id: userIdFromDb, display_name: displayName } =+ const { id: userIdFromDb, display_name: displayName } =accountDb.first('SELECT id, display_name FROM users WHERE user_name = ? and enabled = 1',[identity],diff --git a/packages/sync-server/src/accounts/password.js b/packages/sync-server/src/accounts/password.jsindex e841697a7f..a6fbe869fb 100644--- a/packages/sync-server/src/accounts/password.js+++ b/packages/sync-server/src/accounts/password.js@@ -1,6 +1,7 @@import * as bcrypt from 'bcrypt';-import getAccountDb, { clearExpiredSessions } from '../account-db.js';import * as uuid from 'uuid';++import getAccountDb, { clearExpiredSessions } from '../account-db.js';import finalConfig from '../load-config.js';import { TOKEN_EXPIRATION_NEVER } from '../util/validate-user.js';@@ -17,8 +18,8 @@ export function bootstrapPassword(password) {return { error: 'invalid-password' };}- let hashed = hashPassword(password);- let accountDb = getAccountDb();+ const hashed = hashPassword(password);+ const accountDb = getAccountDb();accountDb.transaction(() => {accountDb.mutate('DELETE FROM auth WHERE method = ?', ['password']);accountDb.mutate('UPDATE auth SET active = 0');@@ -36,7 +37,7 @@ export function loginWithPassword(password) {return { error: 'invalid-password' };}- let accountDb = getAccountDb();+ const accountDb = getAccountDb();const { extra_data: passwordHash } =accountDb.first('SELECT extra_data FROM auth WHERE method = ?', ['password',@@ -46,20 +47,20 @@ export function loginWithPassword(password) {return { error: 'invalid-password' };}- let confirmed = bcrypt.compareSync(password, passwordHash);+ const confirmed = bcrypt.compareSync(password, passwordHash);if (!confirmed) {return { error: 'invalid-password' };}- let sessionRow = accountDb.first(+ const sessionRow = accountDb.first('SELECT * FROM sessions WHERE auth_method = ?',['password'],);- let token = sessionRow ? sessionRow.token : uuid.v4();+ const token = sessionRow ? sessionRow.token : uuid.v4();- let { totalOfUsers } = accountDb.first(+ const { totalOfUsers } = accountDb.first('SELECT count(*) as totalOfUsers FROM users',);let userId = null;@@ -70,7 +71,7 @@ export function loginWithPassword(password) {[userId, '', '', 'ADMIN'],);} else {- let { id: userIdFromDb } = accountDb.first(+ const { id: userIdFromDb } = accountDb.first('SELECT id FROM users WHERE user_name = ?',[''],);@@ -110,13 +111,13 @@ export function loginWithPassword(password) {}export function changePassword(newPassword) {- let accountDb = getAccountDb();+ const accountDb = getAccountDb();if (!isValidPassword(newPassword)) {return { error: 'invalid-password' };}- let hashed = hashPassword(newPassword);+ const hashed = hashPassword(newPassword);accountDb.mutate("UPDATE auth SET extra_data = ? WHERE method = 'password'", [hashed,]);diff --git a/packages/sync-server/src/app-account.js b/packages/sync-server/src/app-account.jsindex d1867d2a49..df31c2ee74 100644--- a/packages/sync-server/src/app-account.js+++ b/packages/sync-server/src/app-account.js@@ -1,9 +1,5 @@import express from 'express';-import {- errorMiddleware,- requestLoggerMiddleware,-} from './util/middlewares.js';-import validateSession, { validateAuthHeader } from './util/validate-user.js';+import {bootstrap,needsBootstrap,@@ -12,10 +8,15 @@ import {getUserInfo,getActiveLoginMethod,} from './account-db.js';-import { changePassword, loginWithPassword } from './accounts/password.js';import { isValidRedirectUrl, loginWithOpenIdSetup } from './accounts/openid.js';+import { changePassword, loginWithPassword } from './accounts/password.js';+import {+ errorMiddleware,+ requestLoggerMiddleware,+} from './util/middlewares.js';+import validateSession, { validateAuthHeader } from './util/validate-user.js';-let app = express();+const app = express();app.use(express.json());app.use(express.urlencoded({ extended: true }));app.use(errorMiddleware);@@ -41,7 +42,7 @@ app.get('/needs-bootstrap', (req, res) => {});app.post('/bootstrap', async (req, res) => {- let boot = await bootstrap(req.body);+ const boot = await bootstrap(req.body);if (boot?.error) {res.status(400).send({ status: 'error', reason: boot?.error });@@ -51,17 +52,17 @@ app.post('/bootstrap', async (req, res) => {});app.get('/login-methods', (req, res) => {- let methods = listLoginMethods();+ const methods = listLoginMethods();res.send({ status: 'ok', methods });});app.post('/login', async (req, res) => {- let loginMethod = getLoginMethod(req);+ const loginMethod = getLoginMethod(req);console.log('Logging in via ' + loginMethod);let tokenRes = null;switch (loginMethod) {case 'header': {- let headerVal = req.get('x-actual-password') || '';+ const headerVal = req.get('x-actual-password') || '';const obfuscated ='*'.repeat(headerVal.length) || 'No password provided.';console.debug('HEADER VALUE: ' + obfuscated);@@ -86,7 +87,7 @@ app.post('/login', async (req, res) => {return;}- let { error, url } = await loginWithOpenIdSetup(req.body.return_url);+ const { error, url } = await loginWithOpenIdSetup(req.body.return_url);if (error) {res.status(400).send({ status: 'error', reason: error });return;@@ -99,7 +100,7 @@ app.post('/login', async (req, res) => {tokenRes = loginWithPassword(req.body.password);break;}- let { error, token } = tokenRes;+ const { error, token } = tokenRes;if (error) {res.status(400).send({ status: 'error', reason: error });@@ -110,10 +111,10 @@ app.post('/login', async (req, res) => {});app.post('/change-password', (req, res) => {- let session = validateSession(req, res);+ const session = validateSession(req, res);if (!session) return;- let { error } = changePassword(req.body.password);+ const { error } = changePassword(req.body.password);if (error) {res.status(400).send({ status: 'error', reason: error });@@ -124,7 +125,7 @@ app.post('/change-password', (req, res) => {});app.get('/validate', (req, res) => {- let session = validateSession(req, res);+ const session = validateSession(req, res);if (session) {const user = getUserInfo(session.user_id);if (!user) {diff --git a/packages/sync-server/src/app-admin.js b/packages/sync-server/src/app-admin.jsindex 97857d9db2..994dbb9659 100644--- a/packages/sync-server/src/app-admin.js+++ b/packages/sync-server/src/app-admin.js@@ -1,15 +1,16 @@import express from 'express';import * as uuid from 'uuid';++import { isAdmin } from './account-db.js';+import * as UserService from './services/user-service.js';import {errorMiddleware,requestLoggerMiddleware,validateSessionMiddleware,} from './util/middlewares.js';import validateSession from './util/validate-user.js';-import { isAdmin } from './account-db.js';-import * as UserService from './services/user-service.js';-let app = express();+const app = express();app.use(express.json());app.use(express.urlencoded({ extended: true }));app.use(requestLoggerMiddleware);@@ -301,7 +302,7 @@ app.delete('/access', (req, res) => {}const ids = req.body.ids;- let totalDeleted = UserService.deleteUserAccessByFileId(ids, fileId);+ const totalDeleted = UserService.deleteUserAccessByFileId(ids, fileId);if (ids.length === totalDeleted) {resdiff --git a/packages/sync-server/src/app-admin.test.js b/packages/sync-server/src/app-admin.test.jsindex 81ab283aa7..95556b1145 100644--- a/packages/sync-server/src/app-admin.test.js+++ b/packages/sync-server/src/app-admin.test.js@@ -1,8 +1,9 @@import request from 'supertest';-import { handlers as app } from './app-admin.js';-import getAccountDb from './account-db.js';import { v4 as uuidv4 } from 'uuid';+import getAccountDb from './account-db.js';+import { handlers as app } from './app-admin.js';+const ADMIN_ROLE = 'ADMIN';const BASIC_ROLE = 'BASIC';diff --git a/packages/sync-server/src/app-gocardless/app-gocardless.js b/packages/sync-server/src/app-gocardless/app-gocardless.jsindex 569a5a69ce..0e3c9e05b2 100644--- a/packages/sync-server/src/app-gocardless/app-gocardless.js+++ b/packages/sync-server/src/app-gocardless/app-gocardless.js@@ -1,21 +1,23 @@-import { isAxiosError } from 'axios';-import express from 'express';import path from 'path';import { inspect } from 'util';-import { goCardlessService } from './services/gocardless-service.js';+import { isAxiosError } from 'axios';+import express from 'express';++import { sha256String } from '../util/hash.js';+import {+ requestLoggerMiddleware,+ validateSessionMiddleware,+} from '../util/middlewares.js';+import {AccountNotLinkedToRequisition,GenericGoCardlessError,RateLimitError,RequisitionNotLinked,} from './errors.js';+import { goCardlessService } from './services/gocardless-service.js';import { handleError } from './util/handle-error.js';-import { sha256String } from '../util/hash.js';-import {- requestLoggerMiddleware,- validateSessionMiddleware,-} from '../util/middlewares.js';const app = express();app.use(requestLoggerMiddleware);@@ -96,7 +98,7 @@ app.post(app.post('/get-banks',handleError(async (req, res) => {- let { country, showDemo = false } = req.body;+ const { country, showDemo = false } = req.body;await goCardlessService.setToken();const data = await goCardlessService.getInstitutions(country);@@ -119,7 +121,7 @@ app.post(app.post('/remove-account',handleError(async (req, res) => {- let { requisitionId } = req.body;+ const { requisitionId } = req.body;const data = await goCardlessService.deleteRequisition(requisitionId);if (data.summary === 'Requisition deleted') {diff --git a/packages/sync-server/src/app-gocardless/banks/abanca_caglesmm.js b/packages/sync-server/src/app-gocardless/banks/abanca_caglesmm.jsindex 905175098c..4562869be6 100644--- a/packages/sync-server/src/app-gocardless/banks/abanca_caglesmm.js+++ b/packages/sync-server/src/app-gocardless/banks/abanca_caglesmm.js@@ -1,7 +1,7 @@-import Fallback from './integration-bank.js';-import { formatPayeeName } from '../../util/payee-name.js';+import Fallback from './integration-bank.js';+/** @type {import('./bank.interface.js').IBank} */export default {...Fallback,diff --git a/packages/sync-server/src/app-gocardless/banks/abnamro_abnanl2a.js b/packages/sync-server/src/app-gocardless/banks/abnamro_abnanl2a.jsindex 817e2a5037..9749c4002b 100644--- a/packages/sync-server/src/app-gocardless/banks/abnamro_abnanl2a.js+++ b/packages/sync-server/src/app-gocardless/banks/abnamro_abnanl2a.js@@ -1,7 +1,7 @@-import Fallback from './integration-bank.js';--import { amountToInteger } from '../utils.js';import { formatPayeeName } from '../../util/payee-name.js';+import { amountToInteger } from '../utils.js';++import Fallback from './integration-bank.js';/** @type {import('./bank.interface.js').IBank} */export default {diff --git a/packages/sync-server/src/app-gocardless/banks/american_express_aesudef1.js b/packages/sync-server/src/app-gocardless/banks/american_express_aesudef1.jsindex 99aa5fe579..418da7bbaf 100644--- a/packages/sync-server/src/app-gocardless/banks/american_express_aesudef1.js+++ b/packages/sync-server/src/app-gocardless/banks/american_express_aesudef1.js@@ -1,7 +1,7 @@-import Fallback from './integration-bank.js';--import { amountToInteger } from '../utils.js';import { formatPayeeName } from '../../util/payee-name.js';+import { amountToInteger } from '../utils.js';++import Fallback from './integration-bank.js';/** @type {import('./bank.interface.js').IBank} */export default {diff --git a/packages/sync-server/src/app-gocardless/banks/bancsabadell_bsabesbbb.js b/packages/sync-server/src/app-gocardless/banks/bancsabadell_bsabesbbb.jsindex 1aa41e911b..723de21c56 100644--- a/packages/sync-server/src/app-gocardless/banks/bancsabadell_bsabesbbb.js+++ b/packages/sync-server/src/app-gocardless/banks/bancsabadell_bsabesbbb.js@@ -1,7 +1,7 @@-import Fallback from './integration-bank.js';-import { formatPayeeName } from '../../util/payee-name.js';+import Fallback from './integration-bank.js';+/** @type {import('./bank.interface.js').IBank} */export default {...Fallback,diff --git a/packages/sync-server/src/app-gocardless/banks/bank.interface.ts b/packages/sync-server/src/app-gocardless/banks/bank.interface.tsindex 18de655238..4fc484d05f 100644--- a/packages/sync-server/src/app-gocardless/banks/bank.interface.ts+++ b/packages/sync-server/src/app-gocardless/banks/bank.interface.ts@@ -1,8 +1,8 @@+import { Transaction, Balance } from '../gocardless-node.types.js';import {DetailedAccountWithInstitution,NormalizedAccountDetails,} from '../gocardless.types.js';-import { Transaction, Balance } from '../gocardless-node.types.js';export interface IBank {institutionIds: string[];diff --git a/packages/sync-server/src/app-gocardless/banks/bankinter_bkbkesmm.js b/packages/sync-server/src/app-gocardless/banks/bankinter_bkbkesmm.jsindex 8d1c329758..0ef9b2106d 100644--- a/packages/sync-server/src/app-gocardless/banks/bankinter_bkbkesmm.js+++ b/packages/sync-server/src/app-gocardless/banks/bankinter_bkbkesmm.js@@ -1,7 +1,7 @@-import Fallback from './integration-bank.js';-import { formatPayeeName } from '../../util/payee-name.js';+import Fallback from './integration-bank.js';+/** @type {import('./bank.interface.js').IBank} */export default {...Fallback,diff --git a/packages/sync-server/src/app-gocardless/banks/belfius_gkccbebb.js b/packages/sync-server/src/app-gocardless/banks/belfius_gkccbebb.jsindex 594689edc7..e5d93e2dc8 100644--- a/packages/sync-server/src/app-gocardless/banks/belfius_gkccbebb.js+++ b/packages/sync-server/src/app-gocardless/banks/belfius_gkccbebb.js@@ -1,7 +1,7 @@-import Fallback from './integration-bank.js';-import { formatPayeeName } from '../../util/payee-name.js';+import Fallback from './integration-bank.js';+/** @type {import('./bank.interface.js').IBank} */export default {...Fallback,diff --git a/packages/sync-server/src/app-gocardless/banks/berliner_sparkasse_beladebexxx.js b/packages/sync-server/src/app-gocardless/banks/berliner_sparkasse_beladebexxx.jsindex a5af45da3a..842bc27de8 100644--- a/packages/sync-server/src/app-gocardless/banks/berliner_sparkasse_beladebexxx.js+++ b/packages/sync-server/src/app-gocardless/banks/berliner_sparkasse_beladebexxx.js@@ -1,7 +1,7 @@-import Fallback from './integration-bank.js';--import { amountToInteger } from '../utils.js';import { formatPayeeName } from '../../util/payee-name.js';+import { amountToInteger } from '../utils.js';++import Fallback from './integration-bank.js';/** @type {import('./bank.interface.js').IBank} */export default {@@ -44,9 +44,10 @@ export default {transaction.remittanceInformationStructuredArray?.join(' ');}- if (transaction.additionalInformation)+ if (transaction.additionalInformation) {remittanceInformationUnstructured +=' ' + transaction.additionalInformation;+ }const usefulCreditorName =transaction.ultimateCreditor ||diff --git a/packages/sync-server/src/app-gocardless/banks/bnp_be_gebabebb.js b/packages/sync-server/src/app-gocardless/banks/bnp_be_gebabebb.jsindex c00601939e..e24a1818fc 100644--- a/packages/sync-server/src/app-gocardless/banks/bnp_be_gebabebb.js+++ b/packages/sync-server/src/app-gocardless/banks/bnp_be_gebabebb.js@@ -1,7 +1,7 @@-import Fallback from './integration-bank.js';-import { formatPayeeName } from '../../util/payee-name.js';+import Fallback from './integration-bank.js';+/** @type {import('./bank.interface.js').IBank} */export default {...Fallback,@@ -28,18 +28,18 @@ export default {let creditorName = transaction.creditorName;if (transaction.additionalInformation) {- let additionalInformationObject = {};+ const additionalInformationObject = {};const additionalInfoRegex = /(, )?([^:]+): ((\[.*?\])|([^,]*))/g;- let matches =+ const matches =transaction.additionalInformation.matchAll(additionalInfoRegex);if (matches) {let creditorNameFromNarrative; // Possible value for creditorName- for (let match of matches) {- let key = match[2].trim();+ for (const match of matches) {+ const key = match[2].trim();let value = (match[4] || match[5]).trim();if (key === 'narrative') {// Set narrativeName to the first element in the "narrative" array.- let first_value = value.matchAll(/'(.+?)'/g)?.next().value;+ const first_value = value.matchAll(/'(.+?)'/g)?.next().value;creditorNameFromNarrative = first_value? first_value[1].trim(): undefined;diff --git a/packages/sync-server/src/app-gocardless/banks/cbc_cregbebb.js b/packages/sync-server/src/app-gocardless/banks/cbc_cregbebb.jsindex bf881dacf3..b8e3bec7e6 100644--- a/packages/sync-server/src/app-gocardless/banks/cbc_cregbebb.js+++ b/packages/sync-server/src/app-gocardless/banks/cbc_cregbebb.js@@ -1,5 +1,5 @@-import { extractPayeeNameFromRemittanceInfo } from './util/extract-payeeName-from-remittanceInfo.js';import Fallback from './integration-bank.js';+import { extractPayeeNameFromRemittanceInfo } from './util/extract-payeeName-from-remittanceInfo.js';/** @type {import('./bank.interface.js').IBank} */export default {diff --git a/packages/sync-server/src/app-gocardless/banks/commerzbank_cobadeff.js b/packages/sync-server/src/app-gocardless/banks/commerzbank_cobadeff.jsindex e772796a06..d58b98a191 100644--- a/packages/sync-server/src/app-gocardless/banks/commerzbank_cobadeff.js+++ b/packages/sync-server/src/app-gocardless/banks/commerzbank_cobadeff.js@@ -1,6 +1,7 @@-import Fallback from './integration-bank.js';import { formatPayeeName } from '../../util/payee-name.js';+import Fallback from './integration-bank.js';+/** @type {import('./bank.interface.js').IBank} */export default {...Fallback,diff --git a/packages/sync-server/src/app-gocardless/banks/danskebank_dabno22.js b/packages/sync-server/src/app-gocardless/banks/danskebank_dabno22.jsindex 78e657caf8..215925dfa2 100644--- a/packages/sync-server/src/app-gocardless/banks/danskebank_dabno22.js+++ b/packages/sync-server/src/app-gocardless/banks/danskebank_dabno22.js@@ -1,7 +1,7 @@-import Fallback from './integration-bank.js';--import { amountToInteger } from '../utils.js';import { formatPayeeName } from '../../util/payee-name.js';+import { amountToInteger } from '../utils.js';++import Fallback from './integration-bank.js';/** @type {import('./bank.interface.js').IBank} */export default {diff --git a/packages/sync-server/src/app-gocardless/banks/easybank_bawaatww.js b/packages/sync-server/src/app-gocardless/banks/easybank_bawaatww.jsindex 635cbf33f7..48523b783f 100644--- a/packages/sync-server/src/app-gocardless/banks/easybank_bawaatww.js+++ b/packages/sync-server/src/app-gocardless/banks/easybank_bawaatww.js@@ -1,9 +1,10 @@-import Fallback from './integration-bank.js';+import d from 'date-fns';import { formatPayeeName } from '../../util/payee-name.js';-import d from 'date-fns';import { title } from '../../util/title/index.js';+import Fallback from './integration-bank.js';+/** @type {import('./bank.interface.js').IBank} */export default {...Fallback,@@ -35,7 +36,7 @@ export default {return {...transaction,- payeeName: payeeName,+ payeeName,date: d.format(d.parseISO(date), 'yyyy-MM-dd'),};},diff --git a/packages/sync-server/src/app-gocardless/banks/entercard_swednokk.js b/packages/sync-server/src/app-gocardless/banks/entercard_swednokk.jsindex 2e0f413a0b..0cfa09797c 100644--- a/packages/sync-server/src/app-gocardless/banks/entercard_swednokk.js+++ b/packages/sync-server/src/app-gocardless/banks/entercard_swednokk.js@@ -1,9 +1,9 @@import * as d from 'date-fns';-import Fallback from './integration-bank.js';--import { amountToInteger } from '../utils.js';import { formatPayeeName } from '../../util/payee-name.js';+import { amountToInteger } from '../utils.js';++import Fallback from './integration-bank.js';/** @type {import('./bank.interface.js').IBank} */export default {diff --git a/packages/sync-server/src/app-gocardless/banks/fortuneo_ftnofrp1xxx.js b/packages/sync-server/src/app-gocardless/banks/fortuneo_ftnofrp1xxx.jsindex c695c0f1fa..3dab221946 100644--- a/packages/sync-server/src/app-gocardless/banks/fortuneo_ftnofrp1xxx.js+++ b/packages/sync-server/src/app-gocardless/banks/fortuneo_ftnofrp1xxx.js@@ -1,6 +1,8 @@+import * as d from 'date-fns';+import { formatPayeeName } from '../../util/payee-name.js';+import Fallback from './integration-bank.js';-import * as d from 'date-fns';/** @type {import('./bank.interface.js').IBank} */export default {diff --git a/packages/sync-server/src/app-gocardless/banks/hype_hyeeit22.js b/packages/sync-server/src/app-gocardless/banks/hype_hyeeit22.jsindex fdbfc02187..c277620c79 100644--- a/packages/sync-server/src/app-gocardless/banks/hype_hyeeit22.js+++ b/packages/sync-server/src/app-gocardless/banks/hype_hyeeit22.js@@ -1,7 +1,7 @@-import Fallback from './integration-bank.js';-import { formatPayeeName } from '../../util/payee-name.js';+import Fallback from './integration-bank.js';+/** @type {import('./bank.interface.js').IBank} */export default {...Fallback,@@ -30,7 +30,7 @@ export default {) {// keep only {payment_info} portion of remittance info// NOTE: if {payee_name} contains dashes (unlikely / impossible?), this probably gets bugged!- let infoIdx =+ const infoIdx =transaction.remittanceInformationUnstructured.indexOf(' - ') + 3;transaction.remittanceInformationUnstructured =infoIdx == -1@@ -51,7 +51,7 @@ export default {let codepoints = [];while (idx !== -1) {codepoints.push(parseInt(str.slice(idx + 2, idx + 6), 16));- let next_idx = str.indexOf('\\U', idx + 6);+ const next_idx = str.indexOf('\\U', idx + 6);if (next_idx == idx + 6) {idx = next_idx;continue;diff --git a/packages/sync-server/src/app-gocardless/banks/ing_ingddeff.js b/packages/sync-server/src/app-gocardless/banks/ing_ingddeff.jsindex e44c027f18..9d4ea894b7 100644--- a/packages/sync-server/src/app-gocardless/banks/ing_ingddeff.js+++ b/packages/sync-server/src/app-gocardless/banks/ing_ingddeff.js@@ -1,7 +1,7 @@-import Fallback from './integration-bank.js';--import { amountToInteger } from '../utils.js';import { formatPayeeName } from '../../util/payee-name.js';+import { amountToInteger } from '../utils.js';++import Fallback from './integration-bank.js';/** @type {import('./bank.interface.js').IBank} */export default {diff --git a/packages/sync-server/src/app-gocardless/banks/ing_pl_ingbplpw.js b/packages/sync-server/src/app-gocardless/banks/ing_pl_ingbplpw.jsindex a4b3a8d493..5e7ead0f85 100644--- a/packages/sync-server/src/app-gocardless/banks/ing_pl_ingbplpw.js+++ b/packages/sync-server/src/app-gocardless/banks/ing_pl_ingbplpw.js@@ -1,7 +1,7 @@-import Fallback from './integration-bank.js';--import { amountToInteger } from '../utils.js';import { formatPayeeName } from '../../util/payee-name.js';+import { amountToInteger } from '../utils.js';++import Fallback from './integration-bank.js';/** @type {import('./bank.interface.js').IBank} */export default {diff --git a/packages/sync-server/src/app-gocardless/banks/integration-bank.js b/packages/sync-server/src/app-gocardless/banks/integration-bank.jsindex b0ed37a354..a4cd882a09 100644--- a/packages/sync-server/src/app-gocardless/banks/integration-bank.js+++ b/packages/sync-server/src/app-gocardless/banks/integration-bank.js@@ -1,10 +1,11 @@import * as d from 'date-fns';++import { formatPayeeName } from '../../util/payee-name.js';import {amountToInteger,printIban,sortByBookingDateOrValueDate,} from '../utils.js';-import { formatPayeeName } from '../../util/payee-name.js';const SORTED_BALANCE_TYPE_LIST = ['closingBooked',diff --git a/packages/sync-server/src/app-gocardless/banks/kbc_kredbebb.js b/packages/sync-server/src/app-gocardless/banks/kbc_kredbebb.jsindex 7397340732..bd9df6f90a 100644--- a/packages/sync-server/src/app-gocardless/banks/kbc_kredbebb.js+++ b/packages/sync-server/src/app-gocardless/banks/kbc_kredbebb.js@@ -1,5 +1,5 @@-import { extractPayeeNameFromRemittanceInfo } from './util/extract-payeeName-from-remittanceInfo.js';import Fallback from './integration-bank.js';+import { extractPayeeNameFromRemittanceInfo } from './util/extract-payeeName-from-remittanceInfo.js';/** @type {import('./bank.interface.js').IBank} */export default {diff --git a/packages/sync-server/src/app-gocardless/banks/mbank_retail_brexplpw.js b/packages/sync-server/src/app-gocardless/banks/mbank_retail_brexplpw.jsindex 121631e487..7338b35ec8 100644--- a/packages/sync-server/src/app-gocardless/banks/mbank_retail_brexplpw.js+++ b/packages/sync-server/src/app-gocardless/banks/mbank_retail_brexplpw.js@@ -1,7 +1,7 @@-import Fallback from './integration-bank.js';--import { amountToInteger } from '../utils.js';import { formatPayeeName } from '../../util/payee-name.js';+import { amountToInteger } from '../utils.js';++import Fallback from './integration-bank.js';/** @type {import('./bank.interface.js').IBank} */export default {diff --git a/packages/sync-server/src/app-gocardless/banks/nbg_ethngraaxxx.js b/packages/sync-server/src/app-gocardless/banks/nbg_ethngraaxxx.jsindex 4fc5a9c6f5..8bce27d75d 100644--- a/packages/sync-server/src/app-gocardless/banks/nbg_ethngraaxxx.js+++ b/packages/sync-server/src/app-gocardless/banks/nbg_ethngraaxxx.js@@ -1,7 +1,7 @@-import Fallback from './integration-bank.js';--import { amountToInteger } from '../utils.js';import { formatPayeeName } from '../../util/payee-name.js';+import { amountToInteger } from '../utils.js';++import Fallback from './integration-bank.js';/** @type {import('./bank.interface.js').IBank} */export default {diff --git a/packages/sync-server/src/app-gocardless/banks/norwegian_xx_norwnok1.js b/packages/sync-server/src/app-gocardless/banks/norwegian_xx_norwnok1.jsindex 82d4693d69..05c3498da5 100644--- a/packages/sync-server/src/app-gocardless/banks/norwegian_xx_norwnok1.js+++ b/packages/sync-server/src/app-gocardless/banks/norwegian_xx_norwnok1.js@@ -1,7 +1,7 @@-import Fallback from './integration-bank.js';--import { amountToInteger } from '../utils.js';import { formatPayeeName } from '../../util/payee-name.js';+import { amountToInteger } from '../utils.js';++import Fallback from './integration-bank.js';/** @type {import('./bank.interface.js').IBank} */export default {diff --git a/packages/sync-server/src/app-gocardless/banks/revolut_revolt21.js b/packages/sync-server/src/app-gocardless/banks/revolut_revolt21.jsindex c2c4408419..1e25618c8b 100644--- a/packages/sync-server/src/app-gocardless/banks/revolut_revolt21.js+++ b/packages/sync-server/src/app-gocardless/banks/revolut_revolt21.js@@ -1,5 +1,7 @@-import { formatPayeeName } from '../../util/payee-name.js';import * as d from 'date-fns';++import { formatPayeeName } from '../../util/payee-name.js';+import Fallback from './integration-bank.js';/** @type {import('./bank.interface.js').IBank} */diff --git a/packages/sync-server/src/app-gocardless/banks/sandboxfinance_sfin0000.js b/packages/sync-server/src/app-gocardless/banks/sandboxfinance_sfin0000.jsindex 72c9442701..5e61ccbd83 100644--- a/packages/sync-server/src/app-gocardless/banks/sandboxfinance_sfin0000.js+++ b/packages/sync-server/src/app-gocardless/banks/sandboxfinance_sfin0000.js@@ -1,7 +1,7 @@-import Fallback from './integration-bank.js';--import { amountToInteger } from '../utils.js';import { formatPayeeName } from '../../util/payee-name.js';+import { amountToInteger } from '../utils.js';++import Fallback from './integration-bank.js';/** @type {import('./bank.interface.js').IBank} */export default {diff --git a/packages/sync-server/src/app-gocardless/banks/seb_kort_bank_ab.js b/packages/sync-server/src/app-gocardless/banks/seb_kort_bank_ab.jsindex e6734dc294..2db12b4eea 100644--- a/packages/sync-server/src/app-gocardless/banks/seb_kort_bank_ab.js+++ b/packages/sync-server/src/app-gocardless/banks/seb_kort_bank_ab.js@@ -1,7 +1,7 @@-import Fallback from './integration-bank.js';--import { amountToInteger } from '../utils.js';import { formatPayeeName } from '../../util/payee-name.js';+import { amountToInteger } from '../utils.js';++import Fallback from './integration-bank.js';/** @type {import('./bank.interface.js').IBank} */export default {diff --git a/packages/sync-server/src/app-gocardless/banks/seb_privat.js b/packages/sync-server/src/app-gocardless/banks/seb_privat.jsindex 57863e40cf..c4baf7f422 100644--- a/packages/sync-server/src/app-gocardless/banks/seb_privat.js+++ b/packages/sync-server/src/app-gocardless/banks/seb_privat.js@@ -1,8 +1,9 @@-import Fallback from './integration-bank.js';-import * as d from 'date-fns';-import { amountToInteger } from '../utils.js';+import { formatPayeeName } from '../../util/payee-name.js';+import { amountToInteger } from '../utils.js';++import Fallback from './integration-bank.js';/** @type {import('./bank.interface.js').IBank} */export default {diff --git a/packages/sync-server/src/app-gocardless/banks/sparnord_spnodk22.js b/packages/sync-server/src/app-gocardless/banks/sparnord_spnodk22.jsindex 5b3179cfe0..7364d8c564 100644--- a/packages/sync-server/src/app-gocardless/banks/sparnord_spnodk22.js+++ b/packages/sync-server/src/app-gocardless/banks/sparnord_spnodk22.js@@ -1,7 +1,7 @@-import Fallback from './integration-bank.js';-import { formatPayeeName } from '../../util/payee-name.js';+import Fallback from './integration-bank.js';+/** @type {import('./bank.interface.js').IBank} */export default {...Fallback,diff --git a/packages/sync-server/src/app-gocardless/banks/spk_karlsruhe_karsde66.js b/packages/sync-server/src/app-gocardless/banks/spk_karlsruhe_karsde66.jsindex 0dc1b352fb..c3c2f1d378 100644--- a/packages/sync-server/src/app-gocardless/banks/spk_karlsruhe_karsde66.js+++ b/packages/sync-server/src/app-gocardless/banks/spk_karlsruhe_karsde66.js@@ -1,7 +1,7 @@-import Fallback from './integration-bank.js';--import { amountToInteger } from '../utils.js';import { formatPayeeName } from '../../util/payee-name.js';+import { amountToInteger } from '../utils.js';++import Fallback from './integration-bank.js';/** @type {import('./bank.interface.js').IBank} */export default {@@ -44,9 +44,10 @@ export default {transaction.remittanceInformationStructuredArray?.join(' ');}- if (transaction.additionalInformation)+ if (transaction.additionalInformation) {remittanceInformationUnstructured +=' ' + transaction.additionalInformation;+ }const usefulCreditorName =transaction.ultimateCreditor ||diff --git a/packages/sync-server/src/app-gocardless/banks/spk_marburg_biedenkopf_heladef1mar.js b/packages/sync-server/src/app-gocardless/banks/spk_marburg_biedenkopf_heladef1mar.jsindex 00b4fbe222..9dea0dafc1 100644--- a/packages/sync-server/src/app-gocardless/banks/spk_marburg_biedenkopf_heladef1mar.js+++ b/packages/sync-server/src/app-gocardless/banks/spk_marburg_biedenkopf_heladef1mar.js@@ -1,9 +1,9 @@import d from 'date-fns';-import Fallback from './integration-bank.js';-import { formatPayeeName } from '../../util/payee-name.js';+import Fallback from './integration-bank.js';+/** @type {import('./bank.interface.js').IBank} */export default {...Fallback,diff --git a/packages/sync-server/src/app-gocardless/banks/spk_worms_alzey_ried_malade51wor.js b/packages/sync-server/src/app-gocardless/banks/spk_worms_alzey_ried_malade51wor.jsindex d2c153c505..dbc1b1f90b 100644--- a/packages/sync-server/src/app-gocardless/banks/spk_worms_alzey_ried_malade51wor.js+++ b/packages/sync-server/src/app-gocardless/banks/spk_worms_alzey_ried_malade51wor.js@@ -1,7 +1,7 @@-import Fallback from './integration-bank.js';-import { formatPayeeName } from '../../util/payee-name.js';+import Fallback from './integration-bank.js';+/** @type {import('./bank.interface.js').IBank} */export default {...Fallback,diff --git a/packages/sync-server/src/app-gocardless/banks/ssk_dusseldorf_dussdeddxxx.js b/packages/sync-server/src/app-gocardless/banks/ssk_dusseldorf_dussdeddxxx.jsindex b196afe443..b4c6dc2b17 100644--- a/packages/sync-server/src/app-gocardless/banks/ssk_dusseldorf_dussdeddxxx.js+++ b/packages/sync-server/src/app-gocardless/banks/ssk_dusseldorf_dussdeddxxx.js@@ -25,13 +25,14 @@ export default {transaction.remittanceInformationStructured ??transaction.remittanceInformationStructuredArray?.join(' ');- if (transaction.additionalInformation)+ if (transaction.additionalInformation) {remittanceInformationUnstructured = [remittanceInformationUnstructured,transaction.additionalInformation,].filter(Boolean).join(' ');+ }const usefulCreditorName =transaction.ultimateCreditor ||diff --git a/packages/sync-server/src/app-gocardless/banks/tests/abanca_caglesmm.spec.js b/packages/sync-server/src/app-gocardless/banks/tests/abanca_caglesmm.spec.jsindex 3ceb0817c3..bdcaa3e0f3 100644--- a/packages/sync-server/src/app-gocardless/banks/tests/abanca_caglesmm.spec.js+++ b/packages/sync-server/src/app-gocardless/banks/tests/abanca_caglesmm.spec.js@@ -1,5 +1,5 @@-import Abanca from '../abanca_caglesmm.js';import { mockTransactionAmount } from '../../services/tests/fixtures.js';+import Abanca from '../abanca_caglesmm.js';describe('Abanca', () => {describe('#normalizeTransaction', () => {diff --git a/packages/sync-server/src/app-gocardless/banks/tests/belfius_gkccbebb.spec.js b/packages/sync-server/src/app-gocardless/banks/tests/belfius_gkccbebb.spec.jsindex 25291a6a89..da9d5530d6 100644--- a/packages/sync-server/src/app-gocardless/banks/tests/belfius_gkccbebb.spec.js+++ b/packages/sync-server/src/app-gocardless/banks/tests/belfius_gkccbebb.spec.js@@ -1,5 +1,5 @@-import Belfius from '../belfius_gkccbebb.js';import { mockTransactionAmount } from '../../services/tests/fixtures.js';+import Belfius from '../belfius_gkccbebb.js';describe('Belfius', () => {describe('#normalizeTransaction', () => {diff --git a/packages/sync-server/src/app-gocardless/banks/tests/easybank_bawaatww.spec.js b/packages/sync-server/src/app-gocardless/banks/tests/easybank_bawaatww.spec.jsindex c55be72a91..31bb708fb0 100644--- a/packages/sync-server/src/app-gocardless/banks/tests/easybank_bawaatww.spec.js+++ b/packages/sync-server/src/app-gocardless/banks/tests/easybank_bawaatww.spec.js@@ -1,5 +1,5 @@-import EasybankBawaatww from '../easybank_bawaatww.js';import { mockTransactionAmount } from '../../services/tests/fixtures.js';+import EasybankBawaatww from '../easybank_bawaatww.js';describe('easybank', () => {describe('#normalizeTransaction', () => {diff --git a/packages/sync-server/src/app-gocardless/banks/tests/ing_pl_ingbplpw.spec.js b/packages/sync-server/src/app-gocardless/banks/tests/ing_pl_ingbplpw.spec.jsindex a61d580ee2..72665cc535 100644--- a/packages/sync-server/src/app-gocardless/banks/tests/ing_pl_ingbplpw.spec.js+++ b/packages/sync-server/src/app-gocardless/banks/tests/ing_pl_ingbplpw.spec.js@@ -1,5 +1,5 @@-import IngPlIngbplpw from '../ing_pl_ingbplpw.js';import { mockTransactionAmount } from '../../services/tests/fixtures.js';+import IngPlIngbplpw from '../ing_pl_ingbplpw.js';describe('IngPlIngbplpw', () => {describe('#normalizeAccount', () => {diff --git a/packages/sync-server/src/app-gocardless/banks/tests/integration_bank.spec.js b/packages/sync-server/src/app-gocardless/banks/tests/integration_bank.spec.jsindex a73da647cb..d41d7c8902 100644--- a/packages/sync-server/src/app-gocardless/banks/tests/integration_bank.spec.js+++ b/packages/sync-server/src/app-gocardless/banks/tests/integration_bank.spec.js@@ -1,9 +1,10 @@import { jest } from '@jest/globals';-import IntegrationBank from '../integration-bank.js';+import {mockExtendAccountsAboutInstitutions,mockInstitution,} from '../../services/tests/fixtures.js';+import IntegrationBank from '../integration-bank.js';describe('IntegrationBank', () => {let consoleSpy;diff --git a/packages/sync-server/src/app-gocardless/banks/tests/nationwide_naiagb21.spec.js b/packages/sync-server/src/app-gocardless/banks/tests/nationwide_naiagb21.spec.jsindex 9e95c85f41..b52ee0429b 100644--- a/packages/sync-server/src/app-gocardless/banks/tests/nationwide_naiagb21.spec.js+++ b/packages/sync-server/src/app-gocardless/banks/tests/nationwide_naiagb21.spec.js@@ -1,5 +1,5 @@-import Nationwide from '../nationwide_naiagb21.js';import { mockTransactionAmount } from '../../services/tests/fixtures.js';+import Nationwide from '../nationwide_naiagb21.js';describe('Nationwide', () => {describe('#normalizeTransaction', () => {diff --git a/packages/sync-server/src/app-gocardless/banks/tests/ssk_dusseldorf_dussdeddxxx.spec.js b/packages/sync-server/src/app-gocardless/banks/tests/ssk_dusseldorf_dussdeddxxx.spec.jsindex d04f8daeae..0781c89932 100644--- a/packages/sync-server/src/app-gocardless/banks/tests/ssk_dusseldorf_dussdeddxxx.spec.js+++ b/packages/sync-server/src/app-gocardless/banks/tests/ssk_dusseldorf_dussdeddxxx.spec.js@@ -1,4 +1,5 @@import { jest } from '@jest/globals';+import SskDusseldorfDussdeddxxx from '../ssk_dusseldorf_dussdeddxxx.js';describe('ssk_dusseldorf_dussdeddxxx', () => {diff --git a/packages/sync-server/src/app-gocardless/banks/tests/virgin_nrnbgb22.spec.js b/packages/sync-server/src/app-gocardless/banks/tests/virgin_nrnbgb22.spec.jsindex c6cb6b26cc..e4f6f52d65 100644--- a/packages/sync-server/src/app-gocardless/banks/tests/virgin_nrnbgb22.spec.js+++ b/packages/sync-server/src/app-gocardless/banks/tests/virgin_nrnbgb22.spec.js@@ -1,5 +1,5 @@-import Virgin from '../virgin_nrnbgb22.js';import { mockTransactionAmount } from '../../services/tests/fixtures.js';+import Virgin from '../virgin_nrnbgb22.js';describe('Virgin', () => {describe('#normalizeTransaction', () => {diff --git a/packages/sync-server/src/app-gocardless/services/gocardless-service.js b/packages/sync-server/src/app-gocardless/services/gocardless-service.jsindex 755e63c78a..8c1a2d765b 100644--- a/packages/sync-server/src/app-gocardless/services/gocardless-service.js+++ b/packages/sync-server/src/app-gocardless/services/gocardless-service.js@@ -1,3 +1,8 @@+import jwt from 'jws';+import * as nordigenNode from 'nordigen-node';+import * as uuid from 'uuid';++import { SecretName, secretsService } from '../../services/secrets-service.js';import BankFactory, { BANKS_WITH_LIMITED_HISTORY } from '../bank-factory.js';import {AccessDeniedError,@@ -12,10 +17,6 @@ import {ServiceError,UnknownError,} from '../errors.js';-import * as nordigenNode from 'nordigen-node';-import * as uuid from 'uuid';-import jwt from 'jws';-import { SecretName, secretsService } from '../../services/secrets-service.js';const GoCardlessClient = nordigenNode.default;@@ -145,7 +146,7 @@ export const goCardlessService = {const requisition =await goCardlessService.getLinkedRequisition(requisitionId);- let institutionIdSet = new Set();+ const institutionIdSet = new Set();const detailedAccounts = await Promise.all(requisition.accounts.map(async accountId => {const account = await goCardlessService.getDetailedAccount(accountId);diff --git a/packages/sync-server/src/app-gocardless/services/tests/gocardless-service.spec.js b/packages/sync-server/src/app-gocardless/services/tests/gocardless-service.spec.jsindex 081fc85e04..a96d765a1b 100644--- a/packages/sync-server/src/app-gocardless/services/tests/gocardless-service.spec.js+++ b/packages/sync-server/src/app-gocardless/services/tests/gocardless-service.spec.js@@ -1,4 +1,5 @@import { jest } from '@jest/globals';+import {AccessDeniedError,AccountNotLinkedToRequisition,@@ -12,6 +13,11 @@ import {ServiceError,UnknownError,} from '../../errors.js';+import {+ goCardlessService,+ handleGoCardlessError,+ client,+} from '../gocardless-service.js';import {mockedBalances,@@ -29,12 +35,6 @@ import {mockExtendAccountsAboutInstitutions,} from './fixtures.js';-import {- goCardlessService,- handleGoCardlessError,- client,-} from '../gocardless-service.js';-describe('goCardlessService', () => {const accountId = mockAccountMetaData.id;const requisitionId = mockRequisition.id;diff --git a/packages/sync-server/src/app-gocardless/tests/bank-factory.spec.js b/packages/sync-server/src/app-gocardless/tests/bank-factory.spec.jsindex a8ed6d0225..6874f35075 100644--- a/packages/sync-server/src/app-gocardless/tests/bank-factory.spec.js+++ b/packages/sync-server/src/app-gocardless/tests/bank-factory.spec.js@@ -1,5 +1,4 @@-import BankFactory from '../bank-factory.js';-import { banks } from '../bank-factory.js';+import BankFactory, { banks } from '../bank-factory.js';import IntegrationBank from '../banks/integration-bank.js';describe('BankFactory', () => {diff --git a/packages/sync-server/src/app-openid.js b/packages/sync-server/src/app-openid.jsindex 487c268b86..65f5d54a50 100644--- a/packages/sync-server/src/app-openid.js+++ b/packages/sync-server/src/app-openid.js@@ -1,17 +1,18 @@import express from 'express';-import {- errorMiddleware,- requestLoggerMiddleware,- validateSessionMiddleware,-} from './util/middlewares.js';+import { disableOpenID, enableOpenID, isAdmin } from './account-db.js';import {isValidRedirectUrl,loginWithOpenIdFinalize,} from './accounts/openid.js';import * as UserService from './services/user-service.js';+import {+ errorMiddleware,+ requestLoggerMiddleware,+ validateSessionMiddleware,+} from './util/middlewares.js';-let app = express();+const app = express();app.use(express.json());app.use(express.urlencoded({ extended: true }));app.use(requestLoggerMiddleware);@@ -27,7 +28,7 @@ app.post('/enable', validateSessionMiddleware, async (req, res) => {return;}- let { error } = (await enableOpenID(req.body)) || {};+ const { error } = (await enableOpenID(req.body)) || {};if (error) {res.status(500).send({ status: 'error', reason: error });@@ -46,7 +47,7 @@ app.post('/disable', validateSessionMiddleware, async (req, res) => {return;}- let { error } = (await disableOpenID(req.body)) || {};+ const { error } = (await disableOpenID(req.body)) || {};if (error) {res.status(401).send({ status: 'error', reason: error });@@ -83,7 +84,7 @@ app.get('/config', async (req, res) => {});app.get('/callback', async (req, res) => {- let { error, url } = await loginWithOpenIdFinalize(req.query);+ const { error, url } = await loginWithOpenIdFinalize(req.query);if (error) {res.status(400).send({ status: 'error', reason: error });diff --git a/packages/sync-server/src/app-secrets.js b/packages/sync-server/src/app-secrets.jsindex 3c06bf8a08..c1a57989f0 100644--- a/packages/sync-server/src/app-secrets.js+++ b/packages/sync-server/src/app-secrets.js@@ -1,6 +1,7 @@import express from 'express';-import { secretsService } from './services/secrets-service.js';+import getAccountDb, { isAdmin } from './account-db.js';+import { secretsService } from './services/secrets-service.js';import {requestLoggerMiddleware,validateSessionMiddleware,@@ -31,7 +32,7 @@ app.post('/', async (req, res) => {const { name, value } = req.body;if (method === 'openid') {- let canSaveSecrets = isAdmin(res.locals.user_id);+ const canSaveSecrets = isAdmin(res.locals.user_id);if (!canSaveSecrets) {res.status(403).send({diff --git a/packages/sync-server/src/app-simplefin/app-simplefin.js b/packages/sync-server/src/app-simplefin/app-simplefin.jsindex 50ad78fafe..facca196d3 100644--- a/packages/sync-server/src/app-simplefin/app-simplefin.js+++ b/packages/sync-server/src/app-simplefin/app-simplefin.js@@ -1,7 +1,9 @@-import express from 'express';import https from 'https';-import { SecretName, secretsService } from '../services/secrets-service.js';++import express from 'express';+import { handleError } from '../app-gocardless/util/handle-error.js';+import { SecretName, secretsService } from '../services/secrets-service.js';import { requestLoggerMiddleware } from '../util/middlewares.js';const app = express();@@ -18,7 +20,7 @@ app.post(res.send({status: 'ok',data: {- configured: configured,+ configured,},});}),@@ -149,8 +151,9 @@ function getAccountResponse(results, accountId, startDate) {console.log(`The account "${accountId}" was not found. Here were the accounts returned:`,);- if (results?.accounts)+ if (results?.accounts) {results.accounts.forEach(a => console.log(`${a.id} - ${a.org.name}`));+ }logAccountError(results, accountId, {error_type: 'ACCOUNT_MISSING',error_code: 'ACCOUNT_MISSING',@@ -291,9 +294,9 @@ function parseAccessKey(accessKey) {[username, password] = auth.split(':');baseUrl = `${scheme}//${rest}`;return {- baseUrl: baseUrl,- username: username,- password: password,+ baseUrl,+ username,+ password,};}diff --git a/packages/sync-server/src/app-sync.js b/packages/sync-server/src/app-sync.jsindex c84882d85e..20e3f11485 100644--- a/packages/sync-server/src/app-sync.js+++ b/packages/sync-server/src/app-sync.js@@ -1,28 +1,28 @@-import fs from 'node:fs/promises';import { Buffer } from 'node:buffer';+import fs from 'node:fs/promises';++import { SyncProtoBuf } from '@actual-app/crdt';import express from 'express';import * as uuid from 'uuid';-import {- errorMiddleware,- requestLoggerMiddleware,- validateSessionMiddleware,-} from './util/middlewares.js';-import { getPathForUserFile, getPathForGroupFile } from './util/paths.js';--import * as simpleSync from './sync-simple.js';-import { SyncProtoBuf } from '@actual-app/crdt';import getAccountDb from './account-db.js';+import { FileNotFound } from './app-sync/errors.js';import {File,FilesService,FileUpdate,} from './app-sync/services/files-service.js';-import { FileNotFound } from './app-sync/errors.js';import {validateSyncedFile,validateUploadedFile,} from './app-sync/validation.js';+import * as simpleSync from './sync-simple.js';+import {+ errorMiddleware,+ requestLoggerMiddleware,+ validateSessionMiddleware,+} from './util/middlewares.js';+import { getPathForUserFile, getPathForGroupFile } from './util/paths.js';const app = express();app.use(validateSessionMiddleware);@@ -66,11 +66,11 @@ app.post('/sync', async (req, res) => {return;}- let fileId = requestPb.getFileid() || null;- let groupId = requestPb.getGroupid() || null;- let keyId = requestPb.getKeyid() || null;- let since = requestPb.getSince() || null;- let messages = requestPb.getMessagesList();+ const fileId = requestPb.getFileid() || null;+ const groupId = requestPb.getGroupid() || null;+ const keyId = requestPb.getKeyid() || null;+ const since = requestPb.getSince() || null;+ const messages = requestPb.getMessagesList();if (!since) {return res.status(422).send({@@ -100,10 +100,10 @@ app.post('/sync', async (req, res) => {return;}- let { trie, newMessages } = simpleSync.sync(messages, since, groupId);+ const { trie, newMessages } = simpleSync.sync(messages, since, groupId);// encode it back...- let responsePb = new SyncProtoBuf.SyncResponse();+ const responsePb = new SyncProtoBuf.SyncResponse();responsePb.setMerkle(JSON.stringify(trie));newMessages.forEach(msg => responsePb.addMessages(msg));@@ -115,7 +115,7 @@ app.post('/sync', async (req, res) => {app.post('/user-get-key', (req, res) => {if (!res.locals) return;- let { fileId } = req.body;+ const { fileId } = req.body;const filesService = new FilesService(getAccountDb());const file = verifyFileExists(fileId, filesService, res, 'file-not-found');@@ -135,7 +135,7 @@ app.post('/user-get-key', (req, res) => {});app.post('/user-create-key', (req, res) => {- let { fileId, keyId, keySalt, testContent } = req.body;+ const { fileId, keyId, keySalt, testContent } = req.body;const filesService = new FilesService(getAccountDb());@@ -156,7 +156,7 @@ app.post('/user-create-key', (req, res) => {});app.post('/reset-user-file', async (req, res) => {- let { fileId } = req.body;+ const { fileId } = req.body;const filesService = new FilesService(getAccountDb());const file = verifyFileExists(@@ -193,8 +193,8 @@ app.post('/upload-user-file', async (req, res) => {return;}- let name = decodeURIComponent(req.headers['x-actual-name']);- let fileId = req.headers['x-actual-file-id'];+ const name = decodeURIComponent(req.headers['x-actual-name']);+ const fileId = req.headers['x-actual-file-id'];if (!fileId || typeof fileId !== 'string') {res.status(400).send('fileId is required');@@ -202,10 +202,10 @@ app.post('/upload-user-file', async (req, res) => {}let groupId = req.headers['x-actual-group-id'] || null;- let encryptMeta = req.headers['x-actual-encrypt-meta'] || null;- let syncFormatVersion = req.headers['x-actual-format'] || null;+ const encryptMeta = req.headers['x-actual-encrypt-meta'] || null;+ const syncFormatVersion = req.headers['x-actual-format'] || null;- let keyId =+ const keyId =encryptMeta && typeof encryptMeta === 'string'? JSON.parse(encryptMeta).keyId: null;@@ -244,10 +244,10 @@ app.post('/upload-user-file', async (req, res) => {filesService.set(new File({id: fileId,- groupId: groupId,+ groupId,syncVersion: syncFormatVersion,- name: name,- encryptMeta: encryptMeta,+ name,+ encryptMeta,owner:res.locals.user_id ||(() => {@@ -263,7 +263,7 @@ app.post('/upload-user-file', async (req, res) => {if (!groupId) {// sync state was reset, create new groupgroupId = uuid.v4();- filesService.update(fileId, new FileUpdate({ groupId: groupId }));+ filesService.update(fileId, new FileUpdate({ groupId }));}// Regardless, update some properties@@ -271,8 +271,8 @@ app.post('/upload-user-file', async (req, res) => {fileId,new FileUpdate({syncVersion: syncFormatVersion,- encryptMeta: encryptMeta,- name: name,+ encryptMeta,+ name,}),);@@ -280,7 +280,7 @@ app.post('/upload-user-file', async (req, res) => {});app.get('/download-user-file', async (req, res) => {- let fileId = req.headers['x-actual-file-id'];+ const fileId = req.headers['x-actual-file-id'];if (typeof fileId !== 'string') {// FIXME: Not sure how this cannot be a string when the header is// set.@@ -298,7 +298,7 @@ app.get('/download-user-file', async (req, res) => {});app.post('/update-user-filename', (req, res) => {- let { fileId, name } = req.body;+ const { fileId, name } = req.body;const filesService = new FilesService(getAccountDb());@@ -306,7 +306,7 @@ app.post('/update-user-filename', (req, res) => {return;}- filesService.update(fileId, new FileUpdate({ name: name }));+ filesService.update(fileId, new FileUpdate({ name }));res.send(OK_RESPONSE);});@@ -331,7 +331,7 @@ app.get('/list-user-files', (req, res) => {});app.get('/get-user-file-info', (req, res) => {- let fileId = req.headers['x-actual-file-id'];+ const fileId = req.headers['x-actual-file-id'];// TODO: Return 422 if fileId is not provided. Need to make sure frontend can handle it// if (!fileId) {@@ -370,7 +370,7 @@ app.get('/get-user-file-info', (req, res) => {});app.post('/delete-user-file', (req, res) => {- let { fileId } = req.body;+ const { fileId } = req.body;if (!fileId) {return res.status(422).send({diff --git a/packages/sync-server/src/app-sync.test.js b/packages/sync-server/src/app-sync.test.jsindex 005a0691b2..248b493da6 100644--- a/packages/sync-server/src/app-sync.test.js+++ b/packages/sync-server/src/app-sync.test.js@@ -1,10 +1,12 @@+import crypto from 'node:crypto';import fs from 'node:fs';++import { SyncProtoBuf } from '@actual-app/crdt';import request from 'supertest';++import getAccountDb from './account-db.js';import { handlers as app } from './app-sync.js';import { getPathForUserFile } from './util/paths.js';-import getAccountDb from './account-db.js';-import { SyncProtoBuf } from '@actual-app/crdt';-import crypto from 'node:crypto';const ADMIN_ROLE = 'ADMIN';diff --git a/packages/sync-server/src/app-sync/tests/services/files-service.test.js b/packages/sync-server/src/app-sync/tests/services/files-service.test.jsindex c33a799855..6ed7d2dd5c 100644--- a/packages/sync-server/src/app-sync/tests/services/files-service.test.js+++ b/packages/sync-server/src/app-sync/tests/services/files-service.test.js@@ -1,3 +1,5 @@+import crypto from 'node:crypto';+import getAccountDb from '../../../account-db.js';import { FileNotFound } from '../../errors.js';import {@@ -5,7 +7,6 @@ import {File,FileUpdate,} from '../../services/files-service.js'; // Adjust the path as necessary-import crypto from 'node:crypto';describe('FilesService', () => {let filesService;let accountDb;@@ -101,7 +102,7 @@ describe('FilesService', () => {syncVersion: 1,name: 'file2',encryptMeta: '{"key":"value2"}',- deleted: deleted,+ deleted,});filesService.set(newFile);@@ -116,7 +117,7 @@ describe('FilesService', () => {encryptSalt: null, // default valueencryptTest: null, // default valueencryptKeyId: null, // default value- deleted: deleted,+ deleted,});expect(file).toEqual(expectedFile);diff --git a/packages/sync-server/src/app-sync/validation.js b/packages/sync-server/src/app-sync/validation.jsindex 4fe3fff2c0..3b8cf88850 100644--- a/packages/sync-server/src/app-sync/validation.js+++ b/packages/sync-server/src/app-sync/validation.js@@ -22,7 +22,7 @@ const validateSyncedFile = (groupId, keyId, currentFile) => {// encrypted with the same key it is registered with (this might// be wrong if there was an error during the key creation// process)- let uploadedKeyId = currentFile.encryptMeta+ const uploadedKeyId = currentFile.encryptMeta? JSON.parse(currentFile.encryptMeta).keyId: null;if (uploadedKeyId !== currentFile.encryptKeyId) {diff --git a/packages/sync-server/src/app.js b/packages/sync-server/src/app.jsindex 0f37039175..ef38f8090c 100644--- a/packages/sync-server/src/app.js+++ b/packages/sync-server/src/app.js@@ -1,18 +1,19 @@import fs from 'node:fs';-import express from 'express';-import actuator from 'express-actuator';+import bodyParser from 'body-parser';import cors from 'cors';-import config from './load-config.js';+import express from 'express';+import actuator from 'express-actuator';import rateLimit from 'express-rate-limit';import * as accountApp from './app-account.js';-import * as syncApp from './app-sync.js';-import * as goCardlessApp from './app-gocardless/app-gocardless.js';-import * as simpleFinApp from './app-simplefin/app-simplefin.js';-import * as secretApp from './app-secrets.js';import * as adminApp from './app-admin.js';+import * as goCardlessApp from './app-gocardless/app-gocardless.js';import * as openidApp from './app-openid.js';+import * as secretApp from './app-secrets.js';+import * as simpleFinApp from './app-simplefin/app-simplefin.js';+import * as syncApp from './app-sync.js';+import config from './load-config.js';const app = express();diff --git a/packages/sync-server/src/db.js b/packages/sync-server/src/db.jsindex a4d57a6a9c..71fae7078d 100644--- a/packages/sync-server/src/db.js+++ b/packages/sync-server/src/db.js@@ -10,7 +10,7 @@ class WrappedDatabase {* @param {string[]} params*/all(sql, params = []) {- let stmt = this.db.prepare(sql);+ const stmt = this.db.prepare(sql);return stmt.all(...params);}@@ -19,7 +19,7 @@ class WrappedDatabase {* @param {string[]} params*/first(sql, params = []) {- let rows = this.all(sql, params);+ const rows = this.all(sql, params);return rows.length === 0 ? null : rows[0];}@@ -35,8 +35,8 @@ class WrappedDatabase {* @param {string[]} params*/mutate(sql, params = []) {- let stmt = this.db.prepare(sql);- let info = stmt.run(...params);+ const stmt = this.db.prepare(sql);+ const info = stmt.run(...params);return { changes: info.changes, insertId: info.lastInsertRowid };}diff --git a/packages/sync-server/src/load-config.js b/packages/sync-server/src/load-config.jsindex e08bc6dfee..78b0f99945 100644--- a/packages/sync-server/src/load-config.js+++ b/packages/sync-server/src/load-config.js@@ -1,8 +1,9 @@+import { createRequire } from 'module';import fs from 'node:fs';import path from 'node:path';import { fileURLToPath } from 'node:url';+import createDebug from 'debug';-import { createRequire } from 'module';const require = createRequire(import.meta.url);const debug = createDebug('actual:config');@@ -62,7 +63,7 @@ const actualAppWebBuildPath = path.join(debug(`Actual web build path: '${actualAppWebBuildPath}'`);/** @type {Omit<import('./config-types.js').Config, 'mode' | 'dataDir' | 'serverFiles' | 'userFiles'>} */-let defaultConfig = {+const defaultConfig = {loginMethod: 'password',allowedLoginMethods: ['password', 'header', 'openid'],// assume local networks are trusteddiff --git a/packages/sync-server/src/migrations.js b/packages/sync-server/src/migrations.jsindex 2cfa0f47f0..34e5debeb1 100644--- a/packages/sync-server/src/migrations.js+++ b/packages/sync-server/src/migrations.js@@ -1,5 +1,7 @@-import migrate from 'migrate';import path from 'node:path';++import migrate from 'migrate';+import config from './load-config.js';export default function run(direction = 'up') {diff --git a/packages/sync-server/src/scripts/health-check.js b/packages/sync-server/src/scripts/health-check.jsindex 6aef339b90..2e9a4ceb20 100644--- a/packages/sync-server/src/scripts/health-check.js+++ b/packages/sync-server/src/scripts/health-check.js@@ -1,8 +1,9 @@import fetch from 'node-fetch';+import config from '../load-config.js';-let protocol = config.https ? 'https' : 'http';-let hostname = config.hostname === '::' ? 'localhost' : config.hostname;+const protocol = config.https ? 'https' : 'http';+const hostname = config.hostname === '::' ? 'localhost' : config.hostname;fetch(`${protocol}://${hostname}:${config.port}/health`).then(res => res.json())diff --git a/packages/sync-server/src/secrets.test.js b/packages/sync-server/src/secrets.test.jsindex 34a34ed083..77153a136b 100644--- a/packages/sync-server/src/secrets.test.js+++ b/packages/sync-server/src/secrets.test.js@@ -1,6 +1,7 @@-import { secretsService } from './services/secrets-service.js';import request from 'supertest';+import { handlers as app } from './app-secrets.js';+import { secretsService } from './services/secrets-service.js';describe('secretsService', () => {const testSecretName = 'testSecret';const testSecretValue = 'testValue';diff --git a/packages/sync-server/src/services/secrets-service.js b/packages/sync-server/src/services/secrets-service.jsindex bc7c7db4c0..a32af90fde 100644--- a/packages/sync-server/src/services/secrets-service.js+++ b/packages/sync-server/src/services/secrets-service.js@@ -1,4 +1,5 @@import createDebug from 'debug';+import getAccountDb from '../account-db.js';/**diff --git a/packages/sync-server/src/sync-simple.js b/packages/sync-server/src/sync-simple.jsindex 989c20dabe..81aa5d9d12 100644--- a/packages/sync-server/src/sync-simple.js+++ b/packages/sync-server/src/sync-simple.js@@ -1,20 +1,20 @@import { existsSync, readFileSync } from 'node:fs';import { join } from 'node:path';-import openDatabase from './db.js';-import { getPathForGroupFile } from './util/paths.js';--import { sqlDir } from './load-config.js';import { merkle, SyncProtoBuf, Timestamp } from '@actual-app/crdt';+import openDatabase from './db.js';+import { sqlDir } from './load-config.js';+import { getPathForGroupFile } from './util/paths.js';+function getGroupDb(groupId) {- let path = getPathForGroupFile(groupId);- let needsInit = !existsSync(path);+ const path = getPathForGroupFile(groupId);+ const needsInit = !existsSync(path);- let db = openDatabase(path);+ const db = openDatabase(path);if (needsInit) {- let sql = readFileSync(join(sqlDir, 'messages.sql'), 'utf8');+ const sql = readFileSync(join(sqlDir, 'messages.sql'), 'utf8');db.exec(sql);}@@ -27,8 +27,8 @@ function addMessages(db, messages) {let trie = getMerkle(db);if (messages.length > 0) {- for (let msg of messages) {- let info = db.mutate(+ for (const msg of messages) {+ const info = db.mutate(`INSERT OR IGNORE INTO messages_binary (timestamp, is_encrypted, content)VALUES (?, ?, ?)`,[@@ -58,7 +58,7 @@ function addMessages(db, messages) {}function getMerkle(db) {- let rows = db.all('SELECT * FROM messages_merkles');+ const rows = db.all('SELECT * FROM messages_merkles');if (rows.length > 0) {return JSON.parse(rows[0].merkle);@@ -70,15 +70,15 @@ function getMerkle(db) {}export function sync(messages, since, groupId) {- let db = getGroupDb(groupId);- let newMessages = db.all(+ const db = getGroupDb(groupId);+ const newMessages = db.all(`SELECT * FROM messages_binaryWHERE timestamp > ?ORDER BY timestamp`,[since],);- let trie = addMessages(db, messages);+ const trie = addMessages(db, messages);db.close();diff --git a/packages/sync-server/src/util/middlewares.js b/packages/sync-server/src/util/middlewares.jsindex 69b0e5eaf0..460e15a72b 100644--- a/packages/sync-server/src/util/middlewares.js+++ b/packages/sync-server/src/util/middlewares.js@@ -1,7 +1,7 @@-import validateSession from './validate-user.js';--import * as winston from 'winston';import * as expressWinston from 'express-winston';+import * as winston from 'winston';++import validateSession from './validate-user.js';/*** @param {Error} err@@ -36,7 +36,7 @@ async function errorMiddleware(err, req, res, next) {* @param {import('express').NextFunction} next*/const validateSessionMiddleware = async (req, res, next) => {- let session = await validateSession(req, res);+ const session = await validateSession(req, res);if (!session) {return;}diff --git a/packages/sync-server/src/util/paths.js b/packages/sync-server/src/util/paths.jsindex 971bcacd9f..d89426dfc6 100644--- a/packages/sync-server/src/util/paths.js+++ b/packages/sync-server/src/util/paths.js@@ -1,4 +1,5 @@import { join } from 'node:path';+import config from '../load-config.js';/** @param {string} fileId */diff --git a/packages/sync-server/src/util/prompt.js b/packages/sync-server/src/util/prompt.jsindex d6597b001d..8bb8d72b56 100644--- a/packages/sync-server/src/util/prompt.js+++ b/packages/sync-server/src/util/prompt.js@@ -1,32 +1,32 @@import { createInterface, cursorTo } from 'node:readline';export async function prompt(message) {- let rl = createInterface({+ const rl = createInterface({input: process.stdin,output: process.stdout,});- let promise = new Promise(resolve => {+ const promise = new Promise(resolve => {rl.question(message, answer => {resolve(answer);rl.close();});});- let answer = await promise;+ const answer = await promise;return answer;}export async function promptPassword() {- let password = await askForPassword('Enter a password, then press enter: ');+ const password = await askForPassword('Enter a password, then press enter: ');if (password === '') {console.log('Password cannot be empty.');return promptPassword();}- let password2 = await askForPassword(+ const password2 = await askForPassword('Enter the password again, then press enter: ',);@@ -41,7 +41,7 @@ export async function promptPassword() {async function askForPassword(prompt) {let dataListener, endListener;- let promise = new Promise(resolve => {+ const promise = new Promise(resolve => {let result = '';process.stdout.write(prompt);process.stdin.setRawMode(true);@@ -77,7 +77,7 @@ async function askForPassword(prompt) {process.stdin.on('end', endListener);});- let answer = await promise;+ const answer = await promise;process.stdin.off('data', dataListener);process.stdin.off('end', endListener);diff --git a/packages/sync-server/src/util/validate-user.js b/packages/sync-server/src/util/validate-user.jsindex 16abc421c1..bb7daa4804 100644--- a/packages/sync-server/src/util/validate-user.js+++ b/packages/sync-server/src/util/validate-user.js@@ -1,6 +1,7 @@-import config from '../load-config.js';import ipaddr from 'ipaddr.js';+import { getSession } from '../account-db.js';+import config from '../load-config.js';export const TOKEN_EXPIRATION_NEVER = -1;const MS_PER_SECOND = 1000;@@ -16,7 +17,7 @@ export default function validateSession(req, res) {token = req.headers['x-actual-token'];}- let session = getSession(token);+ const session = getSession(token);if (!session) {res.status(401);@@ -47,15 +48,15 @@ export function validateAuthHeader(req) {// fallback to trustedProxies when trustedAuthProxies not setconst trustedAuthProxies = config.trustedAuthProxies ?? config.trustedProxies;// ensure the first hop from our server is trusted- let peer = req.socket.remoteAddress;- let peerIp = ipaddr.process(peer);+ const peer = req.socket.remoteAddress;+ const peerIp = ipaddr.process(peer);const rangeList = {allowed_ips: trustedAuthProxies.map(q => ipaddr.parseCIDR(q)),};- /* eslint-disable @typescript-eslint/ban-ts-comment */+// @ts-ignore : there is an error in the ts definition for the function, but this is valid- var matched = ipaddr.subnetMatch(peerIp, rangeList, 'fail');- /* eslint-enable @typescript-eslint/ban-ts-comment */+ const matched = ipaddr.subnetMatch(peerIp, rangeList, 'fail');+if (matched == 'allowed_ips') {console.info(`Header Auth Login permitted from ${peer}`);return true;