Merge remote-tracking branch 'origin/bugfix/persist-exclude-from-push…

…-status-for-oidcng-entity-types' into release/2.5
SURFnet · May 19, 2020 · 9a4694b · 9a4694b
2 parents f2158dc + c8c1ff4
commit 9a4694b
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 2 deletions.
diff --git a/src/Surfnet/ServiceProviderDashboard/Application/Metadata/OidcngJsonGenerator.php b/src/Surfnet/ServiceProviderDashboard/Application/Metadata/OidcngJsonGenerator.php
@@ -231,6 +231,12 @@ private function generateMetadataFields(MetadataConversionDto $entity)
             $metadata['coin:exclude_from_push'] = '1';
         }
 
+        // When dealing with a client secret reset, keep the current exclude from push state.
+        $secret = $entity->getClientSecret();
+        if ($secret && $entity->isManageEntity() && !$entity->isExcludedFromPush()) {
+            $metadata['coin:exclude_from_push'] = '0';
+        }
+
         $metadata += $this->generateOidcClient($entity);
 
         if (!empty($entity->getLogoUrl())) {

diff --git a/...rfnet/ServiceProviderDashboard/Application/Metadata/OidcngResourceServerJsonGenerator.php b/...rfnet/ServiceProviderDashboard/Application/Metadata/OidcngResourceServerJsonGenerator.php
@@ -194,6 +194,12 @@ private function generateMetadataFields(MetadataConversionDto $entity)
             $metadata['coin:exclude_from_push'] = '1';
         }
 
+        // When dealing with a client secret reset, keep the current exclude from push state.
+        $secret = $entity->getClientSecret();
+        if ($secret && $entity->isManageEntity() && !$entity->isExcludedFromPush()) {
+            $metadata['coin:exclude_from_push'] = '0';
+        }
+
         $metadata += $this->generateOidcClient($entity);
 
         return $metadata;

diff --git a/src/Surfnet/ServiceProviderDashboard/Infrastructure/Manage/Dto/Coin.php b/src/Surfnet/ServiceProviderDashboard/Infrastructure/Manage/Dto/Coin.php
@@ -43,7 +43,7 @@ public static function fromApiResponse(array $metaDataFields)
         $eula = isset($metaDataFields['coin:eula'])
             ? $metaDataFields['coin:eula'] : '';
         $excludeFromPush = isset($metaDataFields['coin:exclude_from_push'])
-            ? (int) $metaDataFields['coin:exclude_from_push'] : 0;
+            ? (int) $metaDataFields['coin:exclude_from_push'] : null;
         $oidcClient = isset($metaDataFields['coin:oidc_client'])
             ? (int) $metaDataFields['coin:oidc_client'] : 0;
 
@@ -52,7 +52,7 @@ public static function fromApiResponse(array $metaDataFields)
         Assert::string($originalMetadataUrl);
         Assert::string($applicationUrl);
         Assert::string($eula);
-        Assert::integer($excludeFromPush);
+        Assert::nullOrIntegerish($excludeFromPush);
         Assert::integer($oidcClient);
 
         return new self(

diff --git a/src/Surfnet/ServiceProviderDashboard/Infrastructure/Manage/Dto/ManageEntity.php b/src/Surfnet/ServiceProviderDashboard/Infrastructure/Manage/Dto/ManageEntity.php
@@ -169,6 +169,9 @@ public function isOidcngResourceServer()
 
     public function isExcludedFromPush()
     {
+        if (is_null($this->getMetaData()->getCoin()->getExcludeFromPush())) {
+            return true;
+        }
         return $this->getMetaData()->getCoin()->getExcludeFromPush() == 1 ? true : false;
     }
 }