From 9037fa9b7dbb0af8f4ac27079bcfff1d2d68e73a Mon Sep 17 00:00:00 2001 From: Philipp Stracker Date: Mon, 10 Feb 2025 16:27:52 +0100 Subject: [PATCH] =?UTF-8?q?=F0=9F=A6=BA=20Losen=20the=20validation=20rules?= =?UTF-8?q?=20for=20Client=20ID?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Screens/Onboarding/Components/ManualConnectionForm.js | 2 +- .../ppcp-settings/src/Endpoint/AuthenticationRestEndpoint.php | 1 - modules/ppcp-settings/src/Service/AuthenticationManager.php | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/modules/ppcp-settings/resources/js/Components/Screens/Onboarding/Components/ManualConnectionForm.js b/modules/ppcp-settings/resources/js/Components/Screens/Onboarding/Components/ManualConnectionForm.js index 6602c335b..9524ed553 100644 --- a/modules/ppcp-settings/resources/js/Components/Screens/Onboarding/Components/ManualConnectionForm.js +++ b/modules/ppcp-settings/resources/js/Components/Screens/Onboarding/Components/ManualConnectionForm.js @@ -96,7 +96,7 @@ const ManualConnectionForm = () => { // On-the-fly form validation. useEffect( () => { setClientValid( - ! manualClientId || /^A[\w-]{79}$/.test( manualClientId ) + ! manualClientId || /^[\w-]{80,}$/.test( manualClientId ) ); setSecretValid( manualClientSecret && manualClientSecret.length > 0 ); }, [ manualClientId, manualClientSecret ] ); diff --git a/modules/ppcp-settings/src/Endpoint/AuthenticationRestEndpoint.php b/modules/ppcp-settings/src/Endpoint/AuthenticationRestEndpoint.php index 7ac964b2d..40c82ffab 100644 --- a/modules/ppcp-settings/src/Endpoint/AuthenticationRestEndpoint.php +++ b/modules/ppcp-settings/src/Endpoint/AuthenticationRestEndpoint.php @@ -88,7 +88,6 @@ class AuthenticationRestEndpoint extends RestEndpoint { 'type' => 'string', 'sanitize_callback' => 'sanitize_text_field', 'minLength' => 80, - 'maxLength' => 80, ), 'clientSecret' => array( 'required' => true, diff --git a/modules/ppcp-settings/src/Service/AuthenticationManager.php b/modules/ppcp-settings/src/Service/AuthenticationManager.php index 95acf068b..fc3d8da74 100644 --- a/modules/ppcp-settings/src/Service/AuthenticationManager.php +++ b/modules/ppcp-settings/src/Service/AuthenticationManager.php @@ -147,7 +147,7 @@ class AuthenticationManager { throw new RuntimeException( 'No client ID provided.' ); } - if ( false === preg_match( '/^A[\w-]{79}$/', $client_secret ) ) { + if ( false === preg_match( '/^[\w-]{80,}$/', $client_secret ) ) { throw new RuntimeException( 'Invalid client ID provided.' ); }