Merge remote-tracking branch 'remotes/origin/release/2.0'

SURFnet · Jan 21, 2019 · dc97780 · dc97780
2 parents b56dedc + cd7d037
commit dc97780
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,13 @@
 ## Next release
 
+## 2.0.1
+
+The main focus of this release was to fix some minor bugs to make a production ready release.
+
+**Bugfixes:**
+ - Fix use of dump method in twig template
+ - Fix setting entityId from clientId for OIDC entities from manage response.
+
 ## 2.0.0
 
 This release sees the actual addition of OpenID Connect support (OIDC) in SP Dashboard. In release 1.5.x we already 

diff --git a/src/Surfnet/ServiceProviderDashboard/Domain/Entity/Entity.php b/src/Surfnet/ServiceProviderDashboard/Domain/Entity/Entity.php
@@ -442,7 +442,6 @@ public static function fromManageResponse(
  $entity->setClientSecret($oidcClient->getClientSecret());
  $entity->setRedirectUris($oidcClient->getRedirectUris());
  $entity->setGrantType(new OidcGrantType($oidcClient->getGrantType()));
- $entity->setEntityId($oidcClient->getClientId());
  $entity->setProtocol(Entity::TYPE_OPENID_CONNECT);
  self::setRedirectUrisFromManageResponse($entity, $manageEntity, $environment, $playGroundUriTest, $playGroundUriProd);
  }

diff --git a/...board/Infrastructure/DashboardBundle/Resources/views/Mail/jiraPublicationFailed.html.twig b/...board/Infrastructure/DashboardBundle/Resources/views/Mail/jiraPublicationFailed.html.twig
@@ -8,7 +8,6 @@ Hi,<br/>
 
 <pre>
  {{ exception.message }}
- {{ dump(exception.trace) }}
 </pre>
 
 <p>