@@ -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 |
@@ -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 |
@@ -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 | { |
@@ -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 | { |
@@ -69,6 +69,7 @@ |
||
69 | 69 | |
70 | 70 | /** |
71 | 71 | * @inheritdoc |
72 | + * @param string $type |
|
72 | 73 | */ |
73 | 74 | protected function findByType($type, $condition = []) |
74 | 75 | { |
@@ -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 | { |
@@ -7,16 +7,16 @@ |
||
7 | 7 | namespace flipbox\saml\core\services\messages; |
8 | 8 | |
9 | 9 | |
10 | -use flipbox\saml\core\AbstractPlugin; |
|
11 | -use flipbox\saml\core\helpers\SecurityHelper; |
|
12 | -use flipbox\saml\core\records\ProviderInterface; |
|
13 | -use flipbox\saml\core\traits\EnsureSamlPlugin; |
|
14 | 10 | use LightSaml\Helper; |
15 | 11 | use LightSaml\Model\Assertion\Issuer; |
16 | 12 | use LightSaml\Model\Assertion\NameID; |
17 | 13 | use LightSaml\Model\Protocol\AbstractRequest; |
18 | 14 | use LightSaml\Model\Protocol\LogoutRequest as LogoutRequestModel; |
19 | 15 | use LightSaml\SamlConstants; |
16 | +use flipbox\saml\core\AbstractPlugin; |
|
17 | +use flipbox\saml\core\helpers\SecurityHelper; |
|
18 | +use flipbox\saml\core\records\ProviderInterface; |
|
19 | +use flipbox\saml\core\traits\EnsureSamlPlugin; |
|
20 | 20 | use yii\base\Event; |
21 | 21 | |
22 | 22 | abstract class AbstractLogoutRequest extends AbstractLogout implements SamlRequestInterface |
@@ -7,19 +7,16 @@ |
||
7 | 7 | namespace flipbox\saml\core\services\messages; |
8 | 8 | |
9 | 9 | |
10 | -use craft\base\Component; |
|
11 | -use flipbox\saml\core\AbstractPlugin; |
|
12 | -use flipbox\saml\core\helpers\SecurityHelper; |
|
13 | -use flipbox\saml\core\records\ProviderInterface; |
|
14 | -use flipbox\saml\core\traits\EnsureSamlPlugin; |
|
15 | -use LightSaml\Model\AbstractSamlModel; |
|
16 | 10 | use LightSaml\Model\Assertion\Issuer; |
17 | -use LightSaml\Model\Assertion\NameID; |
|
18 | 11 | use LightSaml\Model\Protocol\AbstractRequest; |
19 | 12 | use LightSaml\Model\Protocol\LogoutRequest as LogoutRequestModel; |
20 | 13 | use LightSaml\Model\Protocol\LogoutResponse; |
21 | 14 | use LightSaml\Model\Protocol\StatusResponse; |
22 | 15 | use LightSaml\SamlConstants; |
16 | +use flipbox\saml\core\AbstractPlugin; |
|
17 | +use flipbox\saml\core\helpers\SecurityHelper; |
|
18 | +use flipbox\saml\core\records\ProviderInterface; |
|
19 | +use flipbox\saml\core\traits\EnsureSamlPlugin; |
|
23 | 20 | use yii\base\Event; |
24 | 21 | |
25 | 22 | abstract class AbstractLogoutResponse extends AbstractLogout implements SamlResponseInterface |
@@ -9,12 +9,6 @@ discard block |
||
9 | 9 | namespace flipbox\saml\core\services\messages; |
10 | 10 | |
11 | 11 | |
12 | -use craft\base\Component; |
|
13 | -use flipbox\keychain\records\KeyChainRecord; |
|
14 | -use flipbox\saml\core\AbstractPlugin; |
|
15 | -use flipbox\saml\core\services\traits\Metadata as MetadataTrait; |
|
16 | -use craft\helpers\UrlHelper; |
|
17 | -use flipbox\saml\core\traits\EnsureSamlPlugin; |
|
18 | 12 | use LightSaml\Model\Metadata\AssertionConsumerService; |
19 | 13 | use LightSaml\Model\Metadata\EntityDescriptor; |
20 | 14 | use LightSaml\Model\Metadata\IdpSsoDescriptor; |
@@ -22,6 +16,12 @@ discard block |
||
22 | 16 | use LightSaml\Model\Metadata\SingleSignOnService; |
23 | 17 | use LightSaml\Model\Metadata\SpSsoDescriptor; |
24 | 18 | use LightSaml\SamlConstants; |
19 | +use craft\base\Component; |
|
20 | +use craft\helpers\UrlHelper; |
|
21 | +use flipbox\keychain\records\KeyChainRecord; |
|
22 | +use flipbox\saml\core\AbstractPlugin; |
|
23 | +use flipbox\saml\core\services\traits\Metadata as MetadataTrait; |
|
24 | +use flipbox\saml\core\traits\EnsureSamlPlugin; |
|
25 | 25 | use yii\base\Event; |
26 | 26 | use yii\base\InvalidConfigException; |
27 | 27 |
@@ -39,7 +39,6 @@ discard block |
||
39 | 39 | public function save(AbstractProvider $record, $runValidation = true, $attributeNames = null); |
40 | 40 | |
41 | 41 | /** |
42 | - * @param ProviderInterface $provider |
|
43 | 42 | * @return bool|int |
44 | 43 | */ |
45 | 44 | public function delete(ProviderInterface $record); |
@@ -50,6 +49,7 @@ discard block |
||
50 | 49 | * @param bool $runValidation |
51 | 50 | * @param array|null $attributeNames |
52 | 51 | * @throws \Exception |
52 | + * @return void |
|
53 | 53 | */ |
54 | 54 | public function linkToKey( |
55 | 55 | AbstractProvider $provider, |
@@ -8,10 +8,10 @@ |
||
8 | 8 | |
9 | 9 | namespace flipbox\saml\core\services; |
10 | 10 | |
11 | +use LightSaml\Model\Metadata\EntityDescriptor; |
|
11 | 12 | use flipbox\keychain\records\KeyChainRecord; |
12 | 13 | use flipbox\saml\core\records\AbstractProvider; |
13 | 14 | use flipbox\saml\core\records\ProviderInterface; |
14 | -use LightSaml\Model\Metadata\EntityDescriptor; |
|
15 | 15 | use yii\db\Query; |
16 | 16 | |
17 | 17 | interface ProviderServiceInterface |