[6.x] Update authorization / permissions

src/Auth/Permission.php

@@ -105,6 +105,50 @@ public function permissions()
  })->values();
  }
 
+ public function flattened()
+ {
+ if (! $this->callback) {
+ return [
+ $this,
+ ...$this->children()->map(function ($child) {
+ return (new self)
+ ->value($child->value())
+ ->label($child->label())
+ ->placeholder($this->placeholder)
+ ->placeholderLabel($this->placeholderLabel)
+ ->placeholderValue($this->placeholderValue)
+ ->children($child->children()->all())
+ ->group($this->group());
+ })->flatMap->flattened()->all(),
+ ];
+ }
+
+ $items = call_user_func($this->callback);
+
+ return collect($items)->flatMap(function ($replacement) {
+ $replaced = (new self)
+ ->value($this->value)
+ ->label($this->label)
+ ->placeholder($this->placeholder)
+ ->placeholderLabel($replacement['label'])
+ ->placeholderValue($replacement['value'])
+ ->group($this->group());
+
+ $children = $this->children()->map(function ($child) use ($replacement) {
+ return (new self)
+ ->value($child->originalValue())
+ ->label($child->originalLabel())
+ ->placeholder($this->placeholder)
+ ->placeholderLabel($replacement['label'])
+ ->placeholderValue($replacement['value'])
+ ->children($child->children()->all())
+ ->group($this->group());
+ });
+
+ return [$replaced, ...$children->flatMap->flattened()->all()];
+ })->values();
+ }
+
  public function children(?array $children = null)
  {
  return $this

src/Auth/Permissions.php

@@ -10,9 +10,14 @@ class Permissions
  protected $permissions = [];
  protected $groups = [];
  protected $pendingGroup = null;
+ protected $booted = false;
 
  public function boot()
  {
+ if ($this->booted) {
+ return $this;
+ }
+
  $early = $this->permissions;
  $this->permissions = [];
 
@@ -23,6 +28,9 @@ public function boot()
  }
 
  $this->permissions = array_merge($this->permissions, $early);
+ $this->booted = true;
+
+ return $this;
  }
 
  public function extend($callback)
@@ -125,4 +133,9 @@ public function group($name, $label, $permissions = null)
 
  $this->pendingGroup = null;
  }
+
+ public function flattened()
+ {
+ return collect($this->permissions)->flatMap->flattened();
+ }
 }

src/Http/Middleware/CP/Authorize.php

@@ -18,7 +18,6 @@ public function handle($request, Closure $next)
  }
 
  if ($user->cant('access cp')) {
- // dd('theres a user but they are unauthorized', $user);
  throw new AuthorizationException('Unauthorized.');
  }
 

src/Policies/AssetContainerPolicy.php

@@ -9,7 +9,9 @@ class AssetContainerPolicy
 {
  public function before($user, $ability)
  {
- if (User::fromUser($user)->hasPermission('configure asset containers')) {
+ $user = User::fromUser($user);
+
+ if ($user->isSuper() || $user->hasPermission('configure asset containers')) {
  return true;
  }
  }

src/Policies/AssetFolderPolicy.php

@@ -8,6 +8,13 @@
 
 class AssetFolderPolicy
 {
+ public function before($user)
+ {
+ if (User::fromUser($user)->isSuper()) {
+ return true;
+ }
+ }
+
  public function create($user, $assetContainer)
  {
  $user = User::fromUser($user);

src/Policies/AssetPolicy.php

@@ -10,7 +10,7 @@ public function before($user)
  {
  $user = User::fromUser($user);
 
- if ($user->hasPermission('configure asset containers')) {
+ if ($user->isSuper() || $user->hasPermission('configure asset containers')) {
  return true;
  }
  }

src/Policies/CollectionPolicy.php

@@ -13,7 +13,7 @@ public function before($user)
  {
  $user = User::fromUser($user);
 
- if ($user->hasPermission('configure collections')) {
+ if ($user->isSuper() || $user->hasPermission('configure collections')) {
  return true;
  }
  }

src/Policies/EntryPolicy.php

@@ -12,7 +12,7 @@ public function before($user)
  {
  $user = User::fromUser($user);
 
- if ($user->hasPermission('configure collections')) {
+ if ($user->isSuper() || $user->hasPermission('configure collections')) {
  return true;
  }
  }

src/Policies/FieldsetPolicy.php

@@ -10,7 +10,7 @@ public function before($user, $ability, $fieldset)
  {
  $user = User::fromUser($user);
 
- if ($user->hasPermission('configure fields')) {
+ if ($user->isSuper() || $user->hasPermission('configure fields')) {
  return true;
  }
  }

src/Policies/FormPolicy.php

@@ -11,7 +11,7 @@ public function before($user, $ability)
  {
  $user = User::fromUser($user);
 
- if ($user->hasPermission('configure forms')) {
+ if ($user->isSuper() || $user->hasPermission('configure forms')) {
  return true;
  }
  }

src/Policies/FormSubmissionPolicy.php

@@ -10,7 +10,7 @@ public function before($user, $ability)
  {
  $user = User::fromUser($user);
 
- if ($user->hasPermission('configure forms')) {
+ if ($user->isSuper() || $user->hasPermission('configure forms')) {
  return true;
  }
  }

src/Policies/GlobalSetPolicy.php

@@ -13,7 +13,7 @@ public function before($user)
  {
  $user = User::fromUser($user);
 
- if ($user->hasPermission('configure globals')) {
+ if ($user->isSuper() || $user->hasPermission('configure globals')) {
  return true;
  }
  }

src/Policies/NavPolicy.php

@@ -13,7 +13,7 @@ public function before($user)
  {
  $user = User::fromUser($user);
 
- if ($user->hasPermission('configure navs')) {
+ if ($user->isSuper() || $user->hasPermission('configure navs')) {
  return true;
  }
  }

src/Policies/NavTreePolicy.php

@@ -8,6 +8,13 @@ class NavTreePolicy extends NavPolicy
 {
  use Concerns\HasMultisitePolicy;
 
+ public function before($user)
+ {
+ if (User::fromUser($user)->isSuper()) {
+ return true;
+ }
+ }
+
  public function view($user, $nav)
  {
  $user = User::fromUser($user);

src/Policies/SitePolicy.php

@@ -7,6 +7,13 @@
 
 class SitePolicy
 {
+ public function before($user)
+ {
+ if (User::fromUser($user)->isSuper()) {
+ return true;
+ }
+ }
+
  public function view($user, $site)
  {
  if (! Site::multiEnabled()) {

src/Policies/TaxonomyPolicy.php

@@ -13,7 +13,7 @@ public function before($user)
  {
  $user = User::fromUser($user);
 
- if ($user->hasPermission('configure taxonomies')) {
+ if ($user->isSuper() || $user->hasPermission('configure taxonomies')) {
  return true;
  }
  }

src/Policies/TermPolicy.php

@@ -12,7 +12,7 @@ public function before($user)
  {
  $user = User::fromUser($user);
 
- if ($user->hasPermission('configure taxonomies')) {
+ if ($user->isSuper() || $user->hasPermission('configure taxonomies')) {
  return true;
  }
  }

src/Policies/UserPolicy.php

@@ -6,6 +6,13 @@
 
 class UserPolicy
 {
+ public function before($user)
+ {
+ if (User::fromUser($user)->isSuper()) {
+ return true;
+ }
+ }
+
  public function index($authed)
  {
  $authed = User::fromUser($authed);

src/Providers/AuthServiceProvider.php

@@ -14,6 +14,7 @@
 use Statamic\Contracts\Auth\RoleRepository;
 use Statamic\Contracts\Auth\UserGroupRepository;
 use Statamic\Contracts\Auth\UserRepository;
+use Statamic\Facades\Permission;
 use Statamic\Facades\User;
 use Statamic\Policies;
 
@@ -83,12 +84,21 @@ public function boot()
  return new UserProvider;
  });
 
- Gate::before(function ($user, $ability) {
- return optional(User::fromUser($user))->isSuper() ? true : null;
- });
-
  Gate::after(function ($user, $ability) {
- return optional(User::fromUser($user))->hasPermission($ability) === true ? true : null;
+ // If the ability isn't a Statamic permission, we don't want to get involved. 🙈
+ if (! Permission::boot()->flattened()->map->value()->contains($ability)) {
+ return null;
+ }
+
+ $user = User::fromUser($user);
+
+ if ($user->isSuper()) {
+ return true;
+ }
+
+ if ($user->hasPermission($ability)) {
+ return true;
+ }
  });
 
  foreach ($this->policies as $key => $policy) {

src/Sites/Site.php

@@ -31,7 +31,7 @@ public function handle()
 
  public function name()
  {
- return $this->config['name'];
+ return $this->config['name'] ?? $this->handle();
  }
 
  public function locale()

tests/CP/Navigation/ActiveNavItemTest.php

@@ -222,8 +222,8 @@ public function it_can_check_if_parent_extension_with_array_based_children_item_
  $nav->tools('SEO Pro')
  ->url('/cp/seo-pro')
  ->children([
- $nav->item('Reports')->url('/cp/seo-pro/reports')->can('view seo reports'),
- $nav->item('Section Defaults')->url('/cp/seo-pro/section-defaults')->can('edit seo section defaults'),
+ $nav->item('Reports')->url('/cp/seo-pro/reports'),
+ $nav->item('Section Defaults')->url('/cp/seo-pro/section-defaults'),
  ]);
  });
 
@@ -247,8 +247,8 @@ public function it_can_check_when_parent_and_array_based_child_extension_items_a
  $nav->tools('SEO Pro')
  ->url('/cp/seo-pro')
  ->children([
- $nav->item('Reports')->url('/cp/seo-pro/reports')->can('view seo reports'),
- $nav->item('Section Defaults')->url('/cp/seo-pro/section-defaults')->can('edit seo section defaults'),
+ $nav->item('Reports')->url('/cp/seo-pro/reports'),
+ $nav->item('Section Defaults')->url('/cp/seo-pro/section-defaults'),
  ]);
  });
 
@@ -272,8 +272,8 @@ public function it_can_check_when_parent_and_array_based_descendant_of_child_ext
  $nav->tools('SEO Pro')
  ->url('/cp/seo-pro')
  ->children([
- $nav->item('Reports')->url('/cp/seo-pro/reports')->can('view seo reports'),
- $nav->item('Section Defaults')->url('/cp/seo-pro/section-defaults')->can('edit seo section defaults'),
+ $nav->item('Reports')->url('/cp/seo-pro/reports'),
+ $nav->item('Section Defaults')->url('/cp/seo-pro/section-defaults'),
  ]);
  });
 
@@ -298,9 +298,9 @@ public function it_builds_extension_children_closure_when_not_active()
  ->url('/cp/seo-pro')
  ->children(function () use ($nav) {
  return [
- $nav->item('Reports')->url('/cp/seo-pro/')->can('view seo reports'),
- $nav->item('Site Defaults')->url('/cp/seo-pro/site-defaults')->can('edit seo site defaults'),
- $nav->item('Section Defaults')->url('/cp/seo-pro/section-defaults')->can('edit seo section defaults'),
+ $nav->item('Reports')->url('/cp/seo-pro/'),
+ $nav->item('Site Defaults')->url('/cp/seo-pro/site-defaults'),
+ $nav->item('Section Defaults')->url('/cp/seo-pro/section-defaults'),
  ];
  });
  });
@@ -324,8 +324,8 @@ public function it_resolves_extension_children_closure_and_can_check_when_parent
  ->url('/cp/seo-pro')
  ->children(function () use ($nav) {
  return [
- $nav->item('Reports')->url('/cp/seo-pro/reports')->can('view seo reports'),
- $nav->item('Section Defaults')->url('/cp/seo-pro/section-defaults')->can('edit seo section defaults'),
+ $nav->item('Reports')->url('/cp/seo-pro/reports'),
+ $nav->item('Section Defaults')->url('/cp/seo-pro/section-defaults'),
  ];
  });
  });
@@ -351,8 +351,8 @@ public function it_resolves_extension_children_closure_and_can_check_when_parent
  ->url('/cp/seo-pro')
  ->children(function () use ($nav) {
  return [
- $nav->item('Reports')->url('/cp/seo-pro/reports')->can('view seo reports'),
- $nav->item('Section Defaults')->url('/cp/seo-pro/section-defaults')->can('edit seo section defaults'),
+ $nav->item('Reports')->url('/cp/seo-pro/reports'),
+ $nav->item('Section Defaults')->url('/cp/seo-pro/section-defaults'),
  ];
  });
  });
@@ -378,8 +378,8 @@ public function it_resolves_extension_children_closure_and_can_check_when_parent
  ->url('/cp/seo-pro')
  ->children(function () use ($nav) {
  return [
- $nav->item('Reports')->url('/cp/seo-pro/reports')->can('view seo reports'),
- $nav->item('Section Defaults')->url('/cp/seo-pro/section-defaults')->can('edit seo section defaults'),
+ $nav->item('Reports')->url('/cp/seo-pro/reports'),
+ $nav->item('Section Defaults')->url('/cp/seo-pro/section-defaults'),
  ];
  });
  });

src/Auth/Permission.php

@@ -105,6 +105,50 @@ public function permissions()
  })->values();
  }
 
+ public function flattened()
+ {
+ if (! $this->callback) {
+ return [
+ $this,
+ ...$this->children()->map(function ($child) {
+ return (new self)
+ ->value($child->value())
+ ->label($child->label())
+ ->placeholder($this->placeholder)
+ ->placeholderLabel($this->placeholderLabel)
+ ->placeholderValue($this->placeholderValue)
+ ->children($child->children()->all())
+ ->group($this->group());
+ })->flatMap->flattened()->all(),
+ ];
+ }
+
+ $items = call_user_func($this->callback);
+
+ return collect($items)->flatMap(function ($replacement) {
+ $replaced = (new self)
+ ->value($this->value)
+ ->label($this->label)
+ ->placeholder($this->placeholder)
+ ->placeholderLabel($replacement['label'])
+ ->placeholderValue($replacement['value'])
+ ->group($this->group());
+
+ $children = $this->children()->map(function ($child) use ($replacement) {
+ return (new self)
+ ->value($child->originalValue())
+ ->label($child->originalLabel())
+ ->placeholder($this->placeholder)
+ ->placeholderLabel($replacement['label'])
+ ->placeholderValue($replacement['value'])
+ ->children($child->children()->all())
+ ->group($this->group());
+ });
+
+ return [$replaced, ...$children->flatMap->flattened()->all()];
+ })->values();
+ }
+
  public function children(?array $children = null)
  {
  return $this

src/Auth/Permissions.php

@@ -10,9 +10,14 @@ class Permissions
  protected $permissions = [];
  protected $groups = [];
  protected $pendingGroup = null;
+ protected $booted = false;
 
  public function boot()
  {
+ if ($this->booted) {
+ return $this;
+ }
+
  $early = $this->permissions;
  $this->permissions = [];
 
@@ -23,6 +28,9 @@ public function boot()
  }
 
  $this->permissions = array_merge($this->permissions, $early);
+ $this->booted = true;
+
+ return $this;
  }
 
  public function extend($callback)
@@ -125,4 +133,9 @@ public function group($name, $label, $permissions = null)
 
  $this->pendingGroup = null;
  }
+
+ public function flattened()
+ {
+ return collect($this->permissions)->flatMap->flattened();
+ }
 }

src/Http/Middleware/CP/Authorize.php

@@ -18,7 +18,6 @@ public function handle($request, Closure $next)
  }
 
  if ($user->cant('access cp')) {
- // dd('theres a user but they are unauthorized', $user);
  throw new AuthorizationException('Unauthorized.');
  }
 

src/Policies/AssetContainerPolicy.php

@@ -9,7 +9,9 @@ class AssetContainerPolicy
 {
  public function before($user, $ability)
  {
- if (User::fromUser($user)->hasPermission('configure asset containers')) {
+ $user = User::fromUser($user);
+
+ if ($user->isSuper() || $user->hasPermission('configure asset containers')) {
  return true;
  }
  }

src/Policies/AssetFolderPolicy.php

@@ -8,6 +8,13 @@
 
 class AssetFolderPolicy
 {
+ public function before($user)
+ {
+ if (User::fromUser($user)->isSuper()) {
+ return true;
+ }
+ }
+
  public function create($user, $assetContainer)
  {
  $user = User::fromUser($user);

src/Policies/AssetPolicy.php

@@ -10,7 +10,7 @@ public function before($user)
  {
  $user = User::fromUser($user);
 
- if ($user->hasPermission('configure asset containers')) {
+ if ($user->isSuper() || $user->hasPermission('configure asset containers')) {
  return true;
  }
  }

src/Policies/CollectionPolicy.php

@@ -13,7 +13,7 @@ public function before($user)
  {
  $user = User::fromUser($user);
 
- if ($user->hasPermission('configure collections')) {
+ if ($user->isSuper() || $user->hasPermission('configure collections')) {
  return true;
  }
  }

src/Policies/EntryPolicy.php

@@ -12,7 +12,7 @@ public function before($user)
  {
  $user = User::fromUser($user);
 
- if ($user->hasPermission('configure collections')) {
+ if ($user->isSuper() || $user->hasPermission('configure collections')) {
  return true;
  }
  }

src/Policies/FieldsetPolicy.php

@@ -10,7 +10,7 @@ public function before($user, $ability, $fieldset)
  {
  $user = User::fromUser($user);
 
- if ($user->hasPermission('configure fields')) {
+ if ($user->isSuper() || $user->hasPermission('configure fields')) {
  return true;
  }
  }

src/Policies/FormPolicy.php

@@ -11,7 +11,7 @@ public function before($user, $ability)
  {
  $user = User::fromUser($user);
 
- if ($user->hasPermission('configure forms')) {
+ if ($user->isSuper() || $user->hasPermission('configure forms')) {
  return true;
  }
  }

src/Policies/FormSubmissionPolicy.php

@@ -10,7 +10,7 @@ public function before($user, $ability)
  {
  $user = User::fromUser($user);
 
- if ($user->hasPermission('configure forms')) {
+ if ($user->isSuper() || $user->hasPermission('configure forms')) {
  return true;
  }
  }

src/Policies/GlobalSetPolicy.php

@@ -13,7 +13,7 @@ public function before($user)
  {
  $user = User::fromUser($user);
 
- if ($user->hasPermission('configure globals')) {
+ if ($user->isSuper() || $user->hasPermission('configure globals')) {
  return true;
  }
  }

src/Policies/NavPolicy.php

@@ -13,7 +13,7 @@ public function before($user)
  {
  $user = User::fromUser($user);
 
- if ($user->hasPermission('configure navs')) {
+ if ($user->isSuper() || $user->hasPermission('configure navs')) {
  return true;
  }
  }

src/Policies/NavTreePolicy.php

@@ -8,6 +8,13 @@ class NavTreePolicy extends NavPolicy
 {
  use Concerns\HasMultisitePolicy;
 
+ public function before($user)
+ {
+ if (User::fromUser($user)->isSuper()) {
+ return true;
+ }
+ }
+
  public function view($user, $nav)
  {
  $user = User::fromUser($user);

src/Policies/SitePolicy.php

@@ -7,6 +7,13 @@
 
 class SitePolicy
 {
+ public function before($user)
+ {
+ if (User::fromUser($user)->isSuper()) {
+ return true;
+ }
+ }
+
  public function view($user, $site)
  {
  if (! Site::multiEnabled()) {

src/Policies/TaxonomyPolicy.php

@@ -13,7 +13,7 @@ public function before($user)
  {
  $user = User::fromUser($user);
 
- if ($user->hasPermission('configure taxonomies')) {
+ if ($user->isSuper() || $user->hasPermission('configure taxonomies')) {
  return true;
  }
  }

src/Policies/TermPolicy.php

@@ -12,7 +12,7 @@ public function before($user)
  {
  $user = User::fromUser($user);
 
- if ($user->hasPermission('configure taxonomies')) {
+ if ($user->isSuper() || $user->hasPermission('configure taxonomies')) {
  return true;
  }
  }

src/Policies/UserPolicy.php

@@ -6,6 +6,13 @@
 
 class UserPolicy
 {
+ public function before($user)
+ {
+ if (User::fromUser($user)->isSuper()) {
+ return true;
+ }
+ }
+
  public function index($authed)
  {
  $authed = User::fromUser($authed);

src/Providers/AuthServiceProvider.php

@@ -14,6 +14,7 @@
 use Statamic\Contracts\Auth\RoleRepository;
 use Statamic\Contracts\Auth\UserGroupRepository;
 use Statamic\Contracts\Auth\UserRepository;
+use Statamic\Facades\Permission;
 use Statamic\Facades\User;
 use Statamic\Policies;
 
@@ -83,12 +84,21 @@ public function boot()
  return new UserProvider;
  });
 
- Gate::before(function ($user, $ability) {
- return optional(User::fromUser($user))->isSuper() ? true : null;
- });
-
  Gate::after(function ($user, $ability) {
- return optional(User::fromUser($user))->hasPermission($ability) === true ? true : null;
+ // If the ability isn't a Statamic permission, we don't want to get involved. 🙈
+ if (! Permission::boot()->flattened()->map->value()->contains($ability)) {
+ return null;
+ }
+
+ $user = User::fromUser($user);
+
+ if ($user->isSuper()) {
+ return true;
+ }
+
+ if ($user->hasPermission($ability)) {
+ return true;
+ }
  });
 
  foreach ($this->policies as $key => $policy) {

src/Sites/Site.php

@@ -31,7 +31,7 @@ public function handle()
 
  public function name()
  {
- return $this->config['name'];
+ return $this->config['name'] ?? $this->handle();
  }
 
  public function locale()

tests/CP/Navigation/ActiveNavItemTest.php

@@ -222,8 +222,8 @@ public function it_can_check_if_parent_extension_with_array_based_children_item_
  $nav->tools('SEO Pro')
  ->url('/cp/seo-pro')
  ->children([
- $nav->item('Reports')->url('/cp/seo-pro/reports')->can('view seo reports'),
- $nav->item('Section Defaults')->url('/cp/seo-pro/section-defaults')->can('edit seo section defaults'),
+ $nav->item('Reports')->url('/cp/seo-pro/reports'),
+ $nav->item('Section Defaults')->url('/cp/seo-pro/section-defaults'),
  ]);
  });
 
@@ -247,8 +247,8 @@ public function it_can_check_when_parent_and_array_based_child_extension_items_a
  $nav->tools('SEO Pro')
  ->url('/cp/seo-pro')
  ->children([
- $nav->item('Reports')->url('/cp/seo-pro/reports')->can('view seo reports'),
- $nav->item('Section Defaults')->url('/cp/seo-pro/section-defaults')->can('edit seo section defaults'),
+ $nav->item('Reports')->url('/cp/seo-pro/reports'),
+ $nav->item('Section Defaults')->url('/cp/seo-pro/section-defaults'),
  ]);
  });
 
@@ -272,8 +272,8 @@ public function it_can_check_when_parent_and_array_based_descendant_of_child_ext
  $nav->tools('SEO Pro')
  ->url('/cp/seo-pro')
  ->children([
- $nav->item('Reports')->url('/cp/seo-pro/reports')->can('view seo reports'),
- $nav->item('Section Defaults')->url('/cp/seo-pro/section-defaults')->can('edit seo section defaults'),
+ $nav->item('Reports')->url('/cp/seo-pro/reports'),
+ $nav->item('Section Defaults')->url('/cp/seo-pro/section-defaults'),
  ]);
  });
 
@@ -298,9 +298,9 @@ public function it_builds_extension_children_closure_when_not_active()
  ->url('/cp/seo-pro')
  ->children(function () use ($nav) {
  return [
- $nav->item('Reports')->url('/cp/seo-pro/')->can('view seo reports'),
- $nav->item('Site Defaults')->url('/cp/seo-pro/site-defaults')->can('edit seo site defaults'),
- $nav->item('Section Defaults')->url('/cp/seo-pro/section-defaults')->can('edit seo section defaults'),
+ $nav->item('Reports')->url('/cp/seo-pro/'),
+ $nav->item('Site Defaults')->url('/cp/seo-pro/site-defaults'),
+ $nav->item('Section Defaults')->url('/cp/seo-pro/section-defaults'),
  ];
  });
  });
@@ -324,8 +324,8 @@ public function it_resolves_extension_children_closure_and_can_check_when_parent
  ->url('/cp/seo-pro')
  ->children(function () use ($nav) {
  return [
- $nav->item('Reports')->url('/cp/seo-pro/reports')->can('view seo reports'),
- $nav->item('Section Defaults')->url('/cp/seo-pro/section-defaults')->can('edit seo section defaults'),
+ $nav->item('Reports')->url('/cp/seo-pro/reports'),
+ $nav->item('Section Defaults')->url('/cp/seo-pro/section-defaults'),
  ];
  });
  });
@@ -351,8 +351,8 @@ public function it_resolves_extension_children_closure_and_can_check_when_parent
  ->url('/cp/seo-pro')
  ->children(function () use ($nav) {
  return [
- $nav->item('Reports')->url('/cp/seo-pro/reports')->can('view seo reports'),
- $nav->item('Section Defaults')->url('/cp/seo-pro/section-defaults')->can('edit seo section defaults'),
+ $nav->item('Reports')->url('/cp/seo-pro/reports'),
+ $nav->item('Section Defaults')->url('/cp/seo-pro/section-defaults'),
  ];
  });
  });
@@ -378,8 +378,8 @@ public function it_resolves_extension_children_closure_and_can_check_when_parent
  ->url('/cp/seo-pro')
  ->children(function () use ($nav) {
  return [
- $nav->item('Reports')->url('/cp/seo-pro/reports')->can('view seo reports'),
- $nav->item('Section Defaults')->url('/cp/seo-pro/section-defaults')->can('edit seo section defaults'),
+ $nav->item('Reports')->url('/cp/seo-pro/reports'),
+ $nav->item('Section Defaults')->url('/cp/seo-pro/section-defaults'),
  ];
  });
  });

src/Auth/Permission.php

@@ -105,6 +105,50 @@ public function permissions()
  })->values();
  }
 
+ public function flattened()
+ {
+ if (! $this->callback) {
+ return [
+ $this,
+ ...$this->children()->map(function ($child) {
+ return (new self)
+ ->value($child->value())
+ ->label($child->label())
+ ->placeholder($this->placeholder)
+ ->placeholderLabel($this->placeholderLabel)
+ ->placeholderValue($this->placeholderValue)
+ ->children($child->children()->all())
+ ->group($this->group());
+ })->flatMap->flattened()->all(),
+ ];
+ }
+
+ $items = call_user_func($this->callback);
+
+ return collect($items)->flatMap(function ($replacement) {
+ $replaced = (new self)
+ ->value($this->value)
+ ->label($this->label)
+ ->placeholder($this->placeholder)
+ ->placeholderLabel($replacement['label'])
+ ->placeholderValue($replacement['value'])
+ ->group($this->group());
+
+ $children = $this->children()->map(function ($child) use ($replacement) {
+ return (new self)
+ ->value($child->originalValue())
+ ->label($child->originalLabel())
+ ->placeholder($this->placeholder)
+ ->placeholderLabel($replacement['label'])
+ ->placeholderValue($replacement['value'])
+ ->children($child->children()->all())
+ ->group($this->group());
+ });
+
+ return [$replaced, ...$children->flatMap->flattened()->all()];
+ })->values();
+ }
+
  public function children(?array $children = null)
  {
  return $this

src/Auth/Permissions.php

@@ -10,9 +10,14 @@ class Permissions
  protected $permissions = [];
  protected $groups = [];
  protected $pendingGroup = null;
+ protected $booted = false;
 
  public function boot()
  {
+ if ($this->booted) {
+ return $this;
+ }
+
  $early = $this->permissions;
  $this->permissions = [];
 
@@ -23,6 +28,9 @@ public function boot()
  }
 
  $this->permissions = array_merge($this->permissions, $early);
+ $this->booted = true;
+
+ return $this;
  }
 
  public function extend($callback)
@@ -125,4 +133,9 @@ public function group($name, $label, $permissions = null)
 
  $this->pendingGroup = null;
  }
+
+ public function flattened()
+ {
+ return collect($this->permissions)->flatMap->flattened();
+ }
 }

src/Http/Middleware/CP/Authorize.php

@@ -18,7 +18,6 @@ public function handle($request, Closure $next)
  }
 
  if ($user->cant('access cp')) {
- // dd('theres a user but they are unauthorized', $user);
  throw new AuthorizationException('Unauthorized.');
  }
 

src/Policies/AssetContainerPolicy.php

@@ -9,7 +9,9 @@ class AssetContainerPolicy
 {
  public function before($user, $ability)
  {
- if (User::fromUser($user)->hasPermission('configure asset containers')) {
+ $user = User::fromUser($user);
+
+ if ($user->isSuper() || $user->hasPermission('configure asset containers')) {
  return true;
  }
  }

src/Policies/AssetFolderPolicy.php

@@ -8,6 +8,13 @@
 
 class AssetFolderPolicy
 {
+ public function before($user)
+ {
+ if (User::fromUser($user)->isSuper()) {
+ return true;
+ }
+ }
+
  public function create($user, $assetContainer)
  {
  $user = User::fromUser($user);

src/Policies/AssetPolicy.php

@@ -10,7 +10,7 @@ public function before($user)
  {
  $user = User::fromUser($user);
 
- if ($user->hasPermission('configure asset containers')) {
+ if ($user->isSuper() || $user->hasPermission('configure asset containers')) {
  return true;
  }
  }

src/Policies/CollectionPolicy.php

@@ -13,7 +13,7 @@ public function before($user)
  {
  $user = User::fromUser($user);
 
- if ($user->hasPermission('configure collections')) {
+ if ($user->isSuper() || $user->hasPermission('configure collections')) {
  return true;
  }
  }

src/Policies/EntryPolicy.php

@@ -12,7 +12,7 @@ public function before($user)
  {
  $user = User::fromUser($user);
 
- if ($user->hasPermission('configure collections')) {
+ if ($user->isSuper() || $user->hasPermission('configure collections')) {
  return true;
  }
  }

src/Policies/FieldsetPolicy.php

@@ -10,7 +10,7 @@ public function before($user, $ability, $fieldset)
  {
  $user = User::fromUser($user);
 
- if ($user->hasPermission('configure fields')) {
+ if ($user->isSuper() || $user->hasPermission('configure fields')) {
  return true;
  }
  }

src/Policies/FormPolicy.php

@@ -11,7 +11,7 @@ public function before($user, $ability)
  {
  $user = User::fromUser($user);
 
- if ($user->hasPermission('configure forms')) {
+ if ($user->isSuper() || $user->hasPermission('configure forms')) {
  return true;
  }
  }

src/Policies/FormSubmissionPolicy.php

@@ -10,7 +10,7 @@ public function before($user, $ability)
  {
  $user = User::fromUser($user);
 
- if ($user->hasPermission('configure forms')) {
+ if ($user->isSuper() || $user->hasPermission('configure forms')) {
  return true;
  }
  }

src/Policies/GlobalSetPolicy.php

@@ -13,7 +13,7 @@ public function before($user)
  {
  $user = User::fromUser($user);
 
- if ($user->hasPermission('configure globals')) {
+ if ($user->isSuper() || $user->hasPermission('configure globals')) {
  return true;
  }
  }

src/Policies/NavPolicy.php

@@ -13,7 +13,7 @@ public function before($user)
  {
  $user = User::fromUser($user);
 
- if ($user->hasPermission('configure navs')) {
+ if ($user->isSuper() || $user->hasPermission('configure navs')) {
  return true;
  }
  }

src/Policies/NavTreePolicy.php

@@ -8,6 +8,13 @@ class NavTreePolicy extends NavPolicy
 {
  use Concerns\HasMultisitePolicy;
 
+ public function before($user)
+ {
+ if (User::fromUser($user)->isSuper()) {
+ return true;
+ }
+ }
+
  public function view($user, $nav)
  {
  $user = User::fromUser($user);

src/Policies/SitePolicy.php

@@ -7,6 +7,13 @@
 
 class SitePolicy
 {
+ public function before($user)
+ {
+ if (User::fromUser($user)->isSuper()) {
+ return true;
+ }
+ }
+
  public function view($user, $site)
  {
  if (! Site::multiEnabled()) {

src/Policies/TaxonomyPolicy.php

@@ -13,7 +13,7 @@ public function before($user)
  {
  $user = User::fromUser($user);
 
- if ($user->hasPermission('configure taxonomies')) {
+ if ($user->isSuper() || $user->hasPermission('configure taxonomies')) {
  return true;
  }
  }

src/Policies/TermPolicy.php

@@ -12,7 +12,7 @@ public function before($user)
  {
  $user = User::fromUser($user);
 
- if ($user->hasPermission('configure taxonomies')) {
+ if ($user->isSuper() || $user->hasPermission('configure taxonomies')) {
  return true;
  }
  }

src/Policies/UserPolicy.php

@@ -6,6 +6,13 @@
 
 class UserPolicy
 {
+ public function before($user)
+ {
+ if (User::fromUser($user)->isSuper()) {
+ return true;
+ }
+ }
+
  public function index($authed)
  {
  $authed = User::fromUser($authed);

src/Providers/AuthServiceProvider.php

@@ -14,6 +14,7 @@
 use Statamic\Contracts\Auth\RoleRepository;
 use Statamic\Contracts\Auth\UserGroupRepository;
 use Statamic\Contracts\Auth\UserRepository;
+use Statamic\Facades\Permission;
 use Statamic\Facades\User;
 use Statamic\Policies;
 
@@ -83,12 +84,21 @@ public function boot()
  return new UserProvider;
  });
 
- Gate::before(function ($user, $ability) {
- return optional(User::fromUser($user))->isSuper() ? true : null;
- });
-
  Gate::after(function ($user, $ability) {
- return optional(User::fromUser($user))->hasPermission($ability) === true ? true : null;
+ // If the ability isn't a Statamic permission, we don't want to get involved. 🙈
+ if (! Permission::boot()->flattened()->map->value()->contains($ability)) {
+ return null;
+ }
+
+ $user = User::fromUser($user);
+
+ if ($user->isSuper()) {
+ return true;
+ }
+
+ if ($user->hasPermission($ability)) {
+ return true;
+ }
  });
 
  foreach ($this->policies as $key => $policy) {

src/Sites/Site.php

@@ -31,7 +31,7 @@ public function handle()
 
  public function name()
  {
- return $this->config['name'];
+ return $this->config['name'] ?? $this->handle();
  }
 
  public function locale()

tests/CP/Navigation/ActiveNavItemTest.php

@@ -222,8 +222,8 @@ public function it_can_check_if_parent_extension_with_array_based_children_item_
  $nav->tools('SEO Pro')
  ->url('/cp/seo-pro')
  ->children([
- $nav->item('Reports')->url('/cp/seo-pro/reports')->can('view seo reports'),
- $nav->item('Section Defaults')->url('/cp/seo-pro/section-defaults')->can('edit seo section defaults'),
+ $nav->item('Reports')->url('/cp/seo-pro/reports'),
+ $nav->item('Section Defaults')->url('/cp/seo-pro/section-defaults'),
  ]);
  });
 
@@ -247,8 +247,8 @@ public function it_can_check_when_parent_and_array_based_child_extension_items_a
  $nav->tools('SEO Pro')
  ->url('/cp/seo-pro')
  ->children([
- $nav->item('Reports')->url('/cp/seo-pro/reports')->can('view seo reports'),
- $nav->item('Section Defaults')->url('/cp/seo-pro/section-defaults')->can('edit seo section defaults'),
+ $nav->item('Reports')->url('/cp/seo-pro/reports'),
+ $nav->item('Section Defaults')->url('/cp/seo-pro/section-defaults'),
  ]);
  });
 
@@ -272,8 +272,8 @@ public function it_can_check_when_parent_and_array_based_descendant_of_child_ext
  $nav->tools('SEO Pro')
  ->url('/cp/seo-pro')
  ->children([
- $nav->item('Reports')->url('/cp/seo-pro/reports')->can('view seo reports'),
- $nav->item('Section Defaults')->url('/cp/seo-pro/section-defaults')->can('edit seo section defaults'),
+ $nav->item('Reports')->url('/cp/seo-pro/reports'),
+ $nav->item('Section Defaults')->url('/cp/seo-pro/section-defaults'),
  ]);
  });
 
@@ -298,9 +298,9 @@ public function it_builds_extension_children_closure_when_not_active()
  ->url('/cp/seo-pro')
  ->children(function () use ($nav) {
  return [
- $nav->item('Reports')->url('/cp/seo-pro/')->can('view seo reports'),
- $nav->item('Site Defaults')->url('/cp/seo-pro/site-defaults')->can('edit seo site defaults'),
- $nav->item('Section Defaults')->url('/cp/seo-pro/section-defaults')->can('edit seo section defaults'),
+ $nav->item('Reports')->url('/cp/seo-pro/'),
+ $nav->item('Site Defaults')->url('/cp/seo-pro/site-defaults'),
+ $nav->item('Section Defaults')->url('/cp/seo-pro/section-defaults'),
  ];
  });
  });
@@ -324,8 +324,8 @@ public function it_resolves_extension_children_closure_and_can_check_when_parent
  ->url('/cp/seo-pro')
  ->children(function () use ($nav) {
  return [
- $nav->item('Reports')->url('/cp/seo-pro/reports')->can('view seo reports'),
- $nav->item('Section Defaults')->url('/cp/seo-pro/section-defaults')->can('edit seo section defaults'),
+ $nav->item('Reports')->url('/cp/seo-pro/reports'),
+ $nav->item('Section Defaults')->url('/cp/seo-pro/section-defaults'),
  ];
  });
  });
@@ -351,8 +351,8 @@ public function it_resolves_extension_children_closure_and_can_check_when_parent
  ->url('/cp/seo-pro')
  ->children(function () use ($nav) {
  return [
- $nav->item('Reports')->url('/cp/seo-pro/reports')->can('view seo reports'),
- $nav->item('Section Defaults')->url('/cp/seo-pro/section-defaults')->can('edit seo section defaults'),
+ $nav->item('Reports')->url('/cp/seo-pro/reports'),
+ $nav->item('Section Defaults')->url('/cp/seo-pro/section-defaults'),
  ];
  });
  });
@@ -378,8 +378,8 @@ public function it_resolves_extension_children_closure_and_can_check_when_parent
  ->url('/cp/seo-pro')
  ->children(function () use ($nav) {
  return [
- $nav->item('Reports')->url('/cp/seo-pro/reports')->can('view seo reports'),
- $nav->item('Section Defaults')->url('/cp/seo-pro/section-defaults')->can('edit seo section defaults'),
+ $nav->item('Reports')->url('/cp/seo-pro/reports'),
+ $nav->item('Section Defaults')->url('/cp/seo-pro/section-defaults'),
  ];
  });
  });

src/Auth/Permission.php

@@ -105,6 +105,50 @@ public function permissions()
  })->values();
  }
 
+ public function flattened()
+ {
+ if (! $this->callback) {
+ return [
+ $this,
+ ...$this->children()->map(function ($child) {
+ return (new self)
+ ->value($child->value())
+ ->label($child->label())
+ ->placeholder($this->placeholder)
+ ->placeholderLabel($this->placeholderLabel)
+ ->placeholderValue($this->placeholderValue)
+ ->children($child->children()->all())
+ ->group($this->group());
+ })->flatMap->flattened()->all(),
+ ];
+ }
+
+ $items = call_user_func($this->callback);
+
+ return collect($items)->flatMap(function ($replacement) {
+ $replaced = (new self)
+ ->value($this->value)
+ ->label($this->label)
+ ->placeholder($this->placeholder)
+ ->placeholderLabel($replacement['label'])
+ ->placeholderValue($replacement['value'])
+ ->group($this->group());
+
+ $children = $this->children()->map(function ($child) use ($replacement) {
+ return (new self)
+ ->value($child->originalValue())
+ ->label($child->originalLabel())
+ ->placeholder($this->placeholder)
+ ->placeholderLabel($replacement['label'])
+ ->placeholderValue($replacement['value'])
+ ->children($child->children()->all())
+ ->group($this->group());
+ });
+
+ return [$replaced, ...$children->flatMap->flattened()->all()];
+ })->values();
+ }
+
  public function children(?array $children = null)
  {
  return $this

src/Auth/Permissions.php

@@ -10,9 +10,14 @@ class Permissions
  protected $permissions = [];
  protected $groups = [];
  protected $pendingGroup = null;
+ protected $booted = false;
 
  public function boot()
  {
+ if ($this->booted) {
+ return $this;
+ }
+
  $early = $this->permissions;
  $this->permissions = [];
 
@@ -23,6 +28,9 @@ public function boot()
  }
 
  $this->permissions = array_merge($this->permissions, $early);
+ $this->booted = true;
+
+ return $this;
  }
 
  public function extend($callback)
@@ -125,4 +133,9 @@ public function group($name, $label, $permissions = null)
 
  $this->pendingGroup = null;
  }
+
+ public function flattened()
+ {
+ return collect($this->permissions)->flatMap->flattened();
+ }
 }

src/Http/Middleware/CP/Authorize.php

@@ -18,7 +18,6 @@ public function handle($request, Closure $next)
  }
 
  if ($user->cant('access cp')) {
- // dd('theres a user but they are unauthorized', $user);
  throw new AuthorizationException('Unauthorized.');
  }
 

src/Policies/AssetContainerPolicy.php

@@ -9,7 +9,9 @@ class AssetContainerPolicy
 {
  public function before($user, $ability)
  {
- if (User::fromUser($user)->hasPermission('configure asset containers')) {
+ $user = User::fromUser($user);
+
+ if ($user->isSuper() || $user->hasPermission('configure asset containers')) {
  return true;
  }
  }

src/Policies/AssetFolderPolicy.php

@@ -8,6 +8,13 @@
 
 class AssetFolderPolicy
 {
+ public function before($user)
+ {
+ if (User::fromUser($user)->isSuper()) {
+ return true;
+ }
+ }
+
  public function create($user, $assetContainer)
  {
  $user = User::fromUser($user);

src/Policies/AssetPolicy.php

@@ -10,7 +10,7 @@ public function before($user)
  {
  $user = User::fromUser($user);
 
- if ($user->hasPermission('configure asset containers')) {
+ if ($user->isSuper() || $user->hasPermission('configure asset containers')) {
  return true;
  }
  }

src/Policies/CollectionPolicy.php

@@ -13,7 +13,7 @@ public function before($user)
  {
  $user = User::fromUser($user);
 
- if ($user->hasPermission('configure collections')) {
+ if ($user->isSuper() || $user->hasPermission('configure collections')) {
  return true;
  }
  }

src/Policies/EntryPolicy.php

@@ -12,7 +12,7 @@ public function before($user)
  {
  $user = User::fromUser($user);
 
- if ($user->hasPermission('configure collections')) {
+ if ($user->isSuper() || $user->hasPermission('configure collections')) {
  return true;
  }
  }

src/Policies/FieldsetPolicy.php

@@ -10,7 +10,7 @@ public function before($user, $ability, $fieldset)
  {
  $user = User::fromUser($user);
 
- if ($user->hasPermission('configure fields')) {
+ if ($user->isSuper() || $user->hasPermission('configure fields')) {
  return true;
  }
  }

src/Policies/FormPolicy.php

@@ -11,7 +11,7 @@ public function before($user, $ability)
  {
  $user = User::fromUser($user);
 
- if ($user->hasPermission('configure forms')) {
+ if ($user->isSuper() || $user->hasPermission('configure forms')) {
  return true;
  }
  }

src/Policies/FormSubmissionPolicy.php

@@ -10,7 +10,7 @@ public function before($user, $ability)
  {
  $user = User::fromUser($user);
 
- if ($user->hasPermission('configure forms')) {
+ if ($user->isSuper() || $user->hasPermission('configure forms')) {
  return true;
  }
  }

src/Policies/GlobalSetPolicy.php

@@ -13,7 +13,7 @@ public function before($user)
  {
  $user = User::fromUser($user);
 
- if ($user->hasPermission('configure globals')) {
+ if ($user->isSuper() || $user->hasPermission('configure globals')) {
  return true;
  }
  }

src/Policies/NavPolicy.php

@@ -13,7 +13,7 @@ public function before($user)
  {
  $user = User::fromUser($user);
 
- if ($user->hasPermission('configure navs')) {
+ if ($user->isSuper() || $user->hasPermission('configure navs')) {
  return true;
  }
  }

src/Policies/NavTreePolicy.php

@@ -8,6 +8,13 @@ class NavTreePolicy extends NavPolicy
 {
  use Concerns\HasMultisitePolicy;
 
+ public function before($user)
+ {
+ if (User::fromUser($user)->isSuper()) {
+ return true;
+ }
+ }
+
  public function view($user, $nav)
  {
  $user = User::fromUser($user);

src/Policies/SitePolicy.php

@@ -7,6 +7,13 @@
 
 class SitePolicy
 {
+ public function before($user)
+ {
+ if (User::fromUser($user)->isSuper()) {
+ return true;
+ }
+ }
+
  public function view($user, $site)
  {
  if (! Site::multiEnabled()) {

src/Policies/TaxonomyPolicy.php

@@ -13,7 +13,7 @@ public function before($user)
  {
  $user = User::fromUser($user);
 
- if ($user->hasPermission('configure taxonomies')) {
+ if ($user->isSuper() || $user->hasPermission('configure taxonomies')) {
  return true;
  }
  }

src/Policies/TermPolicy.php

@@ -12,7 +12,7 @@ public function before($user)
  {
  $user = User::fromUser($user);
 
- if ($user->hasPermission('configure taxonomies')) {
+ if ($user->isSuper() || $user->hasPermission('configure taxonomies')) {
  return true;
  }
  }

src/Policies/UserPolicy.php

@@ -6,6 +6,13 @@
 
 class UserPolicy
 {
+ public function before($user)
+ {
+ if (User::fromUser($user)->isSuper()) {
+ return true;
+ }
+ }
+
  public function index($authed)
  {
  $authed = User::fromUser($authed);

src/Providers/AuthServiceProvider.php

@@ -14,6 +14,7 @@
 use Statamic\Contracts\Auth\RoleRepository;
 use Statamic\Contracts\Auth\UserGroupRepository;
 use Statamic\Contracts\Auth\UserRepository;
+use Statamic\Facades\Permission;
 use Statamic\Facades\User;
 use Statamic\Policies;
 
@@ -83,12 +84,21 @@ public function boot()
  return new UserProvider;
  });
 
- Gate::before(function ($user, $ability) {
- return optional(User::fromUser($user))->isSuper() ? true : null;
- });
-
  Gate::after(function ($user, $ability) {
- return optional(User::fromUser($user))->hasPermission($ability) === true ? true : null;
+ // If the ability isn't a Statamic permission, we don't want to get involved. 🙈
+ if (! Permission::boot()->flattened()->map->value()->contains($ability)) {
+ return null;
+ }
+
+ $user = User::fromUser($user);
+
+ if ($user->isSuper()) {
+ return true;
+ }
+
+ if ($user->hasPermission($ability)) {
+ return true;
+ }
  });
 
  foreach ($this->policies as $key => $policy) {

src/Sites/Site.php

@@ -31,7 +31,7 @@ public function handle()
 
  public function name()
  {
- return $this->config['name'];
+ return $this->config['name'] ?? $this->handle();
  }
 
  public function locale()

tests/CP/Navigation/ActiveNavItemTest.php

@@ -222,8 +222,8 @@ public function it_can_check_if_parent_extension_with_array_based_children_item_
  $nav->tools('SEO Pro')
  ->url('/cp/seo-pro')
  ->children([
- $nav->item('Reports')->url('/cp/seo-pro/reports')->can('view seo reports'),
- $nav->item('Section Defaults')->url('/cp/seo-pro/section-defaults')->can('edit seo section defaults'),
+ $nav->item('Reports')->url('/cp/seo-pro/reports'),
+ $nav->item('Section Defaults')->url('/cp/seo-pro/section-defaults'),
  ]);
  });
 
@@ -247,8 +247,8 @@ public function it_can_check_when_parent_and_array_based_child_extension_items_a
  $nav->tools('SEO Pro')
  ->url('/cp/seo-pro')
  ->children([
- $nav->item('Reports')->url('/cp/seo-pro/reports')->can('view seo reports'),
- $nav->item('Section Defaults')->url('/cp/seo-pro/section-defaults')->can('edit seo section defaults'),
+ $nav->item('Reports')->url('/cp/seo-pro/reports'),
+ $nav->item('Section Defaults')->url('/cp/seo-pro/section-defaults'),
  ]);
  });
 
@@ -272,8 +272,8 @@ public function it_can_check_when_parent_and_array_based_descendant_of_child_ext
  $nav->tools('SEO Pro')
  ->url('/cp/seo-pro')
  ->children([
- $nav->item('Reports')->url('/cp/seo-pro/reports')->can('view seo reports'),
- $nav->item('Section Defaults')->url('/cp/seo-pro/section-defaults')->can('edit seo section defaults'),
+ $nav->item('Reports')->url('/cp/seo-pro/reports'),
+ $nav->item('Section Defaults')->url('/cp/seo-pro/section-defaults'),
  ]);
  });
 
@@ -298,9 +298,9 @@ public function it_builds_extension_children_closure_when_not_active()
  ->url('/cp/seo-pro')
  ->children(function () use ($nav) {
  return [
- $nav->item('Reports')->url('/cp/seo-pro/')->can('view seo reports'),
- $nav->item('Site Defaults')->url('/cp/seo-pro/site-defaults')->can('edit seo site defaults'),
- $nav->item('Section Defaults')->url('/cp/seo-pro/section-defaults')->can('edit seo section defaults'),
+ $nav->item('Reports')->url('/cp/seo-pro/'),
+ $nav->item('Site Defaults')->url('/cp/seo-pro/site-defaults'),
+ $nav->item('Section Defaults')->url('/cp/seo-pro/section-defaults'),
  ];
  });
  });
@@ -324,8 +324,8 @@ public function it_resolves_extension_children_closure_and_can_check_when_parent
  ->url('/cp/seo-pro')
  ->children(function () use ($nav) {
  return [
- $nav->item('Reports')->url('/cp/seo-pro/reports')->can('view seo reports'),
- $nav->item('Section Defaults')->url('/cp/seo-pro/section-defaults')->can('edit seo section defaults'),
+ $nav->item('Reports')->url('/cp/seo-pro/reports'),
+ $nav->item('Section Defaults')->url('/cp/seo-pro/section-defaults'),
  ];
  });
  });
@@ -351,8 +351,8 @@ public function it_resolves_extension_children_closure_and_can_check_when_parent
  ->url('/cp/seo-pro')
  ->children(function () use ($nav) {
  return [
- $nav->item('Reports')->url('/cp/seo-pro/reports')->can('view seo reports'),
- $nav->item('Section Defaults')->url('/cp/seo-pro/section-defaults')->can('edit seo section defaults'),
+ $nav->item('Reports')->url('/cp/seo-pro/reports'),
+ $nav->item('Section Defaults')->url('/cp/seo-pro/section-defaults'),
  ];
  });
  });
@@ -378,8 +378,8 @@ public function it_resolves_extension_children_closure_and_can_check_when_parent
  ->url('/cp/seo-pro')
  ->children(function () use ($nav) {
  return [
- $nav->item('Reports')->url('/cp/seo-pro/reports')->can('view seo reports'),
- $nav->item('Section Defaults')->url('/cp/seo-pro/section-defaults')->can('edit seo section defaults'),
+ $nav->item('Reports')->url('/cp/seo-pro/reports'),
+ $nav->item('Section Defaults')->url('/cp/seo-pro/section-defaults'),
  ];
  });
  });

src/Auth/Permission.php

@@ -105,6 +105,50 @@ public function permissions()
  })->values();
  }
 
+ public function flattened()
+ {
+ if (! $this->callback) {
+ return [
+ $this,
+ ...$this->children()->map(function ($child) {
+ return (new self)
+ ->value($child->value())
+ ->label($child->label())
+ ->placeholder($this->placeholder)
+ ->placeholderLabel($this->placeholderLabel)
+ ->placeholderValue($this->placeholderValue)
+ ->children($child->children()->all())
+ ->group($this->group());
+ })->flatMap->flattened()->all(),
+ ];
+ }
+
+ $items = call_user_func($this->callback);
+
+ return collect($items)->flatMap(function ($replacement) {
+ $replaced = (new self)
+ ->value($this->value)
+ ->label($this->label)
+ ->placeholder($this->placeholder)
+ ->placeholderLabel($replacement['label'])
+ ->placeholderValue($replacement['value'])
+ ->group($this->group());
+
+ $children = $this->children()->map(function ($child) use ($replacement) {
+ return (new self)
+ ->value($child->originalValue())
+ ->label($child->originalLabel())
+ ->placeholder($this->placeholder)
+ ->placeholderLabel($replacement['label'])
+ ->placeholderValue($replacement['value'])
+ ->children($child->children()->all())
+ ->group($this->group());
+ });
+
+ return [$replaced, ...$children->flatMap->flattened()->all()];
+ })->values();
+ }
+
  public function children(?array $children = null)
  {
  return $this

src/Auth/Permissions.php

@@ -10,9 +10,14 @@ class Permissions
  protected $permissions = [];
  protected $groups = [];
  protected $pendingGroup = null;
+ protected $booted = false;
 
  public function boot()
  {
+ if ($this->booted) {
+ return $this;
+ }
+
  $early = $this->permissions;
  $this->permissions = [];
 
@@ -23,6 +28,9 @@ public function boot()
  }
 
  $this->permissions = array_merge($this->permissions, $early);
+ $this->booted = true;
+
+ return $this;
  }
 
  public function extend($callback)
@@ -125,4 +133,9 @@ public function group($name, $label, $permissions = null)
 
  $this->pendingGroup = null;
  }
+
+ public function flattened()
+ {
+ return collect($this->permissions)->flatMap->flattened();
+ }
 }

src/Http/Middleware/CP/Authorize.php

@@ -18,7 +18,6 @@ public function handle($request, Closure $next)
  }
 
  if ($user->cant('access cp')) {
- // dd('theres a user but they are unauthorized', $user);
  throw new AuthorizationException('Unauthorized.');
  }
 

src/Policies/AssetContainerPolicy.php

@@ -9,7 +9,9 @@ class AssetContainerPolicy
 {
  public function before($user, $ability)
  {
- if (User::fromUser($user)->hasPermission('configure asset containers')) {
+ $user = User::fromUser($user);
+
+ if ($user->isSuper() || $user->hasPermission('configure asset containers')) {
  return true;
  }
  }

src/Policies/AssetFolderPolicy.php

@@ -8,6 +8,13 @@
 
 class AssetFolderPolicy
 {
+ public function before($user)
+ {
+ if (User::fromUser($user)->isSuper()) {
+ return true;
+ }
+ }
+
  public function create($user, $assetContainer)
  {
  $user = User::fromUser($user);

src/Policies/AssetPolicy.php

@@ -10,7 +10,7 @@ public function before($user)
  {
  $user = User::fromUser($user);
 
- if ($user->hasPermission('configure asset containers')) {
+ if ($user->isSuper() || $user->hasPermission('configure asset containers')) {
  return true;
  }
  }

src/Policies/CollectionPolicy.php

@@ -13,7 +13,7 @@ public function before($user)
  {
  $user = User::fromUser($user);
 
- if ($user->hasPermission('configure collections')) {
+ if ($user->isSuper() || $user->hasPermission('configure collections')) {
  return true;
  }
  }

src/Policies/EntryPolicy.php

@@ -12,7 +12,7 @@ public function before($user)
  {
  $user = User::fromUser($user);
 
- if ($user->hasPermission('configure collections')) {
+ if ($user->isSuper() || $user->hasPermission('configure collections')) {
  return true;
  }
  }

src/Policies/FieldsetPolicy.php

@@ -10,7 +10,7 @@ public function before($user, $ability, $fieldset)
  {
  $user = User::fromUser($user);
 
- if ($user->hasPermission('configure fields')) {
+ if ($user->isSuper() || $user->hasPermission('configure fields')) {
  return true;
  }
  }

src/Policies/FormPolicy.php

@@ -11,7 +11,7 @@ public function before($user, $ability)
  {
  $user = User::fromUser($user);
 
- if ($user->hasPermission('configure forms')) {
+ if ($user->isSuper() || $user->hasPermission('configure forms')) {
  return true;
  }
  }

src/Policies/FormSubmissionPolicy.php

@@ -10,7 +10,7 @@ public function before($user, $ability)
  {
  $user = User::fromUser($user);
 
- if ($user->hasPermission('configure forms')) {
+ if ($user->isSuper() || $user->hasPermission('configure forms')) {
  return true;
  }
  }

src/Policies/GlobalSetPolicy.php

@@ -13,7 +13,7 @@ public function before($user)
  {
  $user = User::fromUser($user);
 
- if ($user->hasPermission('configure globals')) {
+ if ($user->isSuper() || $user->hasPermission('configure globals')) {
  return true;
  }
  }

src/Policies/NavPolicy.php

@@ -13,7 +13,7 @@ public function before($user)
  {
  $user = User::fromUser($user);
 
- if ($user->hasPermission('configure navs')) {
+ if ($user->isSuper() || $user->hasPermission('configure navs')) {
  return true;
  }
  }

src/Policies/NavTreePolicy.php

@@ -8,6 +8,13 @@ class NavTreePolicy extends NavPolicy
 {
  use Concerns\HasMultisitePolicy;
 
+ public function before($user)
+ {
+ if (User::fromUser($user)->isSuper()) {
+ return true;
+ }
+ }
+
  public function view($user, $nav)
  {
  $user = User::fromUser($user);

src/Policies/SitePolicy.php

@@ -7,6 +7,13 @@
 
 class SitePolicy
 {
+ public function before($user)
+ {
+ if (User::fromUser($user)->isSuper()) {
+ return true;
+ }
+ }
+
  public function view($user, $site)
  {
  if (! Site::multiEnabled()) {

src/Policies/TaxonomyPolicy.php

@@ -13,7 +13,7 @@ public function before($user)
  {
  $user = User::fromUser($user);
 
- if ($user->hasPermission('configure taxonomies')) {
+ if ($user->isSuper() || $user->hasPermission('configure taxonomies')) {
  return true;
  }
  }

src/Policies/TermPolicy.php

@@ -12,7 +12,7 @@ public function before($user)
  {
  $user = User::fromUser($user);
 
- if ($user->hasPermission('configure taxonomies')) {
+ if ($user->isSuper() || $user->hasPermission('configure taxonomies')) {
  return true;
  }
  }

src/Policies/UserPolicy.php

@@ -6,6 +6,13 @@
 
 class UserPolicy
 {
+ public function before($user)
+ {
+ if (User::fromUser($user)->isSuper()) {
+ return true;
+ }
+ }
+
  public function index($authed)
  {
  $authed = User::fromUser($authed);

src/Providers/AuthServiceProvider.php

@@ -14,6 +14,7 @@
 use Statamic\Contracts\Auth\RoleRepository;
 use Statamic\Contracts\Auth\UserGroupRepository;
 use Statamic\Contracts\Auth\UserRepository;
+use Statamic\Facades\Permission;
 use Statamic\Facades\User;
 use Statamic\Policies;
 
@@ -83,12 +84,21 @@ public function boot()
  return new UserProvider;
  });
 
- Gate::before(function ($user, $ability) {
- return optional(User::fromUser($user))->isSuper() ? true : null;
- });
-
  Gate::after(function ($user, $ability) {
- return optional(User::fromUser($user))->hasPermission($ability) === true ? true : null;
+ // If the ability isn't a Statamic permission, we don't want to get involved. 🙈
+ if (! Permission::boot()->flattened()->map->value()->contains($ability)) {
+ return null;
+ }
+
+ $user = User::fromUser($user);
+
+ if ($user->isSuper()) {
+ return true;
+ }
+
+ if ($user->hasPermission($ability)) {
+ return true;
+ }
  });
 
  foreach ($this->policies as $key => $policy) {

src/Sites/Site.php

@@ -31,7 +31,7 @@ public function handle()
 
  public function name()
  {
- return $this->config['name'];
+ return $this->config['name'] ?? $this->handle();
  }
 
  public function locale()

tests/CP/Navigation/ActiveNavItemTest.php

@@ -222,8 +222,8 @@ public function it_can_check_if_parent_extension_with_array_based_children_item_
  $nav->tools('SEO Pro')
  ->url('/cp/seo-pro')
  ->children([
- $nav->item('Reports')->url('/cp/seo-pro/reports')->can('view seo reports'),
- $nav->item('Section Defaults')->url('/cp/seo-pro/section-defaults')->can('edit seo section defaults'),
+ $nav->item('Reports')->url('/cp/seo-pro/reports'),
+ $nav->item('Section Defaults')->url('/cp/seo-pro/section-defaults'),
  ]);
  });
 
@@ -247,8 +247,8 @@ public function it_can_check_when_parent_and_array_based_child_extension_items_a
  $nav->tools('SEO Pro')
  ->url('/cp/seo-pro')
  ->children([
- $nav->item('Reports')->url('/cp/seo-pro/reports')->can('view seo reports'),
- $nav->item('Section Defaults')->url('/cp/seo-pro/section-defaults')->can('edit seo section defaults'),
+ $nav->item('Reports')->url('/cp/seo-pro/reports'),
+ $nav->item('Section Defaults')->url('/cp/seo-pro/section-defaults'),
  ]);
  });
 
@@ -272,8 +272,8 @@ public function it_can_check_when_parent_and_array_based_descendant_of_child_ext
  $nav->tools('SEO Pro')
  ->url('/cp/seo-pro')
  ->children([
- $nav->item('Reports')->url('/cp/seo-pro/reports')->can('view seo reports'),
- $nav->item('Section Defaults')->url('/cp/seo-pro/section-defaults')->can('edit seo section defaults'),
+ $nav->item('Reports')->url('/cp/seo-pro/reports'),
+ $nav->item('Section Defaults')->url('/cp/seo-pro/section-defaults'),
  ]);
  });
 
@@ -298,9 +298,9 @@ public function it_builds_extension_children_closure_when_not_active()
  ->url('/cp/seo-pro')
  ->children(function () use ($nav) {
  return [
- $nav->item('Reports')->url('/cp/seo-pro/')->can('view seo reports'),
- $nav->item('Site Defaults')->url('/cp/seo-pro/site-defaults')->can('edit seo site defaults'),
- $nav->item('Section Defaults')->url('/cp/seo-pro/section-defaults')->can('edit seo section defaults'),
+ $nav->item('Reports')->url('/cp/seo-pro/'),
+ $nav->item('Site Defaults')->url('/cp/seo-pro/site-defaults'),
+ $nav->item('Section Defaults')->url('/cp/seo-pro/section-defaults'),
  ];
  });
  });
@@ -324,8 +324,8 @@ public function it_resolves_extension_children_closure_and_can_check_when_parent
  ->url('/cp/seo-pro')
  ->children(function () use ($nav) {
  return [
- $nav->item('Reports')->url('/cp/seo-pro/reports')->can('view seo reports'),
- $nav->item('Section Defaults')->url('/cp/seo-pro/section-defaults')->can('edit seo section defaults'),
+ $nav->item('Reports')->url('/cp/seo-pro/reports'),
+ $nav->item('Section Defaults')->url('/cp/seo-pro/section-defaults'),
  ];
  });
  });
@@ -351,8 +351,8 @@ public function it_resolves_extension_children_closure_and_can_check_when_parent
  ->url('/cp/seo-pro')
  ->children(function () use ($nav) {
  return [
- $nav->item('Reports')->url('/cp/seo-pro/reports')->can('view seo reports'),
- $nav->item('Section Defaults')->url('/cp/seo-pro/section-defaults')->can('edit seo section defaults'),
+ $nav->item('Reports')->url('/cp/seo-pro/reports'),
+ $nav->item('Section Defaults')->url('/cp/seo-pro/section-defaults'),
  ];
  });
  });
@@ -378,8 +378,8 @@ public function it_resolves_extension_children_closure_and_can_check_when_parent
  ->url('/cp/seo-pro')
  ->children(function () use ($nav) {
  return [
- $nav->item('Reports')->url('/cp/seo-pro/reports')->can('view seo reports'),
- $nav->item('Section Defaults')->url('/cp/seo-pro/section-defaults')->can('edit seo section defaults'),
+ $nav->item('Reports')->url('/cp/seo-pro/reports'),
+ $nav->item('Section Defaults')->url('/cp/seo-pro/section-defaults'),
  ];
  });
  });

src/Auth/Permission.php

@@ -105,6 +105,50 @@ public function permissions()
  })->values();
  }
 
+ public function flattened()
+ {
+ if (! $this->callback) {
+ return [
+ $this,
+ ...$this->children()->map(function ($child) {
+ return (new self)
+ ->value($child->value())
+ ->label($child->label())
+ ->placeholder($this->placeholder)
+ ->placeholderLabel($this->placeholderLabel)
+ ->placeholderValue($this->placeholderValue)
+ ->children($child->children()->all())
+ ->group($this->group());
+ })->flatMap->flattened()->all(),
+ ];
+ }
+
+ $items = call_user_func($this->callback);
+
+ return collect($items)->flatMap(function ($replacement) {
+ $replaced = (new self)
+ ->value($this->value)
+ ->label($this->label)
+ ->placeholder($this->placeholder)
+ ->placeholderLabel($replacement['label'])
+ ->placeholderValue($replacement['value'])
+ ->group($this->group());
+
+ $children = $this->children()->map(function ($child) use ($replacement) {
+ return (new self)
+ ->value($child->originalValue())
+ ->label($child->originalLabel())
+ ->placeholder($this->placeholder)
+ ->placeholderLabel($replacement['label'])
+ ->placeholderValue($replacement['value'])
+ ->children($child->children()->all())
+ ->group($this->group());
+ });
+
+ return [$replaced, ...$children->flatMap->flattened()->all()];
+ })->values();
+ }
+
  public function children(?array $children = null)
  {
  return $this

src/Auth/Permissions.php

@@ -10,9 +10,14 @@ class Permissions
  protected $permissions = [];
  protected $groups = [];
  protected $pendingGroup = null;
+ protected $booted = false;
 
  public function boot()
  {
+ if ($this->booted) {
+ return $this;
+ }
+
  $early = $this->permissions;
  $this->permissions = [];
 
@@ -23,6 +28,9 @@ public function boot()
  }
 
  $this->permissions = array_merge($this->permissions, $early);
+ $this->booted = true;
+
+ return $this;
  }
 
  public function extend($callback)
@@ -125,4 +133,9 @@ public function group($name, $label, $permissions = null)
 
  $this->pendingGroup = null;
  }
+
+ public function flattened()
+ {
+ return collect($this->permissions)->flatMap->flattened();
+ }
 }

src/Http/Middleware/CP/Authorize.php

@@ -18,7 +18,6 @@ public function handle($request, Closure $next)
  }
 
  if ($user->cant('access cp')) {
- // dd('theres a user but they are unauthorized', $user);
  throw new AuthorizationException('Unauthorized.');
  }
 

src/Policies/AssetContainerPolicy.php

@@ -9,7 +9,9 @@ class AssetContainerPolicy
 {
  public function before($user, $ability)
  {
- if (User::fromUser($user)->hasPermission('configure asset containers')) {
+ $user = User::fromUser($user);
+
+ if ($user->isSuper() || $user->hasPermission('configure asset containers')) {
  return true;
  }
  }

src/Policies/AssetFolderPolicy.php

@@ -8,6 +8,13 @@
 
 class AssetFolderPolicy
 {
+ public function before($user)
+ {
+ if (User::fromUser($user)->isSuper()) {
+ return true;
+ }
+ }
+
  public function create($user, $assetContainer)
  {
  $user = User::fromUser($user);

src/Policies/AssetPolicy.php

@@ -10,7 +10,7 @@ public function before($user)
  {
  $user = User::fromUser($user);
 
- if ($user->hasPermission('configure asset containers')) {
+ if ($user->isSuper() || $user->hasPermission('configure asset containers')) {
  return true;
  }
  }

src/Policies/CollectionPolicy.php

@@ -13,7 +13,7 @@ public function before($user)
  {
  $user = User::fromUser($user);
 
- if ($user->hasPermission('configure collections')) {
+ if ($user->isSuper() || $user->hasPermission('configure collections')) {
  return true;
  }
  }

src/Policies/EntryPolicy.php

@@ -12,7 +12,7 @@ public function before($user)
  {
  $user = User::fromUser($user);
 
- if ($user->hasPermission('configure collections')) {
+ if ($user->isSuper() || $user->hasPermission('configure collections')) {
  return true;
  }
  }

src/Policies/FieldsetPolicy.php

@@ -10,7 +10,7 @@ public function before($user, $ability, $fieldset)
  {
  $user = User::fromUser($user);
 
- if ($user->hasPermission('configure fields')) {
+ if ($user->isSuper() || $user->hasPermission('configure fields')) {
  return true;
  }
  }

src/Policies/FormPolicy.php

@@ -11,7 +11,7 @@ public function before($user, $ability)
  {
  $user = User::fromUser($user);
 
- if ($user->hasPermission('configure forms')) {
+ if ($user->isSuper() || $user->hasPermission('configure forms')) {
  return true;
  }
  }

src/Policies/FormSubmissionPolicy.php

@@ -10,7 +10,7 @@ public function before($user, $ability)
  {
  $user = User::fromUser($user);
 
- if ($user->hasPermission('configure forms')) {
+ if ($user->isSuper() || $user->hasPermission('configure forms')) {
  return true;
  }
  }

src/Policies/GlobalSetPolicy.php

@@ -13,7 +13,7 @@ public function before($user)
  {
  $user = User::fromUser($user);
 
- if ($user->hasPermission('configure globals')) {
+ if ($user->isSuper() || $user->hasPermission('configure globals')) {
  return true;
  }
  }

src/Policies/NavPolicy.php

@@ -13,7 +13,7 @@ public function before($user)
  {
  $user = User::fromUser($user);
 
- if ($user->hasPermission('configure navs')) {
+ if ($user->isSuper() || $user->hasPermission('configure navs')) {
  return true;
  }
  }

src/Policies/NavTreePolicy.php

@@ -8,6 +8,13 @@ class NavTreePolicy extends NavPolicy
 {
  use Concerns\HasMultisitePolicy;
 
+ public function before($user)
+ {
+ if (User::fromUser($user)->isSuper()) {
+ return true;
+ }
+ }
+
  public function view($user, $nav)
  {
  $user = User::fromUser($user);

src/Policies/SitePolicy.php

@@ -7,6 +7,13 @@
 
 class SitePolicy
 {
+ public function before($user)
+ {
+ if (User::fromUser($user)->isSuper()) {
+ return true;
+ }
+ }
+
  public function view($user, $site)
  {
  if (! Site::multiEnabled()) {

src/Policies/TaxonomyPolicy.php

@@ -13,7 +13,7 @@ public function before($user)
  {
  $user = User::fromUser($user);
 
- if ($user->hasPermission('configure taxonomies')) {
+ if ($user->isSuper() || $user->hasPermission('configure taxonomies')) {
  return true;
  }
  }

src/Policies/TermPolicy.php

@@ -12,7 +12,7 @@ public function before($user)
  {
  $user = User::fromUser($user);
 
- if ($user->hasPermission('configure taxonomies')) {
+ if ($user->isSuper() || $user->hasPermission('configure taxonomies')) {
  return true;
  }
  }

src/Policies/UserPolicy.php

@@ -6,6 +6,13 @@
 
 class UserPolicy
 {
+ public function before($user)
+ {
+ if (User::fromUser($user)->isSuper()) {
+ return true;
+ }
+ }
+
  public function index($authed)
  {
  $authed = User::fromUser($authed);

src/Providers/AuthServiceProvider.php

@@ -14,6 +14,7 @@
 use Statamic\Contracts\Auth\RoleRepository;
 use Statamic\Contracts\Auth\UserGroupRepository;
 use Statamic\Contracts\Auth\UserRepository;
+use Statamic\Facades\Permission;
 use Statamic\Facades\User;
 use Statamic\Policies;
 
@@ -83,12 +84,21 @@ public function boot()
  return new UserProvider;
  });
 
- Gate::before(function ($user, $ability) {
- return optional(User::fromUser($user))->isSuper() ? true : null;
- });
-
  Gate::after(function ($user, $ability) {
- return optional(User::fromUser($user))->hasPermission($ability) === true ? true : null;
+ // If the ability isn't a Statamic permission, we don't want to get involved. 🙈
+ if (! Permission::boot()->flattened()->map->value()->contains($ability)) {
+ return null;
+ }
+
+ $user = User::fromUser($user);
+
+ if ($user->isSuper()) {
+ return true;
+ }
+
+ if ($user->hasPermission($ability)) {
+ return true;
+ }
  });
 
  foreach ($this->policies as $key => $policy) {

src/Sites/Site.php

@@ -31,7 +31,7 @@ public function handle()
 
  public function name()
  {
- return $this->config['name'];
+ return $this->config['name'] ?? $this->handle();
  }
 
  public function locale()

tests/CP/Navigation/ActiveNavItemTest.php

@@ -222,8 +222,8 @@ public function it_can_check_if_parent_extension_with_array_based_children_item_
  $nav->tools('SEO Pro')
  ->url('/cp/seo-pro')
  ->children([
- $nav->item('Reports')->url('/cp/seo-pro/reports')->can('view seo reports'),
- $nav->item('Section Defaults')->url('/cp/seo-pro/section-defaults')->can('edit seo section defaults'),
+ $nav->item('Reports')->url('/cp/seo-pro/reports'),
+ $nav->item('Section Defaults')->url('/cp/seo-pro/section-defaults'),
  ]);
  });
 
@@ -247,8 +247,8 @@ public function it_can_check_when_parent_and_array_based_child_extension_items_a
  $nav->tools('SEO Pro')
  ->url('/cp/seo-pro')
  ->children([
- $nav->item('Reports')->url('/cp/seo-pro/reports')->can('view seo reports'),
- $nav->item('Section Defaults')->url('/cp/seo-pro/section-defaults')->can('edit seo section defaults'),
+ $nav->item('Reports')->url('/cp/seo-pro/reports'),
+ $nav->item('Section Defaults')->url('/cp/seo-pro/section-defaults'),
  ]);
  });
 
@@ -272,8 +272,8 @@ public function it_can_check_when_parent_and_array_based_descendant_of_child_ext
  $nav->tools('SEO Pro')
  ->url('/cp/seo-pro')
  ->children([
- $nav->item('Reports')->url('/cp/seo-pro/reports')->can('view seo reports'),
- $nav->item('Section Defaults')->url('/cp/seo-pro/section-defaults')->can('edit seo section defaults'),
+ $nav->item('Reports')->url('/cp/seo-pro/reports'),
+ $nav->item('Section Defaults')->url('/cp/seo-pro/section-defaults'),
  ]);
  });
 
@@ -298,9 +298,9 @@ public function it_builds_extension_children_closure_when_not_active()
  ->url('/cp/seo-pro')
  ->children(function () use ($nav) {
  return [
- $nav->item('Reports')->url('/cp/seo-pro/')->can('view seo reports'),
- $nav->item('Site Defaults')->url('/cp/seo-pro/site-defaults')->can('edit seo site defaults'),
- $nav->item('Section Defaults')->url('/cp/seo-pro/section-defaults')->can('edit seo section defaults'),
+ $nav->item('Reports')->url('/cp/seo-pro/'),
+ $nav->item('Site Defaults')->url('/cp/seo-pro/site-defaults'),
+ $nav->item('Section Defaults')->url('/cp/seo-pro/section-defaults'),
  ];
  });
  });
@@ -324,8 +324,8 @@ public function it_resolves_extension_children_closure_and_can_check_when_parent
  ->url('/cp/seo-pro')
  ->children(function () use ($nav) {
  return [
- $nav->item('Reports')->url('/cp/seo-pro/reports')->can('view seo reports'),
- $nav->item('Section Defaults')->url('/cp/seo-pro/section-defaults')->can('edit seo section defaults'),
+ $nav->item('Reports')->url('/cp/seo-pro/reports'),
+ $nav->item('Section Defaults')->url('/cp/seo-pro/section-defaults'),
  ];
  });
  });
@@ -351,8 +351,8 @@ public function it_resolves_extension_children_closure_and_can_check_when_parent
  ->url('/cp/seo-pro')
  ->children(function () use ($nav) {
  return [
- $nav->item('Reports')->url('/cp/seo-pro/reports')->can('view seo reports'),
- $nav->item('Section Defaults')->url('/cp/seo-pro/section-defaults')->can('edit seo section defaults'),
+ $nav->item('Reports')->url('/cp/seo-pro/reports'),
+ $nav->item('Section Defaults')->url('/cp/seo-pro/section-defaults'),
  ];
  });
  });
@@ -378,8 +378,8 @@ public function it_resolves_extension_children_closure_and_can_check_when_parent
  ->url('/cp/seo-pro')
  ->children(function () use ($nav) {
  return [
- $nav->item('Reports')->url('/cp/seo-pro/reports')->can('view seo reports'),
- $nav->item('Section Defaults')->url('/cp/seo-pro/section-defaults')->can('edit seo section defaults'),
+ $nav->item('Reports')->url('/cp/seo-pro/reports'),
+ $nav->item('Section Defaults')->url('/cp/seo-pro/section-defaults'),
  ];
  });
  });

src/Auth/Permission.php

@@ -105,6 +105,50 @@ public function permissions()
  })->values();
  }
 
+ public function flattened()
+ {
+ if (! $this->callback) {
+ return [
+ $this,
+ ...$this->children()->map(function ($child) {
+ return (new self)
+ ->value($child->value())
+ ->label($child->label())
+ ->placeholder($this->placeholder)
+ ->placeholderLabel($this->placeholderLabel)
+ ->placeholderValue($this->placeholderValue)
+ ->children($child->children()->all())
+ ->group($this->group());
+ })->flatMap->flattened()->all(),
+ ];
+ }
+
+ $items = call_user_func($this->callback);
+
+ return collect($items)->flatMap(function ($replacement) {
+ $replaced = (new self)
+ ->value($this->value)
+ ->label($this->label)
+ ->placeholder($this->placeholder)
+ ->placeholderLabel($replacement['label'])
+ ->placeholderValue($replacement['value'])
+ ->group($this->group());
+
+ $children = $this->children()->map(function ($child) use ($replacement) {
+ return (new self)
+ ->value($child->originalValue())
+ ->label($child->originalLabel())
+ ->placeholder($this->placeholder)
+ ->placeholderLabel($replacement['label'])
+ ->placeholderValue($replacement['value'])
+ ->children($child->children()->all())
+ ->group($this->group());
+ });
+
+ return [$replaced, ...$children->flatMap->flattened()->all()];
+ })->values();
+ }
+
  public function children(?array $children = null)
  {
  return $this

src/Auth/Permissions.php

@@ -10,9 +10,14 @@ class Permissions
  protected $permissions = [];
  protected $groups = [];
  protected $pendingGroup = null;
+ protected $booted = false;
 
  public function boot()
  {
+ if ($this->booted) {
+ return $this;
+ }
+
  $early = $this->permissions;
  $this->permissions = [];
 
@@ -23,6 +28,9 @@ public function boot()
  }
 
  $this->permissions = array_merge($this->permissions, $early);
+ $this->booted = true;
+
+ return $this;
  }
 
  public function extend($callback)
@@ -125,4 +133,9 @@ public function group($name, $label, $permissions = null)
 
  $this->pendingGroup = null;
  }
+
+ public function flattened()
+ {
+ return collect($this->permissions)->flatMap->flattened();
+ }
 }

src/Http/Middleware/CP/Authorize.php

@@ -18,7 +18,6 @@ public function handle($request, Closure $next)
  }
 
  if ($user->cant('access cp')) {
- // dd('theres a user but they are unauthorized', $user);
  throw new AuthorizationException('Unauthorized.');
  }
 

src/Policies/AssetContainerPolicy.php

@@ -9,7 +9,9 @@ class AssetContainerPolicy
 {
  public function before($user, $ability)
  {
- if (User::fromUser($user)->hasPermission('configure asset containers')) {
+ $user = User::fromUser($user);
+
+ if ($user->isSuper() || $user->hasPermission('configure asset containers')) {
  return true;
  }
  }

src/Policies/AssetFolderPolicy.php

@@ -8,6 +8,13 @@
 
 class AssetFolderPolicy
 {
+ public function before($user)
+ {
+ if (User::fromUser($user)->isSuper()) {
+ return true;
+ }
+ }
+
  public function create($user, $assetContainer)
  {
  $user = User::fromUser($user);

src/Policies/AssetPolicy.php

@@ -10,7 +10,7 @@ public function before($user)
  {
  $user = User::fromUser($user);
 
- if ($user->hasPermission('configure asset containers')) {
+ if ($user->isSuper() || $user->hasPermission('configure asset containers')) {
  return true;
  }
  }

src/Policies/CollectionPolicy.php

@@ -13,7 +13,7 @@ public function before($user)
  {
  $user = User::fromUser($user);
 
- if ($user->hasPermission('configure collections')) {
+ if ($user->isSuper() || $user->hasPermission('configure collections')) {
  return true;
  }
  }

src/Policies/EntryPolicy.php

@@ -12,7 +12,7 @@ public function before($user)
  {
  $user = User::fromUser($user);
 
- if ($user->hasPermission('configure collections')) {
+ if ($user->isSuper() || $user->hasPermission('configure collections')) {
  return true;
  }
  }

src/Policies/FieldsetPolicy.php

@@ -10,7 +10,7 @@ public function before($user, $ability, $fieldset)
  {
  $user = User::fromUser($user);
 
- if ($user->hasPermission('configure fields')) {
+ if ($user->isSuper() || $user->hasPermission('configure fields')) {
  return true;
  }
  }

src/Policies/FormPolicy.php

@@ -11,7 +11,7 @@ public function before($user, $ability)
  {
  $user = User::fromUser($user);
 
- if ($user->hasPermission('configure forms')) {
+ if ($user->isSuper() || $user->hasPermission('configure forms')) {
  return true;
  }
  }

src/Policies/FormSubmissionPolicy.php

@@ -10,7 +10,7 @@ public function before($user, $ability)
  {
  $user = User::fromUser($user);
 
- if ($user->hasPermission('configure forms')) {
+ if ($user->isSuper() || $user->hasPermission('configure forms')) {
  return true;
  }
  }

src/Policies/GlobalSetPolicy.php

@@ -13,7 +13,7 @@ public function before($user)
  {
  $user = User::fromUser($user);
 
- if ($user->hasPermission('configure globals')) {
+ if ($user->isSuper() || $user->hasPermission('configure globals')) {
  return true;
  }
  }

src/Policies/NavPolicy.php

@@ -13,7 +13,7 @@ public function before($user)
  {
  $user = User::fromUser($user);
 
- if ($user->hasPermission('configure navs')) {
+ if ($user->isSuper() || $user->hasPermission('configure navs')) {
  return true;
  }
  }

src/Policies/NavTreePolicy.php

@@ -8,6 +8,13 @@ class NavTreePolicy extends NavPolicy
 {
  use Concerns\HasMultisitePolicy;
 
+ public function before($user)
+ {
+ if (User::fromUser($user)->isSuper()) {
+ return true;
+ }
+ }
+
  public function view($user, $nav)
  {
  $user = User::fromUser($user);

src/Policies/SitePolicy.php

@@ -7,6 +7,13 @@
 
 class SitePolicy
 {
+ public function before($user)
+ {
+ if (User::fromUser($user)->isSuper()) {
+ return true;
+ }
+ }
+
  public function view($user, $site)
  {
  if (! Site::multiEnabled()) {

src/Policies/TaxonomyPolicy.php

@@ -13,7 +13,7 @@ public function before($user)
  {
  $user = User::fromUser($user);
 
- if ($user->hasPermission('configure taxonomies')) {
+ if ($user->isSuper() || $user->hasPermission('configure taxonomies')) {
  return true;
  }
  }

src/Policies/TermPolicy.php

@@ -12,7 +12,7 @@ public function before($user)
  {
  $user = User::fromUser($user);
 
- if ($user->hasPermission('configure taxonomies')) {
+ if ($user->isSuper() || $user->hasPermission('configure taxonomies')) {
  return true;
  }
  }

src/Policies/UserPolicy.php

@@ -6,6 +6,13 @@
 
 class UserPolicy
 {
+ public function before($user)
+ {
+ if (User::fromUser($user)->isSuper()) {
+ return true;
+ }
+ }
+
  public function index($authed)
  {
  $authed = User::fromUser($authed);

src/Providers/AuthServiceProvider.php

@@ -14,6 +14,7 @@
 use Statamic\Contracts\Auth\RoleRepository;
 use Statamic\Contracts\Auth\UserGroupRepository;
 use Statamic\Contracts\Auth\UserRepository;
+use Statamic\Facades\Permission;
 use Statamic\Facades\User;
 use Statamic\Policies;
 
@@ -83,12 +84,21 @@ public function boot()
  return new UserProvider;
  });
 
- Gate::before(function ($user, $ability) {
- return optional(User::fromUser($user))->isSuper() ? true : null;
- });
-
  Gate::after(function ($user, $ability) {
- return optional(User::fromUser($user))->hasPermission($ability) === true ? true : null;
+ // If the ability isn't a Statamic permission, we don't want to get involved. 🙈
+ if (! Permission::boot()->flattened()->map->value()->contains($ability)) {
+ return null;
+ }
+
+ $user = User::fromUser($user);
+
+ if ($user->isSuper()) {
+ return true;
+ }
+
+ if ($user->hasPermission($ability)) {
+ return true;
+ }
  });
 
  foreach ($this->policies as $key => $policy) {

src/Sites/Site.php

@@ -31,7 +31,7 @@ public function handle()
 
  public function name()
  {
- return $this->config['name'];
+ return $this->config['name'] ?? $this->handle();
  }
 
  public function locale()

tests/CP/Navigation/ActiveNavItemTest.php

@@ -222,8 +222,8 @@ public function it_can_check_if_parent_extension_with_array_based_children_item_
  $nav->tools('SEO Pro')
  ->url('/cp/seo-pro')
  ->children([
- $nav->item('Reports')->url('/cp/seo-pro/reports')->can('view seo reports'),
- $nav->item('Section Defaults')->url('/cp/seo-pro/section-defaults')->can('edit seo section defaults'),
+ $nav->item('Reports')->url('/cp/seo-pro/reports'),
+ $nav->item('Section Defaults')->url('/cp/seo-pro/section-defaults'),
  ]);
  });
 
@@ -247,8 +247,8 @@ public function it_can_check_when_parent_and_array_based_child_extension_items_a
  $nav->tools('SEO Pro')
  ->url('/cp/seo-pro')
  ->children([
- $nav->item('Reports')->url('/cp/seo-pro/reports')->can('view seo reports'),
- $nav->item('Section Defaults')->url('/cp/seo-pro/section-defaults')->can('edit seo section defaults'),
+ $nav->item('Reports')->url('/cp/seo-pro/reports'),
+ $nav->item('Section Defaults')->url('/cp/seo-pro/section-defaults'),
  ]);
  });
 
@@ -272,8 +272,8 @@ public function it_can_check_when_parent_and_array_based_descendant_of_child_ext
  $nav->tools('SEO Pro')
  ->url('/cp/seo-pro')
  ->children([
- $nav->item('Reports')->url('/cp/seo-pro/reports')->can('view seo reports'),
- $nav->item('Section Defaults')->url('/cp/seo-pro/section-defaults')->can('edit seo section defaults'),
+ $nav->item('Reports')->url('/cp/seo-pro/reports'),
+ $nav->item('Section Defaults')->url('/cp/seo-pro/section-defaults'),
  ]);
  });
 
@@ -298,9 +298,9 @@ public function it_builds_extension_children_closure_when_not_active()
  ->url('/cp/seo-pro')
  ->children(function () use ($nav) {
  return [
- $nav->item('Reports')->url('/cp/seo-pro/')->can('view seo reports'),
- $nav->item('Site Defaults')->url('/cp/seo-pro/site-defaults')->can('edit seo site defaults'),
- $nav->item('Section Defaults')->url('/cp/seo-pro/section-defaults')->can('edit seo section defaults'),
+ $nav->item('Reports')->url('/cp/seo-pro/'),
+ $nav->item('Site Defaults')->url('/cp/seo-pro/site-defaults'),
+ $nav->item('Section Defaults')->url('/cp/seo-pro/section-defaults'),
  ];
  });
  });
@@ -324,8 +324,8 @@ public function it_resolves_extension_children_closure_and_can_check_when_parent
  ->url('/cp/seo-pro')
  ->children(function () use ($nav) {
  return [
- $nav->item('Reports')->url('/cp/seo-pro/reports')->can('view seo reports'),
- $nav->item('Section Defaults')->url('/cp/seo-pro/section-defaults')->can('edit seo section defaults'),
+ $nav->item('Reports')->url('/cp/seo-pro/reports'),
+ $nav->item('Section Defaults')->url('/cp/seo-pro/section-defaults'),
  ];
  });
  });
@@ -351,8 +351,8 @@ public function it_resolves_extension_children_closure_and_can_check_when_parent
  ->url('/cp/seo-pro')
  ->children(function () use ($nav) {
  return [
- $nav->item('Reports')->url('/cp/seo-pro/reports')->can('view seo reports'),
- $nav->item('Section Defaults')->url('/cp/seo-pro/section-defaults')->can('edit seo section defaults'),
+ $nav->item('Reports')->url('/cp/seo-pro/reports'),
+ $nav->item('Section Defaults')->url('/cp/seo-pro/section-defaults'),
  ];
  });
  });
@@ -378,8 +378,8 @@ public function it_resolves_extension_children_closure_and_can_check_when_parent
  ->url('/cp/seo-pro')
  ->children(function () use ($nav) {
  return [
- $nav->item('Reports')->url('/cp/seo-pro/reports')->can('view seo reports'),
- $nav->item('Section Defaults')->url('/cp/seo-pro/section-defaults')->can('edit seo section defaults'),
+ $nav->item('Reports')->url('/cp/seo-pro/reports'),
+ $nav->item('Section Defaults')->url('/cp/seo-pro/section-defaults'),
  ];
  });
  });

src/Auth/Permission.php

@@ -105,6 +105,50 @@ public function permissions()
  })->values();
  }
 
+ public function flattened()
+ {
+ if (! $this->callback) {
+ return [
+ $this,
+ ...$this->children()->map(function ($child) {
+ return (new self)
+ ->value($child->value())
+ ->label($child->label())
+ ->placeholder($this->placeholder)
+ ->placeholderLabel($this->placeholderLabel)
+ ->placeholderValue($this->placeholderValue)
+ ->children($child->children()->all())
+ ->group($this->group());
+ })->flatMap->flattened()->all(),
+ ];
+ }
+
+ $items = call_user_func($this->callback);
+
+ return collect($items)->flatMap(function ($replacement) {
+ $replaced = (new self)
+ ->value($this->value)
+ ->label($this->label)
+ ->placeholder($this->placeholder)
+ ->placeholderLabel($replacement['label'])
+ ->placeholderValue($replacement['value'])
+ ->group($this->group());
+
+ $children = $this->children()->map(function ($child) use ($replacement) {
+ return (new self)
+ ->value($child->originalValue())
+ ->label($child->originalLabel())
+ ->placeholder($this->placeholder)
+ ->placeholderLabel($replacement['label'])
+ ->placeholderValue($replacement['value'])
+ ->children($child->children()->all())
+ ->group($this->group());
+ });
+
+ return [$replaced, ...$children->flatMap->flattened()->all()];
+ })->values();
+ }
+
  public function children(?array $children = null)
  {
  return $this

src/Auth/Permissions.php

@@ -10,9 +10,14 @@ class Permissions
  protected $permissions = [];
  protected $groups = [];
  protected $pendingGroup = null;
+ protected $booted = false;
 
  public function boot()
  {
+ if ($this->booted) {
+ return $this;
+ }
+
  $early = $this->permissions;
  $this->permissions = [];
 
@@ -23,6 +28,9 @@ public function boot()
  }
 
  $this->permissions = array_merge($this->permissions, $early);
+ $this->booted = true;
+
+ return $this;
  }
 
  public function extend($callback)
@@ -125,4 +133,9 @@ public function group($name, $label, $permissions = null)
 
  $this->pendingGroup = null;
  }
+
+ public function flattened()
+ {
+ return collect($this->permissions)->flatMap->flattened();
+ }
 }

src/Http/Middleware/CP/Authorize.php

@@ -18,7 +18,6 @@ public function handle($request, Closure $next)
  }
 
  if ($user->cant('access cp')) {
- // dd('theres a user but they are unauthorized', $user);
  throw new AuthorizationException('Unauthorized.');
  }
 

src/Policies/AssetContainerPolicy.php

@@ -9,7 +9,9 @@ class AssetContainerPolicy
 {
  public function before($user, $ability)
  {
- if (User::fromUser($user)->hasPermission('configure asset containers')) {
+ $user = User::fromUser($user);
+
+ if ($user->isSuper() || $user->hasPermission('configure asset containers')) {
  return true;
  }
  }

src/Policies/AssetFolderPolicy.php

@@ -8,6 +8,13 @@
 
 class AssetFolderPolicy
 {
+ public function before($user)
+ {
+ if (User::fromUser($user)->isSuper()) {
+ return true;
+ }
+ }
+
  public function create($user, $assetContainer)
  {
  $user = User::fromUser($user);

src/Policies/AssetPolicy.php

@@ -10,7 +10,7 @@ public function before($user)
  {
  $user = User::fromUser($user);
 
- if ($user->hasPermission('configure asset containers')) {
+ if ($user->isSuper() || $user->hasPermission('configure asset containers')) {
  return true;
  }
  }

src/Policies/CollectionPolicy.php

@@ -13,7 +13,7 @@ public function before($user)
  {
  $user = User::fromUser($user);
 
- if ($user->hasPermission('configure collections')) {
+ if ($user->isSuper() || $user->hasPermission('configure collections')) {
  return true;
  }
  }

src/Policies/EntryPolicy.php

@@ -12,7 +12,7 @@ public function before($user)
  {
  $user = User::fromUser($user);
 
- if ($user->hasPermission('configure collections')) {
+ if ($user->isSuper() || $user->hasPermission('configure collections')) {
  return true;
  }
  }

src/Policies/FieldsetPolicy.php

@@ -10,7 +10,7 @@ public function before($user, $ability, $fieldset)
  {
  $user = User::fromUser($user);
 
- if ($user->hasPermission('configure fields')) {
+ if ($user->isSuper() || $user->hasPermission('configure fields')) {
  return true;
  }
  }

src/Policies/FormPolicy.php

@@ -11,7 +11,7 @@ public function before($user, $ability)
  {
  $user = User::fromUser($user);
 
- if ($user->hasPermission('configure forms')) {
+ if ($user->isSuper() || $user->hasPermission('configure forms')) {
  return true;
  }
  }

src/Policies/FormSubmissionPolicy.php

@@ -10,7 +10,7 @@ public function before($user, $ability)
  {
  $user = User::fromUser($user);
 
- if ($user->hasPermission('configure forms')) {
+ if ($user->isSuper() || $user->hasPermission('configure forms')) {
  return true;
  }
  }

src/Policies/GlobalSetPolicy.php

@@ -13,7 +13,7 @@ public function before($user)
  {
  $user = User::fromUser($user);
 
- if ($user->hasPermission('configure globals')) {
+ if ($user->isSuper() || $user->hasPermission('configure globals')) {
  return true;
  }
  }

src/Policies/NavPolicy.php

@@ -13,7 +13,7 @@ public function before($user)
  {
  $user = User::fromUser($user);
 
- if ($user->hasPermission('configure navs')) {
+ if ($user->isSuper() || $user->hasPermission('configure navs')) {
  return true;
  }
  }

src/Policies/NavTreePolicy.php

@@ -8,6 +8,13 @@ class NavTreePolicy extends NavPolicy
 {
  use Concerns\HasMultisitePolicy;
 
+ public function before($user)
+ {
+ if (User::fromUser($user)->isSuper()) {
+ return true;
+ }
+ }
+
  public function view($user, $nav)
  {
  $user = User::fromUser($user);

src/Policies/SitePolicy.php

@@ -7,6 +7,13 @@
 
 class SitePolicy
 {
+ public function before($user)
+ {
+ if (User::fromUser($user)->isSuper()) {
+ return true;
+ }
+ }
+
  public function view($user, $site)
  {
  if (! Site::multiEnabled()) {

src/Policies/TaxonomyPolicy.php

@@ -13,7 +13,7 @@ public function before($user)
  {
  $user = User::fromUser($user);
 
- if ($user->hasPermission('configure taxonomies')) {
+ if ($user->isSuper() || $user->hasPermission('configure taxonomies')) {
  return true;
  }
  }

src/Policies/TermPolicy.php

@@ -12,7 +12,7 @@ public function before($user)
  {
  $user = User::fromUser($user);
 
- if ($user->hasPermission('configure taxonomies')) {
+ if ($user->isSuper() || $user->hasPermission('configure taxonomies')) {
  return true;
  }
  }

src/Policies/UserPolicy.php

@@ -6,6 +6,13 @@
 
 class UserPolicy
 {
+ public function before($user)
+ {
+ if (User::fromUser($user)->isSuper()) {
+ return true;
+ }
+ }
+
  public function index($authed)
  {
  $authed = User::fromUser($authed);

src/Providers/AuthServiceProvider.php

@@ -14,6 +14,7 @@
 use Statamic\Contracts\Auth\RoleRepository;
 use Statamic\Contracts\Auth\UserGroupRepository;
 use Statamic\Contracts\Auth\UserRepository;
+use Statamic\Facades\Permission;
 use Statamic\Facades\User;
 use Statamic\Policies;
 
@@ -83,12 +84,21 @@ public function boot()
  return new UserProvider;
  });
 
- Gate::before(function ($user, $ability) {
- return optional(User::fromUser($user))->isSuper() ? true : null;
- });
-
  Gate::after(function ($user, $ability) {
- return optional(User::fromUser($user))->hasPermission($ability) === true ? true : null;
+ // If the ability isn't a Statamic permission, we don't want to get involved. 🙈
+ if (! Permission::boot()->flattened()->map->value()->contains($ability)) {
+ return null;
+ }
+
+ $user = User::fromUser($user);
+
+ if ($user->isSuper()) {
+ return true;
+ }
+
+ if ($user->hasPermission($ability)) {
+ return true;
+ }
  });
 
  foreach ($this->policies as $key => $policy) {

src/Sites/Site.php

@@ -31,7 +31,7 @@ public function handle()
 
  public function name()
  {
- return $this->config['name'];
+ return $this->config['name'] ?? $this->handle();
  }
 
  public function locale()

tests/CP/Navigation/ActiveNavItemTest.php

@@ -222,8 +222,8 @@ public function it_can_check_if_parent_extension_with_array_based_children_item_
  $nav->tools('SEO Pro')
  ->url('/cp/seo-pro')
  ->children([
- $nav->item('Reports')->url('/cp/seo-pro/reports')->can('view seo reports'),
- $nav->item('Section Defaults')->url('/cp/seo-pro/section-defaults')->can('edit seo section defaults'),
+ $nav->item('Reports')->url('/cp/seo-pro/reports'),
+ $nav->item('Section Defaults')->url('/cp/seo-pro/section-defaults'),
  ]);
  });
 
@@ -247,8 +247,8 @@ public function it_can_check_when_parent_and_array_based_child_extension_items_a
  $nav->tools('SEO Pro')
  ->url('/cp/seo-pro')
  ->children([
- $nav->item('Reports')->url('/cp/seo-pro/reports')->can('view seo reports'),
- $nav->item('Section Defaults')->url('/cp/seo-pro/section-defaults')->can('edit seo section defaults'),
+ $nav->item('Reports')->url('/cp/seo-pro/reports'),
+ $nav->item('Section Defaults')->url('/cp/seo-pro/section-defaults'),
  ]);
  });
 
@@ -272,8 +272,8 @@ public function it_can_check_when_parent_and_array_based_descendant_of_child_ext
  $nav->tools('SEO Pro')
  ->url('/cp/seo-pro')
  ->children([
- $nav->item('Reports')->url('/cp/seo-pro/reports')->can('view seo reports'),
- $nav->item('Section Defaults')->url('/cp/seo-pro/section-defaults')->can('edit seo section defaults'),
+ $nav->item('Reports')->url('/cp/seo-pro/reports'),
+ $nav->item('Section Defaults')->url('/cp/seo-pro/section-defaults'),
  ]);
  });
 
@@ -298,9 +298,9 @@ public function it_builds_extension_children_closure_when_not_active()
  ->url('/cp/seo-pro')
  ->children(function () use ($nav) {
  return [
- $nav->item('Reports')->url('/cp/seo-pro/')->can('view seo reports'),
- $nav->item('Site Defaults')->url('/cp/seo-pro/site-defaults')->can('edit seo site defaults'),
- $nav->item('Section Defaults')->url('/cp/seo-pro/section-defaults')->can('edit seo section defaults'),
+ $nav->item('Reports')->url('/cp/seo-pro/'),
+ $nav->item('Site Defaults')->url('/cp/seo-pro/site-defaults'),
+ $nav->item('Section Defaults')->url('/cp/seo-pro/section-defaults'),
  ];
  });
  });
@@ -324,8 +324,8 @@ public function it_resolves_extension_children_closure_and_can_check_when_parent
  ->url('/cp/seo-pro')
  ->children(function () use ($nav) {
  return [
- $nav->item('Reports')->url('/cp/seo-pro/reports')->can('view seo reports'),
- $nav->item('Section Defaults')->url('/cp/seo-pro/section-defaults')->can('edit seo section defaults'),
+ $nav->item('Reports')->url('/cp/seo-pro/reports'),
+ $nav->item('Section Defaults')->url('/cp/seo-pro/section-defaults'),
  ];
  });
  });
@@ -351,8 +351,8 @@ public function it_resolves_extension_children_closure_and_can_check_when_parent
  ->url('/cp/seo-pro')
  ->children(function () use ($nav) {
  return [
- $nav->item('Reports')->url('/cp/seo-pro/reports')->can('view seo reports'),
- $nav->item('Section Defaults')->url('/cp/seo-pro/section-defaults')->can('edit seo section defaults'),
+ $nav->item('Reports')->url('/cp/seo-pro/reports'),
+ $nav->item('Section Defaults')->url('/cp/seo-pro/section-defaults'),
  ];
  });
  });
@@ -378,8 +378,8 @@ public function it_resolves_extension_children_closure_and_can_check_when_parent
  ->url('/cp/seo-pro')
  ->children(function () use ($nav) {
  return [
- $nav->item('Reports')->url('/cp/seo-pro/reports')->can('view seo reports'),
- $nav->item('Section Defaults')->url('/cp/seo-pro/section-defaults')->can('edit seo section defaults'),
+ $nav->item('Reports')->url('/cp/seo-pro/reports'),
+ $nav->item('Section Defaults')->url('/cp/seo-pro/section-defaults'),
  ];
  });
  });