From 78da3525b3688783be91937294c3af6c7827a1ab Mon Sep 17 00:00:00 2001
From: Vladimir Malik <vladimir@pearlconvert.no>
Date: Wed, 7 Aug 2024 09:23:08 +0200
Subject: [PATCH] Added ACL config. Config cleanup.

---
 etc/acl.xml                               | 18 ++++++++++++++++++
 etc/adminhtml/system/signifyd.xml         |  2 +-
 etc/adminhtml/system/signifyd/logs.xml    |  4 ++--
 etc/adminhtml/system/signifyd/webhook.xml |  3 +--
 4 files changed, 22 insertions(+), 5 deletions(-)
 create mode 100644 etc/acl.xml

diff --git a/etc/acl.xml b/etc/acl.xml
new file mode 100644
index 00000000..d8d995f4
--- /dev/null
+++ b/etc/acl.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0"?>
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:framework:Acl/etc/acl.xsd">
+    <acl>
+        <resources>
+            <resource id="Magento_Backend::admin">
+                <resource id="Magento_Backend::stores">
+                    <resource id="Magento_Backend::stores_settings">
+                        <resource id="Magento_Config::config">
+                            <resource id="Signifyd_Connect::config_signifyd" title="Signifyd" translate="title"
+                                      sortOrder="20"/>
+                        </resource>
+                    </resource>
+                </resource>
+            </resource>
+        </resources>
+    </acl>
+</config>
\ No newline at end of file
diff --git a/etc/adminhtml/system/signifyd.xml b/etc/adminhtml/system/signifyd.xml
index ab470a28..c508bc5f 100644
--- a/etc/adminhtml/system/signifyd.xml
+++ b/etc/adminhtml/system/signifyd.xml
@@ -3,7 +3,7 @@
     <section id="signifyd" translate="label" type="text" sortOrder="300" showInDefault="1" showInWebsite="1" showInStore="1">
         <label>Signifyd</label>
         <tab>service</tab>
-        <resource>Magento_Integration::config_signifyd</resource>
+        <resource>Signifyd_Connect::config_signifyd</resource>
 
         <include path="Signifyd_Connect::system/signifyd/advanced.xml"/>
         <include path="Signifyd_Connect::system/signifyd/general.xml"/>
diff --git a/etc/adminhtml/system/signifyd/logs.xml b/etc/adminhtml/system/signifyd/logs.xml
index 955c7916..952e106c 100644
--- a/etc/adminhtml/system/signifyd/logs.xml
+++ b/etc/adminhtml/system/signifyd/logs.xml
@@ -2,15 +2,15 @@
 <include xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Config:etc/system_include.xsd">
     <group id="logs" translate="label" type="text" sortOrder="500" showInDefault="1" showInWebsite="1" showInStore="1">
         <label>Enable Logging</label>
-        <field id="log" translate="label" type="select" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1">
+        <field id="log" translate="label comment" type="select" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1">
             <label>Log Options</label>
             <comment>Enables logging of errors related to the plugin for debugging and troubleshooting issues.</comment>
             <source_model>Signifyd\Connect\Model\System\Config\Source\Options\Loglevel</source_model>
         </field>
         <field id="version" translate="label comment" type="text" sortOrder="36" showInDefault="1" showInWebsite="1" showInStore="1">
             <label>Version</label>
+            <comment>The version number of the Signifyd extension.</comment>            
             <frontend_model>Signifyd\Connect\Block\Adminhtml\System\Config\Field\Version</frontend_model>
-            <comment>The version number of the Signifyd extension.</comment>
         </field>
         <field id="cron_data" translate="label comment" type="text" sortOrder="38" showInDefault="1" showInWebsite="1" showInStore="1">
             <label>Cron last run</label>
diff --git a/etc/adminhtml/system/signifyd/webhook.xml b/etc/adminhtml/system/signifyd/webhook.xml
index af195a3b..8d1d7576 100644
--- a/etc/adminhtml/system/signifyd/webhook.xml
+++ b/etc/adminhtml/system/signifyd/webhook.xml
@@ -6,9 +6,8 @@
             <label>Webhook Url</label>
             <comment><model>Signifyd\Connect\Model\WebhookLink</model></comment>
         </field>
-        <field id="register_webhook" translate="label comment" type="button" sortOrder="37" showInDefault="1" showInWebsite="1" showInStore="1">
+        <field id="register_webhook" translate="label" type="button" sortOrder="37" showInDefault="1" showInWebsite="1" showInStore="1">
             <label>Register Webhook</label>
-            <comment />
             <frontend_model>Signifyd\Connect\Block\Adminhtml\System\Config\Button\Webhook</frontend_model>
         </field>
     </group>