From cfd45ebbfb38cbc10bbdaa1cf03864a30a32b379 Mon Sep 17 00:00:00 2001 From: Cameron Welter Date: Wed, 10 Mar 2021 13:47:41 +0000 Subject: [PATCH 1/8] refactor(stripe-routes): improve error logging for stripe API errors --- src/server/router/stripeApi/document.mjs | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/src/server/router/stripeApi/document.mjs b/src/server/router/stripeApi/document.mjs index cf5db9d08..12def266a 100644 --- a/src/server/router/stripeApi/document.mjs +++ b/src/server/router/stripeApi/document.mjs @@ -48,17 +48,19 @@ const prepareResponse = async (ctx, next) => { ? error : undefined + const finalError = error instanceof ApiError + ? error + : new InternalServerError({ + internalError, + }) + ctx.status = typeof error?.code === 'number' ? error.code : HttpStatus.INTERNAL_SERVER_ERROR ctx.body = new ResponseDocument({ ctx, - errors: [ - error instanceof ApiError - ? error - : new InternalServerError({ - internalError, - }), - ], + errors: [finalError], }) + + console.error(error) } ctx.type = 'application/json' From d08eba825b4f2681b3494c1b02fcf1393bdf94b1 Mon Sep 17 00:00:00 2001 From: Cameron Welter Date: Wed, 10 Mar 2021 13:48:24 +0000 Subject: [PATCH 2/8] fix(TrafficControl-middleware): properly define and clear rate limit storage object --- src/server/router/stripeApi/TrafficControl.mjs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/server/router/stripeApi/TrafficControl.mjs b/src/server/router/stripeApi/TrafficControl.mjs index 8b2599c6b..48278a8a1 100644 --- a/src/server/router/stripeApi/TrafficControl.mjs +++ b/src/server/router/stripeApi/TrafficControl.mjs @@ -10,6 +10,7 @@ const allowedUnauthenticatedRequestCount = 3 * @class */ class TrafficControl { + unauthenticatedRequests = {} #resetTimer = 0 /** @@ -85,6 +86,7 @@ class TrafficControl { * @private */ reset () { + this.unauthenticatedRequests = {} this.#resetTimer = setTimeout(this.reset.bind(this), this.remainingTimeToNextResetDate) } } From 872a85849dd7f38252f433c16e365c4988dbadaa Mon Sep 17 00:00:00 2001 From: Cameron Welter Date: Wed, 10 Mar 2021 13:59:47 +0000 Subject: [PATCH 3/8] refactor(ValidityIcon): remove required asterisk stuff for now --- .../Fieldsets/InputFieldset/InputFieldset.js | 2 +- .../Fieldsets/InputFieldset/ValidityIcon.js | 15 +++------------ .../Fieldsets/SelectFieldset/SelectFieldset.js | 2 +- 3 files changed, 5 insertions(+), 14 deletions(-) diff --git a/src/components/Fieldsets/InputFieldset/InputFieldset.js b/src/components/Fieldsets/InputFieldset/InputFieldset.js index 5a2b5a787..606417c8c 100644 --- a/src/components/Fieldsets/InputFieldset/InputFieldset.js +++ b/src/components/Fieldsets/InputFieldset/InputFieldset.js @@ -111,8 +111,8 @@ const InputFieldset = React.forwardRef((props, forwardRef) => { onFocus={onFocus} /> {children} From 5cc67c156794c574aab12fec9f761bd10d0acbec Mon Sep 17 00:00:00 2001 From: Cameron Welter Date: Wed, 10 Mar 2021 13:59:53 +0000 Subject: [PATCH 4/8] v2.12.10 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index d83e2c160..72e1977d4 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "fuelrats.com", - "version": "2.12.8", + "version": "2.12.10", "description": "The primary website of The Fuel Rats!", "main": "dist/server.js", "license": "BSD-3-Clause", From 511e5797603f04f865ce9f329b426e0e34b3a4b7 Mon Sep 17 00:00:00 2001 From: Cameron Welter Date: Wed, 10 Mar 2021 14:37:49 +0000 Subject: [PATCH 5/8] fix(edit-paperwork-page): fix page crash on platform change --- src/pages/paperwork/[rescueId]/edit.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/pages/paperwork/[rescueId]/edit.js b/src/pages/paperwork/[rescueId]/edit.js index 4d984fa87..32ba31213 100644 --- a/src/pages/paperwork/[rescueId]/edit.js +++ b/src/pages/paperwork/[rescueId]/edit.js @@ -131,7 +131,7 @@ class Paperwork extends React.Component { if (attribute === 'platform' && value !== this.props.rescue) { changes.firstLimpetId = [] - changes.rats = {} + changes.rats = [] } if (attribute === 'outcome' && value !== 'success') { @@ -659,6 +659,8 @@ class Paperwork extends React.Component { return ifDefined(changes[value], rescue.attributes[value]) } + console.log(changes.rats) + return { codeRed: getValue('codeRed'), // Get FirstLimpetId object first, then try to get the firstLimpet from the assigned rat array, THEN try to get the firstLimpet from the new rat array. From 1d37f5b592f86a9ffe1fba2534198aa4bc170877 Mon Sep 17 00:00:00 2001 From: Cameron Welter Date: Wed, 10 Mar 2021 14:38:23 +0000 Subject: [PATCH 6/8] fix: final fixes for api mount location change --- src/components/RatTagsInput.js | 2 +- src/components/RescuesTagsInput.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/RatTagsInput.js b/src/components/RatTagsInput.js index 522f7a452..e2274b49b 100644 --- a/src/components/RatTagsInput.js +++ b/src/components/RatTagsInput.js @@ -42,7 +42,7 @@ class RatTagsInput extends TagsInput { }) if (query) { - const response = await fetch(`/api/rats?${queryParams}`) + const response = await fetch(`/api/fr/rats?${queryParams}`) const { data } = await response.json() if (!data?.length) { diff --git a/src/components/RescuesTagsInput.js b/src/components/RescuesTagsInput.js index 51a8a9a09..9c4ce3633 100644 --- a/src/components/RescuesTagsInput.js +++ b/src/components/RescuesTagsInput.js @@ -33,7 +33,7 @@ class RescuesTagsInput extends TagsInput { try { const token = Cookies.get('access_token') - let response = await fetch(`/api/rescues/${query}`, { + let response = await fetch(`/api/fr/rescues/${query}`, { headers: new Headers({ Authorization: `Bearer ${token}`, }), From 78fd82a3afc81f403a84e12af413f28bdd45bb3f Mon Sep 17 00:00:00 2001 From: Cameron Welter Date: Wed, 10 Mar 2021 14:48:24 +0000 Subject: [PATCH 7/8] docs(CHANGELOG.md): 12.10 pt2 yo. --- CHANGELOG.md | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d1b36937a..af4bbca29 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -25,24 +25,32 @@ For detailed rules of this file, see [Changelog Rules](#changelog-rules) [#303]: https://github.com/fuelRats/fuelrats.com/pull/303 -[Unreleased]: https://github.com/FuelRats/fuelrats.com/compare/v2.12.9...HEAD +[Unreleased]: https://github.com/FuelRats/fuelrats.com/compare/v2.12.10...HEAD ## [2.12.10][] - 2021-03-10 +### ⚡ Changed +* Removed the asterisk that displays when an input is required. - [#315] + * This will be re-introduced with some better visuals at a later date. + + ### 🐛 Fixed -* Resolved issue preventing api routes from being correctly routed. - [#314][] +* Resolved issue preventing api routes from being correctly proxied. - [#314][] * Also take steps to ensure that doesn't happen again. +* Resolved issue prevening donation sessions from being created. - [#315][] +* Resolved a crash on the paperwork page which would occur when changing the platform in certain situations. - [#315][] -[#314]: https://github.com/fuelRats/fuelrats.com/pull/312 +[#314]: https://github.com/fuelRats/fuelrats.com/pull/314 +[#315]: https://github.com/fuelRats/fuelrats.com/pull/315 [2.12.10]: https://github.com/FuelRats/fuelrats.com/compare/v2.12.9...v2.12.10 ## [2.12.9][] - 2021-03-10 ### ✨ Added -* Add asterisk icon to inputs when they are required, but empty. - [#312][] +* Added asterisk icon to inputs when they are required, but empty. - [#312][] ### ⚡ Changed From be7cdec2a9999a4e3fba52c69b6f9235708552b7 Mon Sep 17 00:00:00 2001 From: Cameron Welter Date: Wed, 10 Mar 2021 14:50:19 +0000 Subject: [PATCH 8/8] refactor(edit-paperwork-page): remove left over debug code --- src/pages/paperwork/[rescueId]/edit.js | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/pages/paperwork/[rescueId]/edit.js b/src/pages/paperwork/[rescueId]/edit.js index 32ba31213..b4215791e 100644 --- a/src/pages/paperwork/[rescueId]/edit.js +++ b/src/pages/paperwork/[rescueId]/edit.js @@ -659,8 +659,6 @@ class Paperwork extends React.Component { return ifDefined(changes[value], rescue.attributes[value]) } - console.log(changes.rats) - return { codeRed: getValue('codeRed'), // Get FirstLimpetId object first, then try to get the firstLimpet from the assigned rat array, THEN try to get the firstLimpet from the new rat array.