Merge pull request #103 from vyskocilpavel/entitlement_getconfig

Changes in getting configuration in PerunEntitlement.php

Author: vyskocilpavel

CHANGELOG.md

@@ -5,6 +5,9 @@ All notable changes to this project will be documented in this file.
 #### Added
 - Added facility capabilities to PerunEntitlement
 
+#### Changed
+- Use object `Configuration` for getting base module configuration
+
 #### Fixed
 - Fixed the width of showed tagged idps in case the count of idps is equal to (x * 3) + 1
 

lib/Auth/Process/PerunEntitlement.php

@@ -34,52 +34,39 @@ class PerunEntitlement extends ProcessingFilter
     private $entitlementPrefix;
     private $entitlementAuthority;
     private $groupNameAARC;
-    private $interface;
     private $adapter;
 
     public function __construct($config, $reserved)
     {
         parent::__construct($config, $reserved);
-        $conf = Configuration::getConfig(self::CONFIG_FILE_NAME);
+        $modulePerunConfiguration = Configuration::getConfig(self::CONFIG_FILE_NAME);
         assert('is_array($config)');
 
-        if (!isset($config[self::EDU_PERSON_ENTITLEMENT])) {
-            throw new Exception(
-                'perun:PerunEntitlement: missing mandatory configuration option ' .
-                self::EDU_PERSON_ENTITLEMENT . '.'
-            );
-        }
         $configuration = Configuration::loadFromArray($config);
 
-        $this->eduPersonEntitlement = $config[self::EDU_PERSON_ENTITLEMENT];
-
+        $this->eduPersonEntitlement = $configuration->getString(self::EDU_PERSON_ENTITLEMENT);
         $this->releaseForwardedEntitlement = $configuration->getBoolean(self::RELEASE_FORWARDED_ENTITLEMENT, true);
+        $this->forwardedEduPersonEntitlement = $configuration->getString(
+            self::FORWARDED_EDU_PERSON_ENTITLEMENT,
+            $this->releaseForwardedEntitlement ? Configuration::REQUIRED_OPTION : ''
+        );
 
-        if (!isset($config[self::FORWARDED_EDU_PERSON_ENTITLEMENT])) {
-            throw new Exception(
-                'perun:PerunEntitlement: missing mandatory configuration option ' .
-                self::FORWARDED_EDU_PERSON_ENTITLEMENT . '.'
-            );
-        }
-        $this->forwardedEduPersonEntitlement = $config[self::FORWARDED_EDU_PERSON_ENTITLEMENT];
-
-        $this->entitlementPrefix = $conf->getString(self::ENTITLEMENTPREFIX_ATTR, '');
-        $this->entitlementAuthority = $conf->getString(self::ENTITLEMENTAUTHORITY_ATTR, '');
-        $this->groupNameAARC = $conf->getBoolean(self::GROUPNAMEAARC_ATTR, false);
-
-        if ($this->groupNameAARC && (empty($this->entitlementAuthority) || empty($this->entitlementPrefix))) {
-            throw new Exception(
-                'perun:PerunEntitlement: \'groupNameAARC\' has been set, \'entitlementAuthority\' ' .
-                'and \'entitlementPrefix\' options must be set as well'
-            );
-        }
-
-        if (!isset($config[self::INTERFACE_PROPNAME])) {
-            $config[self::INTERFACE_PROPNAME] = Adapter::RPC;
-        }
+        $this->groupNameAARC = $modulePerunConfiguration->getBoolean(self::GROUPNAMEAARC_ATTR, false);
+        $this->entitlementPrefix = $modulePerunConfiguration->getString(
+            self::ENTITLEMENTPREFIX_ATTR,
+            $this->groupNameAARC ? Configuration::REQUIRED_OPTION : ''
+        );
+        $this->entitlementAuthority = $modulePerunConfiguration->getString(
+            self::ENTITLEMENTAUTHORITY_ATTR,
+            $this->groupNameAARC ? Configuration::REQUIRED_OPTION : ''
+        );
 
-        $this->interface = (string)$config[self::INTERFACE_PROPNAME];
-        $this->adapter = Adapter::getInstance($this->interface);
+        $interface = $configuration->getValueValidate(
+            self::INTERFACE_PROPNAME,
+            [Adapter::RPC, Adapter::LDAP],
+            Adapter::RPC
+        );
+        $this->adapter = Adapter::getInstance($interface);
     }
 
     public function process(&$request)