IntenseFinance/firefly-iii
3
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2026-08-26 05:07:27 -05:00
Code Issues Packages Projects Releases Wiki Activity

Make sure redirect stuff works!

Browse Source
This commit is contained in:
James Cole
2026-08-23 18:12:16 +02:00
parent 4a0b8ff27b
commit 276372eaa6
3 changed files with 26 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/Controller.php
+1 -1
View File
@@ -200,7 +200,7 @@ abstract class Controller extends BaseController
$parts = [];
parse_str($current['query'], $parts);
unset($parts['_from']);
$from .= http_build_query($parts);
$from .= '?' . http_build_query($parts);
}
if (array_key_exists('fragment', $current) && '' !== $current['fragment']) {
$from .= '#'.$current['fragment'];
resources/assets/v3/js/pages/transactions/edit.js
+1
View File
@@ -369,6 +369,7 @@ let transactions = function () {
// if not, respond to user options:
this.showMessageOrRedirectUser();
}).catch((error) => {
console.log(error);
this.formStates.isSubmitting = false;
if (typeof error.response !== 'undefined') {
this.parseErrors(error.response.data);
resources/assets/v3/js/pages/transactions/shared/show-message-or-redirect.js
+24 -5
View File
@@ -57,20 +57,39 @@ export function showMessageOrRedirectUser() {
// the redirect also depends on the "from" in the query param, which is validated by Firefly III on the server side.
// get from parameter from query
const urlParams = new URLSearchParams(window.location.search);
const from = urlParams.get('_from').toString();
let params = urlParams.get('_from');
// find parts
let parts = URL.parse(params, 'https://example.com/');
let from;
let separator = '?';
if('' === parts.search) {
from = urlParams.get('_from').toString();
}
if('' !== parts.search) {
let obj = new URLSearchParams(parts.search);
let pathName = parts.pathname; // we redirect here!
obj.delete('message');
obj.delete('transaction_group_id');
if(0 === obj.size) {
from = pathName;
}
if(obj.size > 0) {
separator = '&';
from = pathName + '?' + obj.toString();
}
}
// grab base href
let baseHref = document.querySelector('base').getAttribute('href');
baseHref = baseHref.substring(0, baseHref.length - 1);
let finalFrom = baseHref + from;
if ('' !== from) {
if('edit' === this.formBehaviour.formType) {
console.log('Redirect to valid _from parameter: ' + baseHref + ' ' + from + ' ' + '?transaction_group_id=' + this.groupProperties.id + '&message=updated');
window.location = baseHref + from + '?transaction_group_id=' + this.groupProperties.id + '&message=updated';
window.location = finalFrom + separator + 'transaction_group_id=' + this.groupProperties.id + '&message=updated';
return;
}
console.log('Redirect to valid _from parameter: ' + baseHref + ' ' + from + ' ' + '?transaction_group_id=' + this.groupProperties.id + '&message=created');
window.location = baseHref + from + '?transaction_group_id=' + this.groupProperties.id + '&message=created';
window.location = finalFrom + separator + 'transaction_group_id=' + this.groupProperties.id + '&message=created';
return;
}
if('edit' === this.formBehaviour.formType) {