fix login embed and validate webspace in community admin

sulu · Mar 5, 2018 · 3561ad9 · 3561ad9
1 parent 6c40150
commit 3561ad9
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 3 deletions.
diff --git a/Admin/CommunityAdmin.php b/Admin/CommunityAdmin.php
@@ -84,9 +84,35 @@ public function getSecurityContexts()
     {
         $systems = [];
 
+        $webspaceCollection = $this->webspaceManager->getWebspaceCollection();
+
+        $webspaceKeys = array_keys($webspaceCollection->getWebspaces());
+
         foreach ($this->webspacesConfiguration as $webspaceKey => $webspaceConfig) {
-            $webspace = $this->webspaceManager->getWebspaceCollection()->getWebspace($webspaceKey);
-            $system = $webspace->getSecurity()->getSystem();
+            $webspace = $webspaceCollection->getWebspace($webspaceKey);
+
+            if (!$webspace) {
+                throw new \InvalidArgumentException(
+                    sprintf(
+                        'Webspace "%s" not found for "sulu_community" expected one of %s.',
+                        $webspaceKey,
+                        '"' . implode('", "', $webspaceKeys) . '"'
+                    )
+                );
+            }
+
+            $security = $webspace->getSecurity();
+
+            if (!$security) {
+                throw new \InvalidArgumentException(
+                    sprintf(
+                        'Missing "<security><system>Website</system><security>" configuration in webspace "%s" for "sulu_community".',
+                        $webspaceKey
+                    )
+                );
+            }
+
+            $system = $security->getSystem();
             $systems[$system] = [];
         }
 

diff --git a/Resources/views/Login/login-embed.html.twig b/Resources/views/Login/login-embed.html.twig
@@ -1,4 +1,4 @@
-{{% if maintenanceMode %}
+{% if maintenanceMode %}
     {# Show nothing in maintenance mode #}
 {% else %}
     {% if app.user %}