Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion ProcessMaker/Http/Middleware/GenerateMenus.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
use Closure;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Auth;
use Illuminate\Support\Facades\Gate;
use Lavary\Menu\Facade as Menu;
use ProcessMaker\Models\Permission;
use ProcessMaker\Models\Setting;
Expand Down Expand Up @@ -50,7 +51,7 @@ public function handle(Request $request, Closure $next)
['route' => 'tasks.index', 'id' => 'tasks']
)->active('tasks/*');
});
if (\Auth::check() && \Auth::user()->canAny('view-processes|view-process-categories|view-scripts|view-screens|view-environment_variables|view-projects')) {
if (Gate::allows('view-designer')) {
$menu->group(['prefix' => 'designer'], function ($request_items) {
$request_items->add(
__('Designer'),
Expand Down
9 changes: 4 additions & 5 deletions ProcessMaker/Providers/AuthServiceProvider.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,23 +5,18 @@
use Illuminate\Foundation\Support\Providers\AuthServiceProvider as ServiceProvider;
use Illuminate\Support\Facades\Auth;
use Illuminate\Support\Facades\Cache;
use Illuminate\Support\Facades\DB;
use Illuminate\Support\Facades\Event;
use Illuminate\Support\Facades\Gate;
use Illuminate\Support\Facades\Log;
use Illuminate\Support\Facades\Schema;
use Illuminate\Support\Str;
use Laravel\Passport\Passport;
use ProcessMaker\Events\TenantResolved;
use ProcessMaker\Models\AnonymousUser;
use ProcessMaker\Models\Media;
use ProcessMaker\Models\Notification;
use ProcessMaker\Models\Permission;
use ProcessMaker\Models\Process;
use ProcessMaker\Models\ProcessRequest;
use ProcessMaker\Models\ProcessRequestToken;
use ProcessMaker\Models\ProcessVersion;
use ProcessMaker\Models\Screen;
use ProcessMaker\Models\Script;
use ProcessMaker\Models\User;
use ProcessMaker\Policies\MediaPolicy;
Expand Down Expand Up @@ -101,6 +96,10 @@ public function defineGates()
return $user->hasPermission($permission);
});
}

Gate::define('view-designer', function ($user) {
return $user->canAny('view-processes|view-process-categories|view-scripts|view-screens|view-environment_variables|view-projects');
});
} catch (\Exception $e) {
Log::notice('Unable to register gates. Either no database connection or no permissions table exists.');
}
Expand Down
2 changes: 1 addition & 1 deletion routes/web.php
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@
Route::get('designer/screens/categories', [ScreenController::class, 'index'])->name('screen-categories.index')->middleware('can:view-screen-categories');

Route::get('designer/scripts/categories', [ScriptController::class, 'index'])->name('script-categories.index')->middleware('can:view-script-categories');
Route::get('designer', [DesignerController::class, 'index'])->name('designer.index');
Route::get('designer', [DesignerController::class, 'index'])->name('designer.index')->middleware('can:view-designer');

Route::get('process-browser/{process?}', [ProcessesCatalogueController::class, 'index'])
->name('process.browser.index')
Expand Down
15 changes: 14 additions & 1 deletion tests/Feature/Api/DesignerControllerTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

namespace Tests\Feature\Api;

use Auth;
use Illuminate\Support\Facades\Auth;
use ProcessMaker\Models\User;
use Tests\TestCase;

Expand All @@ -24,4 +24,17 @@ public function testIndexMethod()
$response->assertStatus(200);
$response->assertViewIs('designer.index');
}

public function testIndexIsForbiddenWithoutDesignerPermissions(): void
{
$user = User::factory()->create([
'is_administrator' => false,
]);

Auth::login($user);

$response = $this->get('/designer');

$response->assertForbidden();
}
}
Loading