ACP-4499: CI fix

spryker · Dec 27, 2024 · f12d67f · f12d67f
1 parent 5a931f8
commit f12d67f
Show file tree

Hide file tree

Showing 10 changed files with 112 additions and 18 deletions.
diff --git a/src/Spryker/Glue/AppKernel/Validator/BodyStructureValidator.php b/src/Spryker/Glue/AppKernel/Validator/BodyStructureValidator.php
@@ -20,6 +20,7 @@
 use Symfony\Component\Validator\Constraints\Required;
 use Symfony\Component\Validator\Constraints\Type;
 use Symfony\Component\Validator\Validator\ValidatorInterface;
+use Throwable;
 
 class BodyStructureValidator implements RequestValidatorInterface
 {
@@ -35,24 +36,37 @@ public function validate(GlueRequestTransfer $glueRequestTransfer): GlueRequestV
             ->setIsValid(true)
             ->setStatus(Response::HTTP_OK);
 
-        $content = $this->appKernelToUtilEncodingService->decodeJson((string)$glueRequestTransfer->getContent(), true);
+        try {
+            $content = $this->appKernelToUtilEncodingService->decodeJson((string)$glueRequestTransfer->getContent(), true);
+        } catch (Throwable $exception) {
+            return $this->getFailedGlueRequestValidationTransfer($glueRequestValidationTransfer);
+        }
+
         $constraintViolationList = $this->validator->validate(['content' => $content], $this->getConstraintForRequestStructure());
 
         if ($constraintViolationList->count() > 0) {
-            $glueRequestValidationTransfer
-                ->setIsValid(false)
-                ->setStatus(Response::HTTP_UNPROCESSABLE_ENTITY);
-
-            $glueRequestValidationTransfer->addError(
-                (new GlueErrorTransfer())
-                    ->setCode((string)Response::HTTP_UNPROCESSABLE_ENTITY)
-                    ->setMessage(AppKernelConfig::RESPONSE_MESSAGE_VALIDATION_FORMAT_ERROR_MESSAGE),
-            );
+            return $this->getFailedGlueRequestValidationTransfer($glueRequestValidationTransfer);
         }
 
         return $glueRequestValidationTransfer;
     }
 
+    protected function getFailedGlueRequestValidationTransfer(
+        GlueRequestValidationTransfer $glueRequestValidationTransfer
+    ): GlueRequestValidationTransfer {
+        $glueRequestValidationTransfer
+            ->setIsValid(false)
+            ->setStatus(Response::HTTP_UNPROCESSABLE_ENTITY);
+
+        $glueRequestValidationTransfer->addError(
+            (new GlueErrorTransfer())
+                ->setCode((string)Response::HTTP_UNPROCESSABLE_ENTITY)
+                ->setMessage(AppKernelConfig::RESPONSE_MESSAGE_VALIDATION_FORMAT_ERROR_MESSAGE),
+        );
+
+        return $glueRequestValidationTransfer;
+    }
+
     protected function getConstraintForRequestStructure(): Collection
     {
         return new Collection([

diff --git a/tests/SprykerTest/Glue/AppKernel/Controller/AppConfigureControllerTest.php b/tests/SprykerTest/Glue/AppKernel/Controller/AppConfigureControllerTest.php
@@ -347,6 +347,25 @@ public function testPostConfigureReturnsErrorResponseWhenRequestBodyHasInvalidSt
         $this->tester->assertAppConfigIsNotPersisted('tenant-identifier');
     }
 
+    /**
+     * @dataProvider invalidConfigRequestFixtures
+     *
+     * @return void
+     */
+    public function testPostConfigureReturnsErrorResponseWhenRequestBodyIsMissingConfiguration(string $fixtureName): void
+    {
+        // Arrange
+        $glueRequest = $this->tester->createGlueRequestFromFixture($fixtureName);
+        $appConfigController = $this->tester->createAppConfigController();
+
+        // Act
+        $glueResponse = $appConfigController->postConfigureAction($glueRequest);
+
+        // Assert
+        $this->tester->assertGlueResponseContainsErrorMessageWhenRequestBodyHasInvalidStructure($glueResponse);
+        $this->tester->assertAppConfigIsNotPersisted('tenant-identifier');
+    }
+
     /**
      * @throws \Exception
      *
@@ -576,4 +595,18 @@ public function testDisconnectAppForAnExistingTenantDeactivatesAppConfiguration(
         $this->assertSame(204, $response->getStatusCode());
         $this->tester->assertAppConfigurationForTenantIsDeactivated($tenantIdentifier);
     }
+
+    protected function invalidConfigRequestFixtures(): array
+    {
+        return [
+            'invalid-config-request-body-null' => ['invalid-config-request-body-null'],
+            'invalid-config-request-body-non-json-object' => ['invalid-config-request-body-non-json-object'],
+            'invalid-config-request-body-missing-data' => ['invalid-config-request-body-missing-data'],
+            'invalid-config-request-body-empty-data' => ['invalid-config-request-body-empty-data'],
+            'invalid-config-request-body-invalid-data-type' => ['invalid-config-request-body-invalid-data-type'],
+            'invalid-config-request-body-empty-data-attributes' => ['invalid-config-request-body-empty-data-attributes'],
+            'invalid-config-request-body-missing-data-attributes-configuration' => ['invalid-config-request-body-missing-data-attributes-configuration'],
+            'invalid-config-request-body-empty-data-attributes-configuration' => ['invalid-config-request-body-empty-data-attributes-configuration'],
+        ];
+    }
 }
diff --git a/...g-request-with-missing-configuration.json → ...-empty-data-attributes-configuration.json b/...g-request-with-missing-configuration.json → ...-empty-data-attributes-configuration.json
@@ -6,7 +6,7 @@
         "data": {
             "type": "configuration",
             "attributes": {
-                "configuration": ""
+                "configuration": null
             }
         }
     },

diff --git a/...g-request-with-invalid-configuration.json → ...g-request-body-empty-data-attributes.json b/...g-request-with-invalid-configuration.json → ...g-request-body-empty-data-attributes.json
@@ -5,13 +5,8 @@
     "content": {
         "data": {
             "type": "configuration",
-            "attributes": {
-                "configuration": ""
-            }
+            "attributes": {}
         }
     },
-    "__configurationPayload": {
-        "clientId": [],
-        "clientSecret": []
-    }
+    "__configurationPayload": {}
 }
diff --git a/tests/SprykerTest/Glue/AppKernel/_data/Fixtures/invalid-config-request-body-empty-data.json b/tests/SprykerTest/Glue/AppKernel/_data/Fixtures/invalid-config-request-body-empty-data.json
@@ -0,0 +1,9 @@
+{
+    "meta": {
+        "x-tenant-identifier": ["tenant-identifier"]
+    },
+    "content": {
+        "data": {}
+    },
+    "__configurationPayload": {}
+}
diff --git a/...ykerTest/Glue/AppKernel/_data/Fixtures/invalid-config-request-body-invalid-data-type.json b/...ykerTest/Glue/AppKernel/_data/Fixtures/invalid-config-request-body-invalid-data-type.json
@@ -0,0 +1,11 @@
+{
+    "meta": {
+        "x-tenant-identifier": ["tenant-identifier"]
+    },
+    "content": {
+        "data": {
+            "type": "invalid-data-type"
+        }
+    },
+    "__configurationPayload": {}
+}
diff --git a/...nel/_data/Fixtures/invalid-config-request-body-missing-data-attributes-configuration.json b/...nel/_data/Fixtures/invalid-config-request-body-missing-data-attributes-configuration.json
@@ -0,0 +1,11 @@
+{
+    "meta": {
+        "x-tenant-identifier": ["tenant-identifier"]
+    },
+    "content": {
+        "data": {
+            "type": "configuration"
+        }
+    },
+    "__configurationPayload": {}
+}
diff --git a/...s/SprykerTest/Glue/AppKernel/_data/Fixtures/invalid-config-request-body-missing-data.json b/...s/SprykerTest/Glue/AppKernel/_data/Fixtures/invalid-config-request-body-missing-data.json
@@ -0,0 +1,7 @@
+{
+    "meta": {
+        "x-tenant-identifier": ["tenant-identifier"]
+    },
+    "content": {},
+    "__configurationPayload": {}
+}
diff --git a/...prykerTest/Glue/AppKernel/_data/Fixtures/invalid-config-request-body-non-json-object.json b/...prykerTest/Glue/AppKernel/_data/Fixtures/invalid-config-request-body-non-json-object.json
@@ -0,0 +1,7 @@
+{
+    "meta": {
+        "x-tenant-identifier": ["tenant-identifier"]
+    },
+    "content": "null",
+    "__configurationPayload": {}
+}
diff --git a/tests/SprykerTest/Glue/AppKernel/_data/Fixtures/invalid-config-request-body-null.json b/tests/SprykerTest/Glue/AppKernel/_data/Fixtures/invalid-config-request-body-null.json
@@ -0,0 +1,7 @@
+{
+    "meta": {
+        "x-tenant-identifier": ["tenant-identifier"]
+    },
+    "content": null,
+    "__configurationPayload": {}
+}