mirror of
https://github.com/firefly-iii/firefly-iii.git
synced 2024-12-25 08:21:08 -06:00
Minor changes in kernel code.
This commit is contained in:
parent
9a658b60fb
commit
16018109c8
@ -144,7 +144,7 @@ class Kernel extends HttpKernel
|
||||
// MUST be logged in
|
||||
// MUST have 2fa
|
||||
// MUST be confirmed.
|
||||
// (this group includes the other Firefly middleware)
|
||||
// (this group includes the other Firefly III middleware)
|
||||
'user-full-auth' => [
|
||||
EncryptCookies::class,
|
||||
AddQueuedCookiesToResponse::class,
|
||||
@ -162,7 +162,7 @@ class Kernel extends HttpKernel
|
||||
// MUST have 2fa
|
||||
// MUST be confirmed.
|
||||
// MUST have owner role
|
||||
// (this group includes the other Firefly middleware)
|
||||
// (this group includes the other Firefly III middleware)
|
||||
'admin' => [
|
||||
EncryptCookies::class,
|
||||
AddQueuedCookiesToResponse::class,
|
||||
|
@ -35,19 +35,23 @@ use FireflyIII\Support\System\GeneratesInstallationId;
|
||||
class InstallationId
|
||||
{
|
||||
use GeneratesInstallationId;
|
||||
|
||||
/**
|
||||
* Handle an incoming request.
|
||||
*
|
||||
* @param \Illuminate\Http\Request $request
|
||||
* @param Closure $next
|
||||
*
|
||||
* @throws FireflyException
|
||||
*
|
||||
* @return mixed
|
||||
*
|
||||
* @throws FireflyException
|
||||
*
|
||||
*/
|
||||
public function handle($request, Closure $next)
|
||||
{
|
||||
|
||||
|
||||
|
||||
$this->generateInstallationId();
|
||||
|
||||
return $next($request);
|
||||
|
@ -21,6 +21,13 @@
|
||||
|
||||
declare(strict_types=1);
|
||||
|
||||
// simple hack to force v2. Used for demo until next release.
|
||||
$layout = env('FIREFLY_III_LAYOUT', 'v1');
|
||||
if ('v2' === $_GET['layout'] && 'demo@firefly' === env('DEMO_USERNAME')) {
|
||||
$layout = 'v2';
|
||||
}
|
||||
|
||||
|
||||
return [
|
||||
/*
|
||||
|--------------------------------------------------------------------------
|
||||
@ -34,7 +41,7 @@ return [
|
||||
*/
|
||||
|
||||
'paths' => [
|
||||
realpath(base_path(sprintf('resources/views/%s', env('FIREFLY_III_LAYOUT', 'v1')))),
|
||||
realpath(base_path(sprintf('resources/views/%s', $layout))),
|
||||
],
|
||||
|
||||
/*
|
||||
@ -48,6 +55,6 @@ return [
|
||||
|
|
||||
*/
|
||||
|
||||
'compiled' => realpath(storage_path(sprintf('framework/views/%s', env('FIREFLY_III_LAYOUT', 'v1')))),
|
||||
'compiled' => realpath(storage_path(sprintf('framework/views/%s', $layout))),
|
||||
|
||||
];
|
||||
|
Loading…
Reference in New Issue
Block a user