New middleware that should make sure the new forms redirect as well.

This commit is contained in:
James Cole
2019-08-05 19:45:20 +02:00
parent e37100ae97
commit 00d785d891
11 changed files with 149 additions and 569 deletions

View File

@@ -27,7 +27,6 @@ namespace FireflyIII\Http\Controllers\Transaction;
use FireflyIII\Http\Controllers\Controller;
use FireflyIII\Models\TransactionType;
use FireflyIII\Repositories\Account\AccountRepositoryInterface;
use Illuminate\Http\Request;
/**
* Class CreateController
@@ -75,21 +74,19 @@ class CreateController extends Controller
$subTitleIcon = 'fa-plus';
$optionalFields = app('preferences')->get('transaction_journal_optional_fields', [])->data;
$allowedOpposingTypes = config('firefly.allowed_opposing_types');
$accountToTypes = config('firefly.account_to_transaction');
$defaultCurrency = app('amount')->getDefaultCurrency();
$accountToTypes = config('firefly.account_to_transaction');
$defaultCurrency = app('amount')->getDefaultCurrency();
$previousUri = $this->rememberPreviousUri('transactions.create.uri');
session()->put('preFilled', $preFilled);
// put previous url in session if not redirect from store (not "create another").
if (true !== session('transactions.create.fromStore')) {
$this->rememberPreviousUri('transactions.create.uri');
}
session()->forget('transactions.create.fromStore');
return view(
'transactions.create',
compact('subTitleIcon', 'cash',
'objectType', 'subTitle', 'defaultCurrency',
'optionalFields', 'preFilled', 'allowedOpposingTypes', 'accountToTypes')
'transactions.create', compact(
'subTitleIcon', 'cash', 'objectType', 'subTitle', 'defaultCurrency', 'previousUri', 'optionalFields', 'preFilled',
'allowedOpposingTypes',
'accountToTypes'
)
);
}
}

View File

@@ -72,11 +72,9 @@ class EditController extends Controller
$accountToTypes = config('firefly.account_to_transaction');
$defaultCurrency = app('amount')->getDefaultCurrency();
$cash = $repository->getCashAccount();
$previousUri = $this->rememberPreviousUri('transactions.edit.uri');
return view('transactions.edit', compact('cash', 'transactionGroup', 'allowedOpposingTypes', 'accountToTypes', 'defaultCurrency'
));
return view('transactions.edit', compact('cash', 'transactionGroup', 'allowedOpposingTypes', 'accountToTypes', 'defaultCurrency', 'previousUri'));
}
}

View File

@@ -27,6 +27,7 @@ use FireflyIII\Http\Middleware\AuthenticateTwoFactor;
use FireflyIII\Http\Middleware\Binder;
use FireflyIII\Http\Middleware\EncryptCookies;
use FireflyIII\Http\Middleware\Installer;
use FireflyIII\Http\Middleware\InterestingMessage;
use FireflyIII\Http\Middleware\IsAdmin;
use FireflyIII\Http\Middleware\Range;
use FireflyIII\Http\Middleware\RedirectIfAuthenticated;
@@ -155,11 +156,11 @@ class Kernel extends HttpKernel
ShareErrorsFromSession::class,
VerifyCsrfToken::class,
Authenticate::class,
//AuthenticateTwoFactor::class,
MFAMiddleware::class,
Range::class,
Binder::class,
CreateFreshApiToken::class,
InterestingMessage::class,
],
// MUST be logged in
// MUST have 2fa

View File

@@ -0,0 +1,118 @@
<?php
/**
* InterestingMessage.php
* Copyright (c) 2019 thegrumpydictator@gmail.com
*
* This file is part of Firefly III.
*
* Firefly III is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* Firefly III is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
*/
namespace FireflyIII\Http\Middleware;
use Closure;
use FireflyIII\Models\TransactionGroup;
use FireflyIII\Models\TransactionJournal;
use Illuminate\Http\Request;
use Log;
/**
* Class InterestingMessage
*/
class InterestingMessage
{
/**
* Flashes the user an interesting message if the URL parameters warrant it.
*
* @param Request $request
* @param \Closure $next
*
* @return mixed
*
*/
public function handle(Request $request, Closure $next)
{
Log::debug(sprintf('Interesting Message middleware for URI %s', $request->url()));
if ($this->testing()) {
return $next($request);
}
if ($this->groupMessage($request)) {
$this->handleGroupMessage($request);
}
return $next($request);
}
/**
* @param Request $request
*
* @return bool
*/
private function groupMessage(Request $request): bool
{
// get parameters from request.
$transactionGroupId = $request->get('transaction_group_id');
$message = $request->get('message');
return null !== $transactionGroupId && null !== $message;
}
/**
* @param Request $request
*/
private function handleGroupMessage(Request $request): void
{
// get parameters from request.
$transactionGroupId = $request->get('transaction_group_id');
$message = $request->get('message');
// send message about newly created transaction group.
/** @var TransactionGroup $group */
$group = auth()->user()->transactionGroups()->with(['transactionJournals', 'transactionJournals.transactionType'])->find((int)$transactionGroupId);
if (null === $group) {
return;
}
$count = $group->transactionJournals->count();
/** @var TransactionJournal $journal */
$journal = $group->transactionJournals->first();
if (null === $journal) {
return;
}
$title = $count > 1 ? $group->title : $journal->description;
if ('created' === $message) {
session()->flash('success_uri', route('transactions.show', [$transactionGroupId]));
session()->flash('success', (string)trans('firefly.stored_journal', ['description' => $title]));
}
if ('updated' === $message) {
$type = strtolower($journal->transactionType->type);
session()->flash('success_uri', route('transactions.show', [$transactionGroupId]));
session()->flash('success', (string)trans(sprintf('firefly.updated_%s', $type), ['description' => $title]));
}
}
/**
* @return bool
*/
private function testing(): bool
{
// ignore middleware in test environment.
return 'testing' === config('app.env') || !auth()->check();
}
}