Merge pull request #1886 from pboivin/fix/3x-legacy-nav-items

[3.x] fix: Hide nav item if user is not authorized (legacy config)

src/TwillNavigation.php

@@ -115,10 +115,14 @@ private function transformLegacyToNew(string $key, array $legacy): NavigationLin
             $link = NavigationLink::make()->forModule($key);
         }
 
-        if ($link && ($legacy['title'] ?? false)) {
+        if ($legacy['title'] ?? false) {
             $link->title($legacy['title']);
         }
 
+        if ($legacy['can'] ?? false) {
+            $link->onlyWhen(fn () => (bool) Auth::user()?->can($legacy['can']));
+        }
+
         return $link;
     }
 

tests/integration/Navigation/LegacyNavigationTest.php

@@ -0,0 +1,50 @@
+<?php
+
+namespace A17\Twill\Tests\Integration\Navigation;
+
+use A17\Twill\Facades\TwillNavigation;
+use A17\Twill\Tests\Integration\TestCase;
+use Illuminate\Support\Facades\Gate;
+use Illuminate\Support\Facades\Auth;
+
+class LegacyNavigationTest extends TestCase
+{
+    public function testNavItemIsNotVisibleIfNotAuthorized(): void
+    {
+        config()->set('twill-navigation', [
+            'pages' => [
+                'module' => true,
+                'can' => 'see-nav-item',
+            ]
+        ]);
+
+        $this->login();
+
+        $navigation = TwillNavigation::buildNavigationTree();
+
+        $this->assertFalse(Auth::user()->can('see-nav-item'));
+        $this->assertEmpty($navigation['left']);
+    }
+
+    public function testNavItemIsVisibleIfAuthorized(): void
+    {
+        config()->set('twill-navigation', [
+            'pages' => [
+                'module' => true,
+                'can' => 'see-nav-item',
+            ]
+        ]);
+
+        Gate::define('see-nav-item', function () {
+            return true;
+        });
+
+        $this->login();
+
+        $navigation = TwillNavigation::buildNavigationTree();
+
+        $this->assertTrue(Auth::user()->can('see-nav-item'));
+        $this->assertNotEmpty($navigation['left']);
+        $this->assertEquals('Pages', $navigation['left'][0]->getTitle());
+    }
+}