authtwitter: use SimpleSAML_Configuration::loadFromArray (related to #587).

Andjelko Horvat · Andjelko Horvat · commit 71d02cef2a88 · 2013-11-18T17:19:37.000Z
git-svn-id: https://simplesamlphp.googlecode.com/svn/trunk@3293 44740490-163a-0410-bde0-09ae8108e29a
diff --git a/modules/authtwitter/lib/Auth/Source/Twitter.php b/modules/authtwitter/lib/Auth/Source/Twitter.php
@@ -38,18 +38,10 @@ public function __construct($info, $config) {
 		/* Call the parent constructor first, as required by the interface. */
 		parent::__construct($info, $config);
 
-		if (!array_key_exists('key', $config))
-			throw new Exception('Twitter authentication source is not properly configured: missing [key]');
-		
-		$this->key = $config['key'];
-		
-		if (!array_key_exists('secret', $config))
-			throw new Exception('Twitter authentication source is not properly configured: missing [secret]');
-
-		$this->secret = $config['secret'];
-
-		// require_once(dirname(dirname(dirname(dirname(__FILE__)))) . '/extlibinc/facebook.php');
+		$configObject = SimpleSAML_Configuration::loadFromArray($config, 'authsources[' . var_export($this->authId, TRUE) . ']');
 
+		$this->key = $configObject->getString('key');
+		$this->secret = $configObject->getString('secret');
 	}
 
 
@@ -127,5 +119,3 @@ public function finalStep(&$state) {
 	}
 
 }
-
-?>
