kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-09-25 06:51:08 +00:00
Code Issues Projects Releases Wiki Activity

Add some stuff for webhooks.

Browse Source
This commit is contained in:
James Cole
2020-11-29 11:36:29 +01:00
parent c68d7c5aad
commit f42bd19c1c
5 changed files with 239 additions and 217 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
app/Http/Controllers/Controller.php
View File

@@ -56,12 +56,15 @@ abstract class Controller extends BaseController
{ {
// is site a demo site? // is site a demo site?
$isDemoSiteConfig = app('fireflyconfig')->get('is_demo_site', config('firefly.configuration.is_demo_site', false,),); $isDemoSiteConfig = app('fireflyconfig')->get('is_demo_site', config('firefly.configuration.is_demo_site', false,),);
$isDemoSite = $isDemoSiteConfig ? $isDemoSiteConfig->data : false; $isDemoSite = $isDemoSiteConfig ? $isDemoSiteConfig->data : false;
app('view')->share('IS_DEMO_SITE', $isDemoSite,); app('view')->share('IS_DEMO_SITE', $isDemoSite,);
app('view')->share('DEMO_USERNAME', config('firefly.demo_username')); app('view')->share('DEMO_USERNAME', config('firefly.demo_username'));
app('view')->share('DEMO_PASSWORD', config('firefly.demo_password')); app('view')->share('DEMO_PASSWORD', config('firefly.demo_password'));
app('view')->share('FF_VERSION', config('firefly.version')); app('view')->share('FF_VERSION', config('firefly.version'));
// is webhooks enabled?
app('view')->share('featuringWebhooks', true === config('firefly.feature_flags.webhooks') && true === config('firefly.allow_webhooks'));
// share custom auth guard info. // share custom auth guard info.
$authGuard = config('firefly.authentication_guard'); $authGuard = config('firefly.authentication_guard');
$logoutUri = config('firefly.custom_logout_uri'); $logoutUri = config('firefly.custom_logout_uri');
@@ -95,9 +98,9 @@ abstract class Controller extends BaseController
function ($request, $next) { function ($request, $next) {
$locale = app('steam')->getLocale(); $locale = app('steam')->getLocale();
// translations for specific strings: // translations for specific strings:
$this->monthFormat = (string) trans('config.month', [], $locale); $this->monthFormat = (string)trans('config.month', [], $locale);
$this->monthAndDayFormat = (string) trans('config.month_and_day', [], $locale); $this->monthAndDayFormat = (string)trans('config.month_and_day', [], $locale);
$this->dateTimeFormat = (string) trans('config.date_time', [], $locale); $this->dateTimeFormat = (string)trans('config.date_time', [], $locale);
// get shown-intro-preference: // get shown-intro-preference:
if (auth()->check()) { if (auth()->check()) {

4
database/migrations/2020_11_12_070604_changes_for_v550.php
View File

@@ -116,7 +116,7 @@ class ChangesForV550 extends Migration
Schema::create( Schema::create(
'webhooks', 'webhooks',
static function (Blueprint $table) { static function (Blueprint $table) {
$table->bigIncrements('id'); $table->increments('id');
$table->integer('user_id', false, true); $table->integer('user_id', false, true);
$table->softDeletes(); $table->softDeletes();
$table->boolean('active')->default(true); $table->boolean('active')->default(true);
@@ -133,7 +133,7 @@ class ChangesForV550 extends Migration
Schema::create( Schema::create(
'webhook_messages', 'webhook_messages',
static function (Blueprint $table) { static function (Blueprint $table) {
$table->bigIncrements('id'); $table->increments('id');
$table->integer('webhook_id', false, true); $table->integer('webhook_id', false, true);
$table->softDeletes(); $table->softDeletes();
$table->boolean('sent')->default(false); $table->boolean('sent')->default(false);

429
resources/views/v1/partials/menu-sidebar.twig
View File

@@ -1,223 +1,232 @@
<ul class="sidebar-menu" data-widget="tree"> <ul class="sidebar-menu" data-widget="tree">
<li class="{{ activeRouteStrict('index') }}"> <li class="{{ activeRouteStrict('index') }}">
<a href="{{ route('index') }}"> <a href="{{ route('index') }}">
<i class="fa fa-dashboard fa-fw"></i> <i class="fa fa-dashboard fa-fw"></i>
<span>{{ 'dashboard'|_ }}</span> <span>{{ 'dashboard'|_ }}</span>
</a>
</li>
<li class="header text-uppercase">{{ 'financial_control'|_ }}</li>
<li class="{{ activeRoutePartial('budgets') }}" id="budget-menu">
<a href="{{ route('budgets.index') }}">
<i class="fa fa-pie-chart fa-fw"></i>
<span>{{ 'budgets'|_ }}</span>
</a>
</li>
<li class="{{ activeRoutePartial('bills') }}">
<a href="{{ route('bills.index') }}">
<i class="fa fa-calendar-o fa-fw"></i>
<span>{{ 'bills'|_ }}</span>
</a>
</li>
<li class="{{ activeRoutePartial('piggy-banks') }}">
<a href="{{ route('piggy-banks.index') }}">
<i class="fa fa-bullseye fa-fw"></i>
<span>{{ 'piggyBanks'|_ }}</span>
</a>
</li>
<li class="header text-uppercase">{{ 'accounting'|_ }}</li>
<li class="{{ activeRoutePartial('transactions') }} treeview" id="transaction-menu">
<a href="#">
<i class="fa fa-exchange fa-fw"></i>
<span>{{ 'transactions'|_ }}</span>
<span class="pull-right-container">
<i class="fa fa-angle-left pull-right"></i>
</span>
</a>
<ul class="treeview-menu">
<li class="{{ activeRoutePartialObjectType('transactions', 'withdrawal') }}">
<a href="{{ route('transactions.index', 'withdrawal') }}">
<i class="fa fa-angle-right fa-fw"></i>
<span>{{ 'expenses'|_ }}</span>
</a> </a>
</li>
<li class="{{ activeRoutePartialObjectType('transactions', 'deposit') }}">
<a href="{{ route('transactions.index', 'deposit') }}">
<i class="fa fa-angle-right fa-fw"></i>
<span>{{ 'income'|_ }}</span>
</a>
</li>
<li class="{{ activeRoutePartialObjectType('transactions', 'transfers') }}">
<a href="{{ route('transactions.index', 'transfers') }}">
<i class="fa fa-angle-right fa-fw"></i>
<span>{{ 'transfers'|_ }}</span>
</a>
</li>
</ul>
</li>
<li class="{{ activeRoutePartial('recurring') }} {{ activeRoutePartial('rules') }} treeview">
<a href="#">
<i class="fa fa-microchip fa-fw"></i>
<span>{{ 'automation'|_ }}</span>
<span class="pull-right-container">
<i class="fa fa-angle-left pull-right"></i>
</span>
</a>
<ul class="treeview-menu">
<li class="{{ activeRoutePartial('rules') }}">
<a href="{{ route('rules.index') }}">
<i class="fa fa-angle-right fa-fw"></i>
<span>{{ 'rules'|_ }}</span>
</a>
</li>
<li class="{{ activeRoutePartial('recurring') }}">
<a href="{{ route('recurring.index') }}">
<i class="fa fa-angle-right fa-fw"></i>
<span>{{ 'recurrences'|_ }}</span>
</a>
</li>
</ul>
</li>
<li class="header text-uppercase">{{ 'others'|_ }}</li>
<li class="{{ activeRoutePartial('accounts') }} treeview" id="account-menu">
<a href="#">
<i class="fa fa-credit-card fa-fw"></i>
<span>{{ 'accounts'|_ }}</span>
<span class="pull-right-container">
<i class="fa fa-angle-left pull-right"></i>
</span>
</a>
<ul class="treeview-menu">
<li class="{{ activeRoutePartialObjectType('accounts', 'asset') }}">
<a href="{{ route('accounts.index', 'asset') }}">
<i class="fa fa-angle-right fa-fw"></i>
<span>{{ 'asset_accounts'|_ }}</span>
</a>
</li>
<li class="{{ activeRoutePartialObjectType('accounts', 'expense') }}">
<a href="{{ route('accounts.index', 'expense') }}">
<i class="fa fa-angle-right fa-fw"></i>
<span>{{ 'expense_accounts'|_ }}</span>
</a>
</li>
<li class="{{ activeRoutePartialObjectType('accounts', 'revenue') }}">
<a href="{{ route('accounts.index', 'revenue') }}">
<i class="fa fa-angle-right fa-fw"></i>
<span>{{ 'revenue_accounts'|_ }}</span>
</a>
</li>
<li class="{{ activeRoutePartialObjectType('accounts', 'liabilities') }}">
<a href="{{ route('accounts.index', 'liabilities') }}">
<i class="fa fa-angle-right fa-fw"></i>
<span>{{ 'liabilities_accounts'|_ }}</span>
</a>
</li>
</ul>
</li>
<li class="{{ activeRoutePartial('categories') }} {{ activeRoutePartial('tags') }} treeview">
<a href="#">
<i class="fa fa-tags fa-fw"></i>
<span>{{ 'classification'|_ }}</span>
<span class="pull-right-container">
<i class="fa fa-angle-left pull-right"></i>
</span>
</a>
<ul class="treeview-menu">
<li class="{{ activeRoutePartial('categories') }}">
<a href="{{ route('categories.index') }}">
<i class="fa fa-angle-right fa-fw"></i>
<span>{{ 'categories'|_ }}</span>
</a>
</li>
<li class="{{ activeRoutePartial('tags') }}">
<a href="{{ route('tags.index') }}">
<i class="fa fa-angle-right fa-fw"></i>
<span>{{ 'tags'|_ }}</span>
</a>
</li>
<li class="{{ activeRoutePartial('object-groups') }}">
<a href="{{ route('object-groups.index') }}">
<i class="fa fa-angle-right fa-fw"></i>
<span>{{ 'object_groups_menu_bar'|_ }}</span>
</a>
</li>
</ul>
</li>
<li class="{{ activeRoutePartial('reports') }}" id="report-menu">
<a href="{{ route('reports.index') }}">
<i class="fa fa-bar-chart fa-fw"></i>
<span>{{ 'reports'|_ }}</span>
</a>
</li>
{% if config('firefly.feature_flags.export') %}
<li class="{{ activeRoutePartial('export') }}" id="report-menu">
<a href="{{ route('export.index') }}">
<i class="fa fa-upload fa-fw"></i>
<span>{{ 'export_data_menu'|_ }}</span>
</a>
</li> </li>
{% endif %}
<li class="{{ activeRoutePartial('admin') }} {{ activeRoutePartial('profile') }} {{ activeRoutePartial('preferences') }} {{ activeRoutePartial('currencies') }} treeview" id="option-menu"> <li class="header text-uppercase">{{ 'financial_control'|_ }}</li>
<a href="#">
<i class="fa fa-sliders fa-fw"></i> <li class="{{ activeRoutePartial('budgets') }}" id="budget-menu">
<span>{{ 'options'|_ }}</span> <a href="{{ route('budgets.index') }}">
<span class="pull-right-container"> <i class="fa fa-pie-chart fa-fw"></i>
<span>{{ 'budgets'|_ }}</span>
</a>
</li>
<li class="{{ activeRoutePartial('bills') }}">
<a href="{{ route('bills.index') }}">
<i class="fa fa-calendar-o fa-fw"></i>
<span>{{ 'bills'|_ }}</span>
</a>
</li>
<li class="{{ activeRoutePartial('piggy-banks') }}">
<a href="{{ route('piggy-banks.index') }}">
<i class="fa fa-bullseye fa-fw"></i>
<span>{{ 'piggyBanks'|_ }}</span>
</a>
</li>
<li class="header text-uppercase">{{ 'accounting'|_ }}</li>
<li class="{{ activeRoutePartial('transactions') }} treeview" id="transaction-menu">
<a href="#">
<i class="fa fa-exchange fa-fw"></i>
<span>{{ 'transactions'|_ }}</span>
<span class="pull-right-container">
<i class="fa fa-angle-left pull-right"></i> <i class="fa fa-angle-left pull-right"></i>
</span> </span>
</a> </a>
<ul class="treeview-menu"> <ul class="treeview-menu">
<li class="{{ activeRoutePartial('profile') }}"> <li class="{{ activeRoutePartialObjectType('transactions', 'withdrawal') }}">
<a class="{{ activeRouteStrict('profile.index') }}" href="{{ route('profile.index') }}"> <a href="{{ route('transactions.index', 'withdrawal') }}">
<i class="fa fa-angle-right fa-fw"></i> <i class="fa fa-angle-right fa-fw"></i>
<span>{{ 'profile'|_ }}</span> <span>{{ 'expenses'|_ }}</span>
</a>
</li>
<li class="{{ activeRoutePartialObjectType('transactions', 'deposit') }}">
<a href="{{ route('transactions.index', 'deposit') }}">
<i class="fa fa-angle-right fa-fw"></i>
<span>{{ 'income'|_ }}</span>
</a>
</li>
<li class="{{ activeRoutePartialObjectType('transactions', 'transfers') }}">
<a href="{{ route('transactions.index', 'transfers') }}">
<i class="fa fa-angle-right fa-fw"></i>
<span>{{ 'transfers'|_ }}</span>
</a>
</li>
</ul>
</li>
<li class="{{ activeRoutePartial('recurring') }} {{ activeRoutePartial('rules') }} treeview">
<a href="#">
<i class="fa fa-microchip fa-fw"></i>
<span>{{ 'automation'|_ }}</span>
<span class="pull-right-container">
<i class="fa fa-angle-left pull-right"></i>
</span>
</a> </a>
</li>
<li class="{{ activeRoutePartial('preferences') }}"> <ul class="treeview-menu">
<a class="{{ activeRouteStrict('preferences.index') }}" href="{{ route('preferences.index') }}"> <li class="{{ activeRoutePartial('rules') }}">
<i class="fa fa-angle-right fa-fw"></i> <a href="{{ route('rules.index') }}">
<span>{{ 'preferences'|_ }}</span> <i class="fa fa-angle-right fa-fw"></i>
<span>{{ 'rules'|_ }}</span>
</a>
</li>
<li class="{{ activeRoutePartial('recurring') }}">
<a href="{{ route('recurring.index') }}">
<i class="fa fa-angle-right fa-fw"></i>
<span>{{ 'recurrences'|_ }}</span>
</a>
</li>
</ul>
</li>
<li class="header text-uppercase">{{ 'others'|_ }}</li>
<li class="{{ activeRoutePartial('accounts') }} treeview" id="account-menu">
<a href="#">
<i class="fa fa-credit-card fa-fw"></i>
<span>{{ 'accounts'|_ }}</span>
<span class="pull-right-container">
<i class="fa fa-angle-left pull-right"></i>
</span>
</a> </a>
</li>
<li class="{{ activeRoutePartial('currencies') }}"> <ul class="treeview-menu">
<a class="{{ activeRoutePartial('currencies') }}" href="{{ route('currencies.index') }}"> <li class="{{ activeRoutePartialObjectType('accounts', 'asset') }}">
<i class="fa fa-angle-right fa-fw"></i> <a href="{{ route('accounts.index', 'asset') }}">
<span>{{ 'currencies'|_ }}</span> <i class="fa fa-angle-right fa-fw"></i>
<span>{{ 'asset_accounts'|_ }}</span>
</a>
</li>
<li class="{{ activeRoutePartialObjectType('accounts', 'expense') }}">
<a href="{{ route('accounts.index', 'expense') }}">
<i class="fa fa-angle-right fa-fw"></i>
<span>{{ 'expense_accounts'|_ }}</span>
</a>
</li>
<li class="{{ activeRoutePartialObjectType('accounts', 'revenue') }}">
<a href="{{ route('accounts.index', 'revenue') }}">
<i class="fa fa-angle-right fa-fw"></i>
<span>{{ 'revenue_accounts'|_ }}</span>
</a>
</li>
<li class="{{ activeRoutePartialObjectType('accounts', 'liabilities') }}">
<a href="{{ route('accounts.index', 'liabilities') }}">
<i class="fa fa-angle-right fa-fw"></i>
<span>{{ 'liabilities_accounts'|_ }}</span>
</a>
</li>
</ul>
</li>
<li class="{{ activeRoutePartial('categories') }} {{ activeRoutePartial('tags') }} treeview">
<a href="#">
<i class="fa fa-tags fa-fw"></i>
<span>{{ 'classification'|_ }}</span>
<span class="pull-right-container">
<i class="fa fa-angle-left pull-right"></i>
</span>
</a> </a>
</li>
{% if hasRole('owner') %} <ul class="treeview-menu">
<li class="{{ activeRoutePartial('admin') }}"> <li class="{{ activeRoutePartial('categories') }}">
<a class="{{ activeRoutePartial('admin') }}" href="{{ route('admin.index') }}"> <a href="{{ route('categories.index') }}">
<i class="fa fa-angle-right fa-fw"></i> <i class="fa fa-angle-right fa-fw"></i>
<span>{{ 'administration'|_ }}</span> <span>{{ 'categories'|_ }}</span>
</a> </a>
</li>
<li class="{{ activeRoutePartial('tags') }}">
<a href="{{ route('tags.index') }}">
<i class="fa fa-angle-right fa-fw"></i>
<span>{{ 'tags'|_ }}</span>
</a>
</li>
<li class="{{ activeRoutePartial('object-groups') }}">
<a href="{{ route('object-groups.index') }}">
<i class="fa fa-angle-right fa-fw"></i>
<span>{{ 'object_groups_menu_bar'|_ }}</span>
</a>
</li>
</ul>
</li>
<li class="{{ activeRoutePartial('reports') }}" id="report-menu">
<a href="{{ route('reports.index') }}">
<i class="fa fa-bar-chart fa-fw"></i>
<span>{{ 'reports'|_ }}</span>
</a>
</li>
{% if config('firefly.feature_flags.export') %}
<li class="{{ activeRoutePartial('export') }}" id="report-menu">
<a href="{{ route('export.index') }}">
<i class="fa fa-upload fa-fw"></i>
<span>{{ 'export_data_menu'|_ }}</span>
</a>
</li> </li>
{% endif %} {% endif %}
</ul>
</li> <li class="{{ activeRoutePartial('admin') }} {{ activeRoutePartial('profile') }} {{ activeRoutePartial('preferences') }} {{ activeRoutePartial('currencies') }} treeview"
{% if 'remote_user_guard' != authGuard or '' != logoutUri %} id="option-menu">
<li> <a href="#">
<a href="{{ route('logout') }}"> <i class="fa fa-sliders fa-fw"></i>
<i class="fa fa-sign-out fa-fw"></i> <span>{{ 'options'|_ }}</span>
<span>{{ 'logout'|_ }}</span> <span class="pull-right-container">
</a> <i class="fa fa-angle-left pull-right"></i>
</span>
</a>
<ul class="treeview-menu">
<li class="{{ activeRoutePartial('profile') }}">
<a class="{{ activeRouteStrict('profile.index') }}" href="{{ route('profile.index') }}">
<i class="fa fa-angle-right fa-fw"></i>
<span>{{ 'profile'|_ }}</span>
</a>
</li>
<li class="{{ activeRoutePartial('preferences') }}">
<a class="{{ activeRouteStrict('preferences.index') }}" href="{{ route('preferences.index') }}">
<i class="fa fa-angle-right fa-fw"></i>
<span>{{ 'preferences'|_ }}</span>
</a>
</li>
<li class="{{ activeRoutePartial('currencies') }}">
<a class="{{ activeRoutePartial('currencies') }}" href="{{ route('currencies.index') }}">
<i class="fa fa-angle-right fa-fw"></i>
<span>{{ 'currencies'|_ }}</span>
</a>
</li>
{% if true == featuringWebhooks %}
<li class="{{ activeRoutePartial('webhooks') }}">
<a class="{{ activeRoutePartial('webhooks') }}" href="{{ route('webhooks.index') }}">
<i class="fa fa-angle-right fa-fw"></i>
<span>{{ 'webhooks'|_ }}</span>
</a>
</li>
{% endif %}
{% if hasRole('owner') %}
<li class="{{ activeRoutePartial('admin') }}">
<a class="{{ activeRoutePartial('admin') }}" href="{{ route('admin.index') }}">
<i class="fa fa-angle-right fa-fw"></i>
<span>{{ 'administration'|_ }}</span>
</a>
</li>
{% endif %}
</ul>
</li> </li>
{% endif %} {% if 'remote_user_guard' != authGuard or '' != logoutUri %}
<li>
<a href="{{ route('logout') }}">
<i class="fa fa-sign-out fa-fw"></i>
<span>{{ 'logout'|_ }}</span>
</a>
</li>
{% endif %}
</ul> </ul>

2
resources/views/v2/layout/default.twig
View File

@@ -27,7 +27,7 @@
<link rel="stylesheet" href="v2/plugins/local-fonts/gf-source.css"> <link rel="stylesheet" href="v2/plugins/local-fonts/gf-source.css">
<link rel="stylesheet" href="v2/css/app.css"> <link rel="stylesheet" href="v2/css/app.css">
</head> </head>
<body class="hold-transition sidebar-mini layout-fixed"> <body class="hold-transition sidebar-mini layout-fixed layout-navbar-fixed">
<div class="wrapper"> <div class="wrapper">
<!-- Navbar --> <!-- Navbar -->

10
routes/web.php
View File

@@ -1077,6 +1077,16 @@ Route::group(
} }
); );
/*
* Webhooks management
*/
Route::group(
['middleware' => 'user-full-auth', 'namespace' => 'FireflyIII\Http\Controllers\Webhooks', 'prefix' => 'webhooks', 'as' => 'webhooks.'],
static function () {
Route::get('index', ['uses' => 'IndexController@index', 'as' => 'index']);
}
);
/** /**
* For the admin routes, the user must be logged in and have the role of 'owner'. * For the admin routes, the user must be logged in and have the role of 'owner'.
*/ */