From 1841b25f880ed091b264e50731da83beaf85e071 Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Sat, 23 Sep 2023 00:03:49 -0700
Subject: [PATCH] authx - Switch to setting-admin@1

---
 ext/authx/authx.php          | 17 -----------------
 ext/authx/info.xml           |  4 +++-
 ext/authx/xml/Menu/authx.xml |  8 --------
 3 files changed, 3 insertions(+), 26 deletions(-)

diff --git a/ext/authx/authx.php b/ext/authx/authx.php
index 01091f9b2b..49d66f417c 100644
--- a/ext/authx/authx.php
+++ b/ext/authx/authx.php
@@ -127,20 +127,3 @@ function authx_civicrm_permission(&$permissions) {
   $permissions['generate any authx credential'] = E::ts('Authx: Generate new JWT credentials for other users via the API');
   $permissions['validate any authx credential'] = E::ts('Authx: Validate credentials for other users via the API');
 }
-
-/**
- * Implements hook_civicrm_navigationMenu().
- *
- * @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_navigationMenu
- */
-function authx_civicrm_navigationMenu(&$menu) {
-  _authx_civix_insert_navigation_menu($menu, 'Administer/System Settings', [
-    'label' => E::ts('Authentication'),
-    'name' => 'authx_admin',
-    'url' => 'civicrm/admin/setting/authx',
-    'permission' => 'administer CiviCRM',
-    'operator' => 'OR',
-    'separator' => 0,
-  ]);
-  _authx_civix_navigationMenu($menu);
-}
diff --git a/ext/authx/info.xml b/ext/authx/info.xml
index 707bacf717..99de5012be 100644
--- a/ext/authx/info.xml
+++ b/ext/authx/info.xml
@@ -2,7 +2,7 @@
 <extension key="authx" type="module">
   <file>authx</file>
   <name>AuthX</name>
-  <description>Extended authentication services</description>
+  <description>Extended authentication for external systems</description>
   <license>AGPL-3.0</license>
   <maintainer>
     <author>Tim Otten</author>
@@ -32,9 +32,11 @@
     <mixin>menu-xml@1.0.0</mixin>
     <mixin>scan-classes@1.0.0</mixin>
     <mixin>setting-php@1.0.0</mixin>
+    <mixin>setting-admin@1.0.0</mixin>
   </mixins>
   <civix>
     <namespace>CRM/Authx</namespace>
     <format>23.02.1</format>
+    <setting-page-title>Authentication</setting-page-title>
   </civix>
 </extension>
diff --git a/ext/authx/xml/Menu/authx.xml b/ext/authx/xml/Menu/authx.xml
index 9247d93a41..1f0e738339 100644
--- a/ext/authx/xml/Menu/authx.xml
+++ b/ext/authx/xml/Menu/authx.xml
@@ -21,12 +21,4 @@
     <access_arguments>*always allow*</access_arguments>
     <is_public>true</is_public>
   </item>
-  <item>
-    <path>civicrm/admin/setting/authx</path>
-    <title>Authentication</title>
-    <page_callback>CRM_Admin_Form_Generic</page_callback>
-    <adminGroup>System Settings</adminGroup>
-    <desc>Configure authentication for external systems</desc>
-    <access_arguments>administer CiviCRM</access_arguments>
-  </item>
 </menu>
-- 
2.25.1