Merge pull request #9 from spryker/feature/remove-app-diconnect-transfer

Removed AppDisconnectTransfer
spryker · Jun 24, 2024 · 8000c22 · 8000c22
2 parents d8266c9 + f4374bf
commit 8000c22
Show file tree

Hide file tree

Showing 7 changed files with 20 additions and 54 deletions.
diff --git a/composer.json b/composer.json
@@ -5,7 +5,7 @@
     "license": "proprietary",
     "require": {
         "php": ">=8.1",
-        "spryker/app-kernel-extension": "^0.1.0",
+        "spryker/app-kernel-extension": "dev-master",
         "spryker/glue-application-extension": "^1.0.0",
         "spryker/kernel": "^3.30.0",
         "spryker/log": "^3.0.0",

diff --git a/src/Spryker/Glue/AppKernel/Controller/AppDisconnectController.php b/src/Spryker/Glue/AppKernel/Controller/AppDisconnectController.php
@@ -8,7 +8,7 @@
 namespace Spryker\Glue\AppKernel\Controller;
 
 use Generated\Shared\Transfer\AppConfigCriteriaTransfer;
-use Generated\Shared\Transfer\AppDisconnectTransfer;
+use Generated\Shared\Transfer\AppConfigTransfer;
 use Generated\Shared\Transfer\GlueRequestTransfer;
 use Generated\Shared\Transfer\GlueResponseTransfer;
 use Spryker\Glue\AppKernel\AppKernelConfig;
@@ -35,11 +35,11 @@ public function postDisconnectAction(GlueRequestTransfer $glueRequestTransfer):
                 ->buildRequestNotValidResponse($glueRequestValidationTransfer);
         }
 
-        $disconnectParameterTransfer = $this->getFactory()->createGlueRequestMapper()
-            ->mapGlueRequestTransferToAppDisconnectTransfer($glueRequestTransfer, new AppDisconnectTransfer());
+        $appConfigTransfer = $this->getFactory()->createGlueRequestMapper()
+            ->mapGlueRequestTransferToAppConfigTransfer($glueRequestTransfer, new AppConfigTransfer());
 
         $appConfigCriteriaTransfer = new AppConfigCriteriaTransfer();
-        $appConfigCriteriaTransfer->setTenantIdentifier($disconnectParameterTransfer->getTenantIdentifier());
+        $appConfigCriteriaTransfer->setTenantIdentifier($appConfigTransfer->getTenantIdentifier());
 
         try {
             $appConfigTransfer = $this->getFactory()

diff --git a/src/Spryker/Glue/AppKernel/Mapper/GlueRequestMapper.php b/src/Spryker/Glue/AppKernel/Mapper/GlueRequestMapper.php
@@ -8,7 +8,6 @@
 namespace Spryker\Glue\AppKernel\Mapper;
 
 use Generated\Shared\Transfer\AppConfigTransfer;
-use Generated\Shared\Transfer\AppDisconnectTransfer;
 use Generated\Shared\Transfer\GlueRequestTransfer;
 use Spryker\Glue\AppKernel\AppKernelConfig;
 use Spryker\Service\UtilEncoding\UtilEncodingServiceInterface;
@@ -41,19 +40,6 @@ public function mapGlueRequestTransferToAppConfigTransfer(
         return $appConfigTransfer;
     }
 
-    /**
-     * @param \Generated\Shared\Transfer\GlueRequestTransfer $glueRequestTransfer
-     * @param \Generated\Shared\Transfer\AppDisconnectTransfer $appDisconnectTransfer
-     *
-     * @return \Generated\Shared\Transfer\AppDisconnectTransfer
-     */
-    public function mapGlueRequestTransferToAppDisconnectTransfer(
-        GlueRequestTransfer $glueRequestTransfer,
-        AppDisconnectTransfer $appDisconnectTransfer
-    ): AppDisconnectTransfer {
-        return $appDisconnectTransfer->setTenantIdentifier($this->getTenantIdentifier($glueRequestTransfer));
-    }
-
     /**
      * @param \Generated\Shared\Transfer\GlueRequestTransfer $glueRequestTransfer
      *
@@ -73,6 +59,10 @@ protected function getConfiguration(GlueRequestTransfer $glueRequestTransfer): a
     {
         $content = (array)$this->utilEncodingService->decodeJson((string)$glueRequestTransfer->getContent(), true);
 
+        if (!isset($content['data']['attributes']['configuration'])) {
+            return [];
+        }
+
         return (array)$this->utilEncodingService->decodeJson($content['data']['attributes']['configuration'], true);
     }
 }
diff --git a/src/Spryker/Glue/AppKernel/Mapper/GlueRequestMapperInterface.php b/src/Spryker/Glue/AppKernel/Mapper/GlueRequestMapperInterface.php
@@ -8,7 +8,6 @@
 namespace Spryker\Glue\AppKernel\Mapper;
 
 use Generated\Shared\Transfer\AppConfigTransfer;
-use Generated\Shared\Transfer\AppDisconnectTransfer;
 use Generated\Shared\Transfer\GlueRequestTransfer;
 
 interface GlueRequestMapperInterface
@@ -23,15 +22,4 @@ public function mapGlueRequestTransferToAppConfigTransfer(
         GlueRequestTransfer $glueRequestTransfer,
         AppConfigTransfer $appConfigTransfer
     ): AppConfigTransfer;
-
-    /**
-     * @param \Generated\Shared\Transfer\GlueRequestTransfer $glueRequestTransfer
-     * @param \Generated\Shared\Transfer\AppDisconnectTransfer $appDisconnectTransfer
-     *
-     * @return \Generated\Shared\Transfer\AppDisconnectTransfer
-     */
-    public function mapGlueRequestTransferToAppDisconnectTransfer(
-        GlueRequestTransfer $glueRequestTransfer,
-        AppDisconnectTransfer $appDisconnectTransfer
-    ): AppDisconnectTransfer;
 }
diff --git a/src/Spryker/Shared/AppKernel/Transfer/app_kernel.transfer.xml b/src/Spryker/Shared/AppKernel/Transfer/app_kernel.transfer.xml
@@ -19,10 +19,6 @@
         <property name="tenantIdentifier" type="string"/>
     </transfer>
 
-    <transfer name="AppDisconnect" strict="true">
-        <property name="tenantIdentifier" type="string"/>
-    </transfer>
-
     <transfer name="AppDisconnectResponse" strict="true">
         <property name="isSuccessful" type="bool"/>
         <property name="errorMessage" type="string"/>

diff --git a/src/Spryker/Zed/AppKernel/Business/Writer/ConfigWriter.php b/src/Spryker/Zed/AppKernel/Business/Writer/ConfigWriter.php
@@ -9,7 +9,6 @@
 
 use Generated\Shared\Transfer\AppConfigResponseTransfer;
 use Generated\Shared\Transfer\AppConfigTransfer;
-use Generated\Shared\Transfer\AppDisconnectTransfer;
 use Spryker\Client\SecretsManager\Exception\MissingSecretsManagerProviderPluginException;
 use Spryker\Shared\Log\LoggerTrait;
 use Spryker\Zed\AppKernel\AppKernelConfig;
@@ -198,11 +197,8 @@ protected function getFailResponse(string $errorMessage): AppConfigResponseTrans
      */
     protected function executeConfigurationBeforeDeletePlugins(AppConfigTransfer $appConfigTransfer): AppConfigTransfer
     {
-        $appDisconnectTransfer = new AppDisconnectTransfer();
-        $appDisconnectTransfer->setTenantIdentifier($appConfigTransfer->getTenantIdentifier());
-
         foreach ($this->configurationBeforeDeletePlugin as $configurationBeforeDeletePlugin) {
-            $configurationBeforeDeletePlugin->beforeDelete($appDisconnectTransfer);
+            $configurationBeforeDeletePlugin->beforeDelete($appConfigTransfer);
         }
 
         return $appConfigTransfer;
@@ -215,11 +211,8 @@ protected function executeConfigurationBeforeDeletePlugins(AppConfigTransfer $ap
      */
     protected function executeConfigurationAfterDeletePlugins(AppConfigTransfer $appConfigTransfer): AppConfigTransfer
     {
-        $appDisconnectTransfer = new AppDisconnectTransfer();
-        $appDisconnectTransfer->setTenantIdentifier($appConfigTransfer->getTenantIdentifier());
-
         foreach ($this->configurationAfterDeletePlugin as $configurationAfterDeletePlugin) {
-            $configurationAfterDeletePlugin->afterDelete($appDisconnectTransfer);
+            $configurationAfterDeletePlugin->afterDelete($appConfigTransfer);
         }
 
         return $appConfigTransfer;

diff --git a/tests/SprykerTest/Glue/AppKernel/Controller/AppDisconnectControllerTest.php b/tests/SprykerTest/Glue/AppKernel/Controller/AppDisconnectControllerTest.php
@@ -10,7 +10,6 @@
 use Codeception\Test\Unit;
 use Exception;
 use Generated\Shared\Transfer\AppConfigTransfer;
-use Generated\Shared\Transfer\AppDisconnectTransfer;
 use Spryker\Zed\AppKernel\AppKernelDependencyProvider;
 use Spryker\Zed\AppKernelExtension\Dependency\Plugin\ConfigurationAfterDeletePluginInterface;
 use Spryker\Zed\AppKernelExtension\Dependency\Plugin\ConfigurationBeforeDeletePluginInterface;
@@ -89,11 +88,11 @@ public function __construct(protected AppDisconnectControllerTest $test)
             }
 
             /**
-             * @param \Generated\Shared\Transfer\AppDisconnectTransfer $appDisconnectTransfer
+             * @param \Generated\Shared\Transfer\AppConfigTransfer $appDisconnectTransfer
              *
-             * @return \Generated\Shared\Transfer\AppDisconnectTransfer
+             * @return \Generated\Shared\Transfer\AppConfigTransfer
              */
-            public function beforeDelete(AppDisconnectTransfer $appDisconnectTransfer): AppDisconnectTransfer
+            public function beforeDelete(AppConfigTransfer $appDisconnectTransfer): AppConfigTransfer
             {
                 $this->test->beforeDeletePluginWasExecuted = true;
 
@@ -132,11 +131,11 @@ public function __construct(protected AppDisconnectControllerTest $test)
             }
 
             /**
-             * @param \Generated\Shared\Transfer\AppDisconnectTransfer $appDisconnectTransfer
+             * @param \Generated\Shared\Transfer\AppConfigTransfer $appConfigTransfer
              *
-             * @return \Generated\Shared\Transfer\AppDisconnectTransfer
+             * @return \Generated\Shared\Transfer\AppConfigTransfer
              */
-            public function afterDelete(AppDisconnectTransfer $appDisconnectTransfer): AppDisconnectTransfer
+            public function afterDelete(AppConfigTransfer $appConfigTransfer): AppConfigTransfer
             {
                 $this->test->afterDeletePluginWasExecuted = true;
 
@@ -207,13 +206,13 @@ public function testPostDisconnectReturnsErrorResponseWhenAnExceptionOccurred():
 
         $configurationBeforeDeletePlugin = new class implements ConfigurationBeforeDeletePluginInterface {
             /**
-             * @param \Generated\Shared\Transfer\AppDisconnectTransfer $appDisconnectTransfer
+             * @param \Generated\Shared\Transfer\AppConfigTransfer $appConfigTransfer
              *
              * @throws \Exception
              *
-             * @return \Generated\Shared\Transfer\AppDisconnectTransfer
+             * @return \Generated\Shared\Transfer\AppConfigTransfer
              */
-            public function beforeDelete(AppDisconnectTransfer $appDisconnectTransfer): AppDisconnectTransfer
+            public function beforeDelete(AppConfigTransfer $appConfigTransfer): AppConfigTransfer
             {
                 throw new Exception('Something went wrong.');
             }