Created attachment 163785 [details] [review] Bug 36414: Staff UI - Skip csrf_token Skip csrf_token field if it already exists and is coming from a previous workflow stage form submission, as it's already included at the start of the form.
Created attachment 163786 [details] [review] Bug 36414: OPAC - Skip csrf_token Skip csrf_token field if it already exists and is coming from a previous workflow stage form submission, as it's already included at the start of the form. The test plan requires EDS credentials in order to be followed. I'm available to help others through this test plan if required. Otherwise, I believe the code is simple enough to understand and follow what it's fixing without testing. Test plan: 1) Install an ILL availabililty plugin, e.g.: https://github.com/PTFS-Europe/koha-plugin-ill-avail-eds 3) Configure the plugin and add EDS credentials 4) Enable ILLCheckAvailability sys pref 5) Enable ILLModuleDisclaimerByType by copying the example YAML block in the sys pref description 6) Create a new ILL request of type 'Book' and add a DOI 7) You should now be on the availabililty stage, click 'Continue adding your request' 8) You should now be on the type disclaimer stage, click 'Create' 9) Notice 'Wrong CSRF token' error. This happens because the type disclaimer stage is adding its own CSRF token in addition to the CSRF token coming from the previous availabililty stage 10) Apply patch. Repeat. No error -> Request is created as expected. 11) Do the same test plan on both Staff UI and OPAC
Created attachment 166725 [details] [review] Bug 36414: Staff UI - Skip csrf_token Skip csrf_token field if it already exists and is coming from a previous workflow stage form submission, as it's already included at the start of the form. Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
Created attachment 166726 [details] [review] Bug 36414: OPAC - Skip csrf_token Skip csrf_token field if it already exists and is coming from a previous workflow stage form submission, as it's already included at the start of the form. The test plan requires EDS credentials in order to be followed. I'm available to help others through this test plan if required. Otherwise, I believe the code is simple enough to understand and follow what it's fixing without testing. Test plan: 1) Install an ILL availabililty plugin, e.g.: https://github.com/PTFS-Europe/koha-plugin-ill-avail-eds 3) Configure the plugin and add EDS credentials 4) Enable ILLCheckAvailability sys pref 5) Enable ILLModuleDisclaimerByType by copying the example YAML block in the sys pref description 6) Create a new ILL request of type 'Book' and add a DOI 7) You should now be on the availabililty stage, click 'Continue adding your request' 8) You should now be on the type disclaimer stage, click 'Create' 9) Notice 'Wrong CSRF token' error. This happens because the type disclaimer stage is adding its own CSRF token in addition to the CSRF token coming from the previous availabililty stage 10) Apply patch. Repeat. No error -> Request is created as expected. 11) Do the same test plan on both Staff UI and OPAC Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
Untested, makes sense, simple patch, passing QA
(In reply to Nick Clemens (kidclamp) from comment #5) > Untested, makes sense, simple patch, passing QA ... I'd be more confident with another SO or without that note ;)
Pushed for 24.05! Well done everyone, thank you!
Not for 23.11.x