← All changes
|
backend/src/Controllers/Settings/GetAllSettingsController.php
+51
-11
0.8.1
→
1.5
View file →
| @@ -6,18 +6,15 @@ | ||
| 6 | 6 | */ |
| 7 | 7 | |
| 8 | 8 | namespace IvyForms\Controllers\Settings; |
| 9 | 9 | |
| 10 | -// phpcs:disable PSR1.Files.SideEffects | |
| 11 | -if (!defined('ABSPATH')) { | |
| 12 | - exit; // Exit if accessed directly | |
| 13 | -} | |
| 14 | - | |
| 15 | 10 | use IvyForms\Common\Exceptions\ForbiddenException; |
| 16 | 11 | use IvyForms\Common\Sanitizer\Sanitizer; |
| 17 | 12 | use IvyForms\Controllers\Controller; |
| 13 | +use IvyForms\Infrastructure\WP\MCP\McpFeatureGate; | |
| 18 | 14 | use IvyForms\Services\Settings\SettingsService; |
| 19 | 15 | use IvyForms\Services\Translations\BackendStrings; |
| 16 | +use IvyForms\Services\Usage\UsageTrackingService; | |
| 20 | 17 | use WP_REST_Request; |
| 21 | 18 | use WP_REST_Response; |
| 22 | 19 | |
| 23 | 20 | /** |
| @@ -27,13 +24,16 @@ | ||
| 27 | 24 | */ |
| 28 | 25 | class GetAllSettingsController extends Controller |
| 29 | 26 | { |
| 30 | 27 | private SettingsService $settingsService; |
| 28 | + private UsageTrackingService $usageTrackingService; | |
| 31 | 29 | |
| 32 | 30 | public function __construct( |
| 33 | - SettingsService $settingsService | |
| 31 | + SettingsService $settingsService, | |
| 32 | + UsageTrackingService $usageTrackingService | |
| 34 | 33 | ) { |
| 35 | 34 | $this->settingsService = $settingsService; |
| 35 | + $this->usageTrackingService = $usageTrackingService; | |
| 36 | 36 | } |
| 37 | 37 | |
| 38 | 38 | /** |
| 39 | 39 | * Get all settings organized by category |
| @@ -66,14 +66,14 @@ | ||
| 66 | 66 | // ] |
| 67 | 67 | ], |
| 68 | 68 | 'general' => [ |
| 69 | 69 | 'wcagBackend' => $allSettings['general']['wcagBackend'] ?? false, |
| 70 | + 'mcp_enabled' => McpFeatureGate::coerceStoredEnabled( | |
| 71 | + $allSettings['general']['mcp_enabled'] ?? true | |
| 72 | + ), | |
| 70 | 73 | 'favoriteTemplates' => $allSettings['general']['favoriteTemplates'] ?? [], |
| 71 | 74 | 'delete_on_uninstall' => $allSettings['general']['delete_on_uninstall'] ?? false, |
| 72 | - // Future general settings can be added here: | |
| 73 | - // 'site_settings' => $allSettings['general']['site_settings'] ?? null, | |
| 74 | - // 'form_defaults' => $allSettings['general']['form_defaults'] ?? null, | |
| 75 | - 'changelog_version' => $allSettings['general']['changelog_version'] ?? '', | |
| 75 | + 'usageTrackingEnabled' => $this->usageTrackingService->isSettingEnabled(), | |
| 76 | 76 | ], |
| 77 | 77 | 'integrations' => [ |
| 78 | 78 | 'wpdatatables' => array_merge( |
| 79 | 79 | $allSettings['integrations']['wpdatatables'] ?? ['enabled' => false], |
| @@ -80,10 +80,28 @@ | ||
| 80 | 80 | [ |
| 81 | 81 | 'connected' => class_exists('WPDataTable') || defined('WDT_ROOT_PATH') |
| 82 | 82 | ] |
| 83 | 83 | ), |
| 84 | - // Future categories can be added here | |
| 84 | + 'ameliabooking' => array_merge( | |
| 85 | + $allSettings['integrations']['ameliabooking'] ?? ['enabled' => false], | |
| 86 | + [ | |
| 87 | + 'connected' => class_exists('AmeliaBooking\Plugin') || defined('AMELIA_PATH') | |
| 88 | + ] | |
| 89 | + ), | |
| 90 | + 'square' => array_merge( | |
| 91 | + $allSettings['integrations']['square'] ?? ['enabled' => false], | |
| 92 | + [ | |
| 93 | + 'connected' => ! empty($allSettings['payment']['square']['connected']), | |
| 94 | + ] | |
| 95 | + ), | |
| 85 | 96 | ], |
| 97 | + 'payment' => [ | |
| 98 | + 'square' => self::sanitizeSquareSettingsForFrontend( | |
| 99 | + is_array($allSettings['payment']['square'] ?? null) | |
| 100 | + ? $allSettings['payment']['square'] | |
| 101 | + : [] | |
| 102 | + ), | |
| 103 | + ], | |
| 86 | 104 | ]; |
| 87 | 105 | |
| 88 | 106 | /** |
| 89 | 107 | * Filter to allow Pro plugin to add additional settings data |
| @@ -98,6 +116,28 @@ | ||
| 98 | 116 | return new WP_REST_Response([ |
| 99 | 117 | 'message' => BackendStrings::getSettingsStrings()['all_settings_retrieved'], |
| 100 | 118 | 'data' => $organizedSettings |
| 101 | 119 | ], 200); |
| 120 | + } | |
| 121 | + | |
| 122 | + /** | |
| 123 | + * @param array<string, mixed> $squareSettings | |
| 124 | + * @return array<string, mixed> | |
| 125 | + */ | |
| 126 | + private static function sanitizeSquareSettingsForFrontend(array $squareSettings): array | |
| 127 | + { | |
| 128 | + $defaults = [ | |
| 129 | + 'connected' => false, | |
| 130 | + 'merchantId' => '', | |
| 131 | + 'merchantName' => '', | |
| 132 | + 'locationId' => '', | |
| 133 | + 'locationName' => '', | |
| 134 | + 'currency' => '', | |
| 135 | + 'disconnectedByWebhook' => false, | |
| 136 | + ]; | |
| 137 | + | |
| 138 | + $merged = array_merge($defaults, $squareSettings); | |
| 139 | + unset($merged['accessToken'], $merged['refreshToken']); | |
| 140 | + | |
| 141 | + return $merged; | |
| 102 | 142 | } |
| 103 | 143 | } |