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 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", 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} 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}`, }), diff --git a/src/pages/paperwork/[rescueId]/edit.js b/src/pages/paperwork/[rescueId]/edit.js index 4d984fa87..b4215791e 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') { 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) } } 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'