Merge branch 'master' into gocardless-abnamro_abnanl2a

actualbudget · Dec 9, 2024 · 2636fa2 · 2636fa2
2 parents 785a7fe + 645958b
commit 2636fa2
Show file tree

Hide file tree

Showing 17 changed files with 37 additions and 74 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "actual-sync",
-  "version": "24.11.0",
+  "version": "24.12.0",
   "license": "MIT",
   "description": "actual syncing server",
   "type": "module",
@@ -21,7 +21,7 @@
   },
   "dependencies": {
     "@actual-app/crdt": "2.1.0",
-    "@actual-app/web": "24.11.0",
+    "@actual-app/web": "24.12.0",
     "bcrypt": "^5.1.1",
     "better-sqlite3": "^9.6.0",
     "body-parser": "^1.20.3",

diff --git a/src/app-gocardless/app-gocardless.js b/src/app-gocardless/app-gocardless.js
@@ -201,8 +201,19 @@ app.post(
         });
       }
     } catch (error) {
+      const headers = error.details?.response?.headers ?? {};
+
+      const rateLimitHeaders = Object.fromEntries(
+        Object.entries(headers).filter(([key]) =>
+          key.startsWith('http_x_ratelimit'),
+        ),
+      );
+
       const sendErrorResponse = (data) =>
-        res.send({ status: 'ok', data: { ...data, details: error.details } });
+        res.send({
+          status: 'ok',
+          data: { ...data, details: error.details, rateLimitHeaders },
+        });
 
       switch (true) {
         case error instanceof RequisitionNotLinked:

diff --git a/src/app-gocardless/bank-factory.js b/src/app-gocardless/bank-factory.js
@@ -10,6 +10,7 @@ import CBCcregbebb from './banks/cbc_cregbebb.js';
 import DanskeBankDabNO22 from './banks/danskebank-dabno22.js';
 import EasybankBawaatww from './banks/easybank-bawaatww.js';
 import Fortuneo from './banks/FORTUNEO_FTNOFRP1XXX.js';
+import HanseaticBank from './banks/HANSEATIC_HSTBDEHH.js';
 import IngIngbrobu from './banks/ing-ingbrobu.js';
 import IngIngddeff from './banks/ing-ingddeff.js';
 import IngPlIngbplpw from './banks/ing-pl-ingbplpw.js';
@@ -43,6 +44,7 @@ export const banks = [
   DanskeBankDabNO22,
   EasybankBawaatww,
   Fortuneo,
+  HanseaticBank,
   IngIngbrobu,
   IngIngddeff,
   IngPlIngbplpw,

diff --git a/src/app-gocardless/banks/HANSEATIC_HSTBDEHH.js b/src/app-gocardless/banks/HANSEATIC_HSTBDEHH.js
@@ -0,0 +1,10 @@
+import Fallback from './integration-bank.js';
+
+/** @type {import('./bank.interface.js').IBank} */
+export default {
+  ...Fallback,
+
+  institutionIds: ['HANSEATIC_HSTBDEHH'],
+
+  accessValidForDays: 89,
+};
diff --git a/upcoming-release-notes/479.md b/upcoming-release-notes/479.md
diff --git a/upcoming-release-notes/484.md b/upcoming-release-notes/484.md
diff --git a/upcoming-release-notes/485.md b/upcoming-release-notes/485.md
diff --git a/upcoming-release-notes/490.md b/upcoming-release-notes/490.md
diff --git a/upcoming-release-notes/493.md b/upcoming-release-notes/493.md
diff --git a/upcoming-release-notes/494.md b/upcoming-release-notes/494.md
diff --git a/upcoming-release-notes/497.md b/upcoming-release-notes/497.md
diff --git a/upcoming-release-notes/498.md b/upcoming-release-notes/498.md
diff --git a/upcoming-release-notes/504.md b/upcoming-release-notes/504.md
diff --git a/upcoming-release-notes/507.md b/upcoming-release-notes/507.md
diff --git a/upcoming-release-notes/509.md b/upcoming-release-notes/509.md
@@ -0,0 +1,6 @@
+---
+category: Enhancements
+authors: [matt-fidd]
+---
+
+Add more logging for GoCardless rate limit information
diff --git a/upcoming-release-notes/511.md b/upcoming-release-notes/511.md
diff --git a/yarn.lock b/yarn.lock
@@ -16,10 +16,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@actual-app/web@npm:24.11.0":
-  version: 24.11.0
-  resolution: "@actual-app/web@npm:24.11.0"
-  checksum: 10c0/d6a49d3a2c0539dd41c1caef917f1afa48584af0746ca9f8db3b76fa8c154c081277818bf6a0ec85aeb9d724d3eb4132c13217e6a0725dd730992b57d9e57e97
+"@actual-app/web@npm:24.12.0":
+  version: 24.12.0
+  resolution: "@actual-app/web@npm:24.12.0"
+  checksum: 10c0/865fd5898e8da6347759a65d557047b80cd0c4162601fd4f57eccd1d84289d84c9f2fe563a4b4547dc2f67353042fb94a6e9c0cb13cacfda0547f84aaba73ef6
   languageName: node
   linkType: hard
 
@@ -1531,7 +1531,7 @@ __metadata:
   resolution: "actual-sync@workspace:."
   dependencies:
     "@actual-app/crdt": "npm:2.1.0"
-    "@actual-app/web": "npm:24.11.0"
+    "@actual-app/web": "npm:24.12.0"
     "@babel/preset-typescript": "npm:^7.20.2"
     "@types/bcrypt": "npm:^5.0.2"
     "@types/better-sqlite3": "npm:^7.6.7"