@@ -8,17 +8,15 @@ |
||
8 | 8 | |
9 | 9 | namespace flipbox\saml\core\cli; |
10 | 10 | |
11 | -use craft\helpers\UrlHelper; |
|
12 | -use flipbox\keychain\KeyChain; |
|
13 | -use flipbox\saml\core\helpers\SerializeHelper; |
|
14 | -use flipbox\saml\core\records\AbstractProvider; |
|
15 | -use flipbox\saml\core\records\ProviderInterface; |
|
16 | -use flipbox\saml\core\SamlPluginInterface; |
|
17 | -use yii\console\Controller; |
|
18 | 11 | use craft\helpers\Console; |
12 | +use flipbox\keychain\KeyChain; |
|
19 | 13 | use flipbox\keychain\keypair\traits\OpenSSL; |
20 | 14 | use flipbox\keychain\keypair\traits\OpenSSLCliUtil; |
21 | 15 | use flipbox\keychain\records\KeyChainRecord; |
16 | +use flipbox\saml\core\SamlPluginInterface; |
|
17 | +use flipbox\saml\core\records\AbstractProvider; |
|
18 | +use flipbox\saml\core\records\ProviderInterface; |
|
19 | +use yii\console\Controller; |
|
22 | 20 | use yii\console\ExitCode; |
23 | 21 | |
24 | 22 | abstract class AbstractMetadata extends Controller |
@@ -213,7 +213,6 @@ |
||
213 | 213 | |
214 | 214 | /** |
215 | 215 | * @param ProviderInterface $provider |
216 | - * @param array $variables |
|
217 | 216 | * @return array |
218 | 217 | */ |
219 | 218 | protected function addUrls(ProviderInterface $provider) |
@@ -9,9 +9,9 @@ |
||
9 | 9 | namespace flipbox\saml\core\controllers\cp\view\metadata; |
10 | 10 | |
11 | 11 | use Craft; |
12 | +use craft\helpers\UrlHelper; |
|
12 | 13 | use flipbox\keychain\KeyChain; |
13 | 14 | use flipbox\saml\core\controllers\cp\view\AbstractController; |
14 | -use craft\helpers\UrlHelper; |
|
15 | 15 | use flipbox\saml\core\records\ProviderInterface; |
16 | 16 | |
17 | 17 | /** |
@@ -7,17 +7,16 @@ |
||
7 | 7 | namespace flipbox\saml\core\controllers\messages; |
8 | 8 | |
9 | 9 | |
10 | -use craft\web\Controller; |
|
11 | -use craft\web\Request; |
|
12 | -use flipbox\saml\core\helpers\SerializeHelper; |
|
13 | -use flipbox\saml\core\records\ProviderInterface; |
|
14 | -use flipbox\saml\core\traits\EnsureSamlPlugin; |
|
15 | 10 | use LightSaml\Model\Assertion\Issuer; |
16 | 11 | use LightSaml\Model\Protocol\AbstractRequest; |
17 | -use LightSaml\Model\Protocol\LogoutResponse; |
|
18 | 12 | use LightSaml\Model\Protocol\LogoutRequest; |
13 | +use LightSaml\Model\Protocol\LogoutResponse; |
|
19 | 14 | use LightSaml\Model\Protocol\SamlMessage; |
20 | 15 | use LightSaml\Model\Protocol\StatusResponse; |
16 | +use craft\web\Controller; |
|
17 | +use craft\web\Request; |
|
18 | +use flipbox\saml\core\records\ProviderInterface; |
|
19 | +use flipbox\saml\core\traits\EnsureSamlPlugin; |
|
21 | 20 | use yii\web\HttpException; |
22 | 21 | |
23 | 22 | abstract class AbstractLogoutController extends Controller |
@@ -9,16 +9,15 @@ |
||
9 | 9 | namespace flipbox\saml\core\helpers; |
10 | 10 | |
11 | 11 | |
12 | -use flipbox\keychain\records\KeyChainRecord; |
|
13 | -use LightSaml\Credential\KeyHelper; |
|
12 | +use LightSaml\Credential\KeyHelper as LightSamlKeyHelper; |
|
13 | +use LightSaml\Credential\X509Certificate; |
|
14 | 14 | use LightSaml\Error\LightSamlSecurityException; |
15 | 15 | use LightSaml\Model\Metadata\KeyDescriptor; |
16 | 16 | use LightSaml\Model\Protocol\SamlMessage; |
17 | -use LightSaml\Credential\X509Certificate; |
|
18 | -use LightSaml\Credential\KeyHelper as LightSamlKeyHelper; |
|
19 | 17 | use LightSaml\Model\XmlDSig\SignatureWriter; |
20 | 18 | use LightSaml\Model\XmlDSig\SignatureXmlReader; |
21 | 19 | use RobRichards\XMLSecLibs\XMLSecurityKey; |
20 | +use flipbox\keychain\records\KeyChainRecord; |
|
22 | 21 | |
23 | 22 | class SecurityHelper |
24 | 23 | { |
@@ -44,7 +44,6 @@ |
||
44 | 44 | } |
45 | 45 | |
46 | 46 | /** |
47 | - * @param AbstractSamlModel $model |
|
48 | 47 | * @return string |
49 | 48 | */ |
50 | 49 | public static function toXml(AbstractSamlModel $message) |
@@ -6,14 +6,14 @@ |
||
6 | 6 | |
7 | 7 | namespace flipbox\saml\core\helpers; |
8 | 8 | |
9 | -use craft\web\Response; |
|
10 | 9 | use LightSaml\Error\LightSamlBindingException; |
11 | -use LightSaml\Model\Context\SerializationContext; |
|
12 | 10 | use LightSaml\Model\AbstractSamlModel; |
11 | +use LightSaml\Model\Context\SerializationContext; |
|
13 | 12 | use LightSaml\Model\Protocol\AbstractRequest; |
14 | 13 | use LightSaml\Model\Protocol\SamlMessage; |
15 | 14 | use LightSaml\Model\XmlDSig\SignatureWriter; |
16 | 15 | use RobRichards\XMLSecLibs\XMLSecurityKey; |
16 | +use craft\web\Response; |
|
17 | 17 | |
18 | 18 | class SerializeHelper |
19 | 19 | { |
@@ -8,10 +8,10 @@ |
||
8 | 8 | |
9 | 9 | namespace flipbox\saml\core\records; |
10 | 10 | |
11 | +use LightSaml\Model\Metadata\EntityDescriptor; |
|
11 | 12 | use flipbox\ember\records\ActiveRecord; |
12 | 13 | use flipbox\keychain\records\KeyChainRecord; |
13 | 14 | use flipbox\saml\core\helpers\SerializeHelper; |
14 | -use LightSaml\Model\Metadata\EntityDescriptor; |
|
15 | 15 | use yii\db\ActiveQuery; |
16 | 16 | |
17 | 17 | /** |
@@ -77,6 +77,7 @@ |
||
77 | 77 | |
78 | 78 | /** |
79 | 79 | * @inheritdoc |
80 | + * @param string $type |
|
80 | 81 | */ |
81 | 82 | protected function findByType($type) |
82 | 83 | { |
@@ -9,6 +9,7 @@ discard block |
||
9 | 9 | namespace flipbox\saml\core\services; |
10 | 10 | |
11 | 11 | |
12 | +use LightSaml\Model\Metadata\EntityDescriptor; |
|
12 | 13 | use craft\base\Component; |
13 | 14 | use craft\helpers\Json; |
14 | 15 | use flipbox\keychain\records\KeyChainRecord; |
@@ -17,7 +18,6 @@ discard block |
||
17 | 18 | use flipbox\saml\core\records\LinkRecord; |
18 | 19 | use flipbox\saml\core\records\ProviderInterface; |
19 | 20 | use flipbox\saml\core\traits\EnsureSamlPlugin; |
20 | -use LightSaml\Model\Metadata\EntityDescriptor; |
|
21 | 21 | |
22 | 22 | abstract class AbstractProviderService extends Component implements ProviderServiceInterface |
23 | 23 | { |
@@ -10,6 +10,10 @@ discard block |
||
10 | 10 | |
11 | 11 | |
12 | 12 | use Craft; |
13 | +use LightSaml\Context\Profile\MessageContext; |
|
14 | +use LightSaml\Error\LightSamlBindingException; |
|
15 | +use LightSaml\Model\Assertion\Issuer; |
|
16 | +use LightSaml\Model\Protocol\SamlMessage; |
|
13 | 17 | use craft\base\Component; |
14 | 18 | use craft\web\Request; |
15 | 19 | use flipbox\saml\core\AbstractPlugin; |
@@ -20,10 +24,6 @@ discard block |
||
20 | 24 | use flipbox\saml\core\helpers\SerializeHelper; |
21 | 25 | use flipbox\saml\core\records\ProviderInterface; |
22 | 26 | use flipbox\saml\core\traits\EnsureSamlPlugin; |
23 | -use LightSaml\Context\Profile\MessageContext; |
|
24 | -use LightSaml\Error\LightSamlBindingException; |
|
25 | -use LightSaml\Model\Assertion\Issuer; |
|
26 | -use LightSaml\Model\Protocol\SamlMessage; |
|
27 | 27 | |
28 | 28 | /** |
29 | 29 | * Class AbstractHttpPost |
@@ -25,7 +25,7 @@ |
||
25 | 25 | |
26 | 26 | /** |
27 | 27 | * @param SamlMessage $message |
28 | - * @param AbstractProvider $provider |
|
28 | + * @param ProviderInterface $provider |
|
29 | 29 | */ |
30 | 30 | public function send(SamlMessage $message, ProviderInterface $provider) |
31 | 31 | { |
@@ -9,16 +9,16 @@ |
||
9 | 9 | namespace flipbox\saml\core\services\bindings; |
10 | 10 | |
11 | 11 | |
12 | -use craft\base\Component; |
|
13 | -use craft\web\Request; |
|
14 | -use flipbox\saml\core\records\AbstractProvider; |
|
15 | -use flipbox\saml\core\records\ProviderInterface; |
|
16 | 12 | use LightSaml\Error\LightSamlBindingException; |
17 | 13 | use LightSaml\Model\Context\DeserializationContext; |
18 | 14 | use LightSaml\Model\Protocol\SamlMessage; |
19 | 15 | use LightSaml\Model\XmlDSig\SignatureStringReader; |
20 | 16 | use LightSaml\SamlConstants; |
17 | +use craft\base\Component; |
|
18 | +use craft\web\Request; |
|
21 | 19 | use flipbox\saml\core\helpers\SerializeHelper; |
20 | +use flipbox\saml\core\records\AbstractProvider; |
|
21 | +use flipbox\saml\core\records\ProviderInterface; |
|
22 | 22 | |
23 | 23 | abstract class AbstractHttpRedirect extends Component implements BindingInterface |
24 | 24 | { |