partkeepr

commit a10a311db4ade99c09972525ca46d7c39f7f861f
parent d5f381d8417af357d517b44a9448b5c0c5d6bf94
Author: Felicitus <felicitus@felicitus.org>
Date:   Tue, 22 Dec 2015 14:33:49 +0100

Removed pre-defined attributes, added sensible defaults, fixes #543 and relates to  #542

Diffstat:
M
app/config/config.yml
 | 
4
----
M
app/config/parameters.php.dist
 | 
4
++--
M
src/PartKeepr/SetupBundle/Services/ConfigSetupService.php
 | 
14
+++++++++++---

3 files changed, 13 insertions(+), 9 deletions(-)
diff --git a/app/config/config.yml b/app/config/config.yml
@@ -100,10 +100,6 @@ fr3d_ldap:
     user:
         baseDn: "%fr3d_ldap.user.baseDn%"
         filter: "%fr3d_ldap.user.filter%"
-        attributes: # Specify ldap attributes mapping [ldap attribute, user object method]
-           - { ldap_attr: samaccountname,  user_method: setUsername }
-           - { ldap_attr: email,  user_method: setEmail }
-
 
 services:
     serializer.normalizer.custom:
diff --git a/app/config/parameters.php.dist b/app/config/parameters.php.dist
@@ -78,8 +78,8 @@ $container->setParameter('fr3d_ldap.driver.accountDomainNameShort', null);
 $container->setParameter('fr3d_ldap.user.enabled', false);
 $container->setParameter('fr3d_ldap.user.baseDn', 'dc=blabla,dc=com');
 $container->setParameter('fr3d_ldap.user.filter', null);
-$container->setParameter('fr3d_ldap.user.attribute.username', null);
-$container->setParameter('fr3d_ldap.user.attribute.email', null);
+$container->setParameter('fr3d_ldap.user.attribute.username', "samaccountname");
+$container->setParameter('fr3d_ldap.user.attribute.email', "email");
 
 /**
  * Specifies if the frontend should perform an auto-login
diff --git a/src/PartKeepr/SetupBundle/Services/ConfigSetupService.php b/src/PartKeepr/SetupBundle/Services/ConfigSetupService.php
@@ -52,7 +52,7 @@ class ConfigSetupService
             "secret" => $this->generateSecret(),
 
             "fr3d_ldap.driver.host" => "127.0.0.1",
-            "fr3d_ldap.driver.port" => null,
+            "fr3d_ldap.driver.port" => 389,
             "fr3d_ldap.driver.username" => null,
             "fr3d_ldap.driver.password" => null,
             "fr3d_ldap.driver.bindRequiresDn" => false,
@@ -67,8 +67,8 @@ class ConfigSetupService
             "fr3d_ldap.user.enabled" => false,
             "fr3d_ldap.user.baseDn" => "dc=example,dc=com",
             "fr3d_ldap.user.filter" => null,
-            "fr3d_ldap.user.attribute.username" => null,
-            "fr3d_ldap.user.attribute.email" => null,
+            "fr3d_ldap.user.attribute.username" => "samaccountname",
+            "fr3d_ldap.user.attribute.email" => "email",
 
             "partkeepr.filesystem.data_directory" => "%kernel.root_dir%/../data/",
             "partkeepr.cronjob.check" => true,
@@ -91,6 +91,14 @@ class ConfigSetupService
 
         $this->applyIf($parameters, $config);
 
+        if ($config["fr3d_ldap.user.attribute.username"] === null) {
+            $config["fr3d_ldap.user.attribute.username"] = "samaccountname";
+        }
+
+        if ($config["fr3d_ldap.user.attribute.email"] === null) {
+            $config["fr3d_ldap.user.attribute.email"] = "email";
+        }
+
         $parameters = array_merge($parameters, $config);
         array_walk_recursive($parameters, function (&$item) {
             $item = var_export($item, true);