Don't decode the filter url

sukhwinder33445 · sukhwinder33445 · commit 8838575209ed · 2024-07-16T10:10:37.000+02:00
Leave this to QueryString::fromString() method.
diff --git a/application/controllers/ApiV1ChannelsController.php b/application/controllers/ApiV1ChannelsController.php
@@ -43,7 +43,7 @@ public function indexAction(): void
         }
 
         try {
-            $filterRule = QueryString::fromString(rawurldecode(Url::fromRequest()->getQueryString()))
+            $filterRule = QueryString::fromString(Url::fromRequest()->getQueryString())
                 ->on(
                     QueryString::ON_CONDITION,
                     function (Filter\Condition $condition) {
diff --git a/application/controllers/ApiV1ContactgroupsController.php b/application/controllers/ApiV1ContactgroupsController.php
@@ -61,7 +61,7 @@ public function indexAction(): void
             $this->httpBadRequest('The given identifier is not a valid UUID');
         }
 
-        $filterStr = rawurldecode(Url::fromRequest()->getQueryString());
+        $filterStr = Url::fromRequest()->getQueryString();
         if ($method !== 'GET' && $filterStr) {
             $this->httpBadRequest('Filter is only allowed for GET requests');
         }
diff --git a/application/controllers/ApiV1ContactsController.php b/application/controllers/ApiV1ContactsController.php
@@ -66,7 +66,7 @@ public function indexAction(): void
             $this->httpBadRequest('The given identifier is not a valid UUID');
         }
 
-        $filterStr = rawurldecode(Url::fromRequest()->getQueryString());
+        $filterStr = Url::fromRequest()->getQueryString();
         if ($method !== 'GET' && $filterStr) {
             $this->httpBadRequest('Filter is only allowed for GET requests');
         }

Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ public function indexAction(): void`
`43`	`43`	`}`
`44`	`44`
`45`	`45`	`try {`
`46`		`- $filterRule = QueryString::fromString(rawurldecode(Url::fromRequest()->getQueryString()))`
	`46`	`+ $filterRule = QueryString::fromString(Url::fromRequest()->getQueryString())`
`47`	`47`	`->on(`
`48`	`48`	`QueryString::ON_CONDITION,`
`49`	`49`	`function (Filter\Condition $condition) {`
Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,7 @@ public function indexAction(): void`
`61`	`61`	`$this->httpBadRequest('The given identifier is not a valid UUID');`
`62`	`62`	`}`
`63`	`63`
`64`		`- $filterStr = rawurldecode(Url::fromRequest()->getQueryString());`
	`64`	`+ $filterStr = Url::fromRequest()->getQueryString();`
`65`	`65`	`if ($method !== 'GET' && $filterStr) {`
`66`	`66`	`$this->httpBadRequest('Filter is only allowed for GET requests');`
`67`	`67`	`}`
Original file line number	Diff line number	Diff line change
`@@ -66,7 +66,7 @@ public function indexAction(): void`
`66`	`66`	`$this->httpBadRequest('The given identifier is not a valid UUID');`
`67`	`67`	`}`
`68`	`68`
`69`		`- $filterStr = rawurldecode(Url::fromRequest()->getQueryString());`
	`69`	`+ $filterStr = Url::fromRequest()->getQueryString();`
`70`	`70`	`if ($method !== 'GET' && $filterStr) {`
`71`	`71`	`$this->httpBadRequest('Filter is only allowed for GET requests');`
`72`	`72`	`}`