From 045fae9b6fedc8fa2e2f65789302b6d62410feea Mon Sep 17 00:00:00 2001
From: Matias Griese <matias@trilbymedia.com>
Date: Mon, 27 Jan 2020 14:03:56 +0200
Subject: [PATCH] Flex: Blueprint updates

---
 composer.lock                           | 10 +++----
 system/blueprints/flex/accounts.yaml    | 35 +++++++++++++++----------
 system/blueprints/flex/pages.yaml       | 27 ++++++++++++-------
 system/blueprints/flex/user-groups.yaml | 31 ++++++++++++++--------
 4 files changed, 64 insertions(+), 39 deletions(-)

diff --git a/composer.lock b/composer.lock
index 6d96f8e9c..d3fce90e7 100644
--- a/composer.lock
+++ b/composer.lock
@@ -355,16 +355,16 @@
         },
         {
             "name": "enshrined/svg-sanitize",
-            "version": "0.13.2",
+            "version": "0.13.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/darylldoyle/svg-sanitizer.git",
-                "reference": "19e85021505b29f3055c1f57a620ee4aa5c24113"
+                "reference": "bc66593f255b7d2613d8f22041180036979b6403"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/darylldoyle/svg-sanitizer/zipball/19e85021505b29f3055c1f57a620ee4aa5c24113",
-                "reference": "19e85021505b29f3055c1f57a620ee4aa5c24113",
+                "url": "https://api.github.com/repos/darylldoyle/svg-sanitizer/zipball/bc66593f255b7d2613d8f22041180036979b6403",
+                "reference": "bc66593f255b7d2613d8f22041180036979b6403",
                 "shasum": ""
             },
             "require": {
@@ -392,7 +392,7 @@
                 }
             ],
             "description": "An SVG sanitizer for PHP",
-            "time": "2019-12-09T09:24:04+00:00"
+            "time": "2020-01-20T01:34:17+00:00"
         },
         {
             "name": "erusev/parsedown",
diff --git a/system/blueprints/flex/accounts.yaml b/system/blueprints/flex/accounts.yaml
index 896dd6c66..db763f48c 100644
--- a/system/blueprints/flex/accounts.yaml
+++ b/system/blueprints/flex/accounts.yaml
@@ -9,15 +9,27 @@ extends@:
 
 # Flex configuration
 config:
-  # Administration Configuration (needs Flex-Objects plugin)
+  # Administration Configuration (needs Flex Objects plugin)
   admin:
-    # Admin route
-    route: '/accounts/users'
-    aliases:
-      configure: '/accounts/configure'
-    redirect_from:
-      - '/user'
-      - '/accounts'
+    # Admin router
+    router:
+      path: '/accounts/users'
+      actions:
+        configure:
+          path: '/accounts/configure'
+      redirects:
+        '/user': '/accounts/users'
+        '/accounts': '/accounts/users'
+
+    # Permissions
+    permissions:
+      # Primary permissions
+      admin.users:
+        type: crudpl
+        label: User Accounts
+      admin.configuration.users:
+        type: default
+        label: Accounts Configuration
 
     # Admin menu
     menu:
@@ -33,12 +45,6 @@ config:
     # Admin template type (folder)
     template: grav-accounts
 
-    # Permissions
-    permissions:
-      admin.users:
-        type: crudpl
-        label: User Accounts
-
     # List view
     list:
       # Fields shown in the list view
@@ -65,6 +71,7 @@ config:
     # Configure view
     configure:
       hidden: true
+      authorize: 'admin.configuration.users'
       form: 'accounts'
       title:
         template: "{{ 'PLUGIN_ADMIN.ACCOUNTS'|tu }} {{ 'PLUGIN_ADMIN.CONFIGURATION'|tu }}"
diff --git a/system/blueprints/flex/pages.yaml b/system/blueprints/flex/pages.yaml
index 35c8d95ab..e65caf050 100644
--- a/system/blueprints/flex/pages.yaml
+++ b/system/blueprints/flex/pages.yaml
@@ -9,10 +9,21 @@ extends@:
 
 # Flex configuration
 config:
-  # Administration Configuration (needs Flex-Objects plugin)
+  # Administration Configuration (needs Flex Objects plugin)
   admin:
-    # Admin route
-    route: '/pages'
+    # Admin router
+    router:
+      path: '/pages'
+
+    # Permissions
+    permissions:
+      # Primary permissions
+      admin.pages:
+        type: crudpl
+        label: Pages
+      admin.configuration.pages:
+        type: default
+        label: Pages Configuration
 
     # Admin menu
     menu:
@@ -26,12 +37,6 @@ config:
     # Admin template type (folder)
     template: grav-pages
 
-    # Permissions
-    permissions:
-      admin.pages:
-        type: crudpl
-        label: Pages
-
     # Allowed admin actions
     actions:
       list: true
@@ -122,6 +127,10 @@ config:
     preview:
       enabled: true
 
+    # Configure view
+    configure:
+      authorize: 'admin.configuration.pages'
+
   # Site Configuration
   site:
     # Hide from flex types
diff --git a/system/blueprints/flex/user-groups.yaml b/system/blueprints/flex/user-groups.yaml
index dd27621ab..6b71617b4 100644
--- a/system/blueprints/flex/user-groups.yaml
+++ b/system/blueprints/flex/user-groups.yaml
@@ -9,12 +9,26 @@ extends@:
 
 # Flex configuration
 config:
-  # Administration Configuration (needs Flex-Objects plugin)
+  # Administration Configuration (needs Flex Objects plugin)
   admin:
-    # Admin route
-    route: '/accounts/groups'
-    aliases:
-      configure: '/accounts/configure'
+    # Admin router
+    router:
+      path: '/accounts/groups'
+      actions:
+        configure:
+          path: '/accounts/configure'
+      redirects:
+        '/accounts': '/accounts/groups'
+
+    # Permissions
+    permissions:
+      # Primary permissions
+      admin.users:
+        type: crudl
+        label: User Accounts
+      admin.configuration.users:
+        type: default
+        label: Accounts Configuration
 
     # Admin menu
     menu:
@@ -30,12 +44,6 @@ config:
     # Admin template type (folder)
     template: grav-user-groups
 
-    # Permissions
-    permissions:
-      admin.users:
-        type: crudl
-        label: User Groups
-
     # List view
     list:
       # Fields shown in the list view
@@ -62,6 +70,7 @@ config:
     # Configure view
     configure:
       hidden: true
+      authorize: 'admin.configuration.users'
       form: 'accounts'
       title:
         template: "{{ 'PLUGIN_ADMIN.ACCOUNTS'|tu }} {{ 'PLUGIN_ADMIN.CONFIGURATION'|tu }}"