@@ -9,15 +9,15 @@ |
||
| 9 | 9 | namespace flipbox\saml\sp\services; |
| 10 | 10 | |
| 11 | 11 | |
| 12 | +use LightSaml\Model\Assertion\Assertion; |
|
| 13 | +use LightSaml\Model\Protocol\Response as SamlResponse; |
|
| 12 | 14 | use craft\base\Component; |
| 13 | 15 | use craft\elements\User; |
| 14 | 16 | use craft\models\UserGroup; |
| 15 | 17 | use flipbox\keychain\records\KeyChainRecord; |
| 16 | 18 | use flipbox\saml\core\exceptions\InvalidMessage; |
| 17 | -use flipbox\saml\sp\records\ProviderIdentityRecord; |
|
| 18 | 19 | use flipbox\saml\sp\Saml; |
| 19 | -use LightSaml\Model\Assertion\Assertion; |
|
| 20 | -use LightSaml\Model\Protocol\Response as SamlResponse; |
|
| 20 | +use flipbox\saml\sp\records\ProviderIdentityRecord; |
|
| 21 | 21 | use yii\base\Event; |
| 22 | 22 | use yii\base\UserException; |
| 23 | 23 | |
@@ -9,23 +9,18 @@ |
||
| 9 | 9 | namespace flipbox\saml\sp\services\messages; |
| 10 | 10 | |
| 11 | 11 | |
| 12 | +use LightSaml\Helper; |
|
| 13 | +use LightSaml\Model\Assertion\Issuer; |
|
| 14 | +use LightSaml\Model\Protocol\AbstractRequest; |
|
| 15 | +use LightSaml\SamlConstants; |
|
| 12 | 16 | use craft\base\Component; |
| 13 | 17 | use flipbox\keychain\records\KeyChainRecord; |
| 14 | 18 | use flipbox\saml\core\helpers\SecurityHelper; |
| 15 | -use flipbox\saml\core\records\AbstractProvider; |
|
| 16 | 19 | use flipbox\saml\core\records\ProviderInterface; |
| 17 | 20 | use flipbox\saml\core\services\messages\SamlRequestInterface; |
| 21 | +use flipbox\saml\sp\Saml; |
|
| 18 | 22 | use flipbox\saml\sp\models\Settings; |
| 19 | 23 | use flipbox\saml\sp\records\ProviderRecord; |
| 20 | -use flipbox\saml\sp\Saml; |
|
| 21 | -use flipbox\saml\core\services\traits\Security; |
|
| 22 | -use LightSaml\Credential\X509Certificate; |
|
| 23 | -use LightSaml\Helper; |
|
| 24 | -use LightSaml\Model\Assertion\Issuer; |
|
| 25 | -use LightSaml\Model\Protocol\AbstractRequest; |
|
| 26 | -use LightSaml\Model\Protocol\SamlMessage; |
|
| 27 | -use LightSaml\SamlConstants; |
|
| 28 | -use RobRichards\XMLSecLibs\XMLSecurityKey; |
|
| 29 | 24 | use yii\base\Event; |
| 30 | 25 | |
| 31 | 26 | class AuthnRequest extends Component implements SamlRequestInterface |
@@ -56,8 +56,7 @@ |
||
| 56 | 56 | |
| 57 | 57 | |
| 58 | 58 | /** |
| 59 | - * @param KeyChainRecord $chainRecord |
|
| 60 | - * @param EncryptedAssertionReader $encryptedAssertion |
|
| 59 | + * @param KeyChainRecord $keyChainRecord |
|
| 61 | 60 | */ |
| 62 | 61 | public function decryptAssertions(\LightSaml\Model\Protocol\Response $response, KeyChainRecord $keyChainRecord) |
| 63 | 62 | { |
@@ -9,11 +9,6 @@ discard block |
||
| 9 | 9 | namespace flipbox\saml\sp\services\messages; |
| 10 | 10 | |
| 11 | 11 | |
| 12 | -use craft\base\Component; |
|
| 13 | -use flipbox\keychain\records\KeyChainRecord; |
|
| 14 | -use flipbox\saml\core\exceptions\InvalidMessage; |
|
| 15 | -use flipbox\saml\core\helpers\SecurityHelper; |
|
| 16 | -use flipbox\saml\sp\Saml; |
|
| 17 | 12 | use LightSaml\Model\Assertion\Assertion; |
| 18 | 13 | use LightSaml\Model\Assertion\EncryptedAssertionReader; |
| 19 | 14 | use LightSaml\Validator\Model\Assertion\AssertionTimeValidator; |
@@ -21,6 +16,9 @@ discard block |
||
| 21 | 16 | use LightSaml\Validator\Model\NameId\NameIdValidator; |
| 22 | 17 | use LightSaml\Validator\Model\Statement\StatementValidator; |
| 23 | 18 | use LightSaml\Validator\Model\Subject\SubjectValidator; |
| 19 | +use craft\base\Component; |
|
| 20 | +use flipbox\keychain\records\KeyChainRecord; |
|
| 21 | +use flipbox\saml\core\helpers\SecurityHelper; |
|
| 24 | 22 | |
| 25 | 23 | class Response extends Component |
| 26 | 24 | { |