OpenId client refactor in progress.

extensions/yii/authclient/AuthAction.php

@@ -206,7 +206,7 @@ class AuthAction extends Action
 						$attributes = array(
 							'id' => $provider->identity
 						);
-						$rawAttributes = $provider->getAttributes();
+						$rawAttributes = $provider->fetchAttributes();
 						foreach ($provider->requiredAttributes as $openIdAttributeName) {
 							if (isset($rawAttributes[$openIdAttributeName])) {
 								$attributes[$openIdAttributeName] = $rawAttributes[$openIdAttributeName];
@@ -229,10 +229,6 @@ class AuthAction extends Action
 			}
 		} else {
 			//$provider->identity = $provider->authUrl; // Setting identifier
-			$request = Yii::$app->getRequest();
-			$provider->realm = $request->getHostInfo();
-			$provider->returnUrl = $provider->realm . $request->getUrl(); // getting return URL
-
 			$url = $provider->buildAuthUrl();
 			return Yii::$app->getResponse()->redirect($url);
 		}

tests/unit/extensions/authclient/OpenIdTest.php

+<?php
+
+namespace yiiunit\extensions\authclient;
+
+use yii\authclient\OpenId;
+
+class OpenIdTest extends TestCase
+{
+	protected function setUp()
+	{
+		$config = [
+			'components' => [
+				'request' => [
+					'hostInfo' => 'http://testdomain.com',
+					'scriptUrl' => '/index.php',
+				],
+			]
+		];
+		$this->mockApplication($config, '\yii\web\Application');
+	}
+
+	// Tests :
+
+	public function testSetGet()
+	{
+		$client = new OpenId();
+
+		$trustRoot = 'http://trust.root';
+		$client->setTrustRoot($trustRoot);
+		$this->assertEquals($trustRoot, $client->getTrustRoot(), 'Unable to setup trust root!');
+
+		$returnUrl = 'http://return.url';
+		$client->setReturnUrl($returnUrl);
+		$this->assertEquals($returnUrl, $client->getReturnUrl(), 'Unable to setup return URL!');
+	}
+
+	/**
+	 * @depends testSetGet
+	 */
+	public function testGetDefaults()
+	{
+		$client = new OpenId();
+
+		$this->assertNotEmpty($client->getTrustRoot(), 'Unable to get default trust root!');
+		$this->assertNotEmpty($client->getReturnUrl(), 'Unable to get default return URL!');
+	}
+}
\ No newline at end of file