@@ -9,17 +9,17 @@ |
||
9 | 9 | namespace flipbox\saml\sp\controllers; |
10 | 10 | |
11 | 11 | use Craft; |
12 | +use SAML2\AuthnRequest; |
|
13 | +use SAML2\Response as SamlResponse; |
|
12 | 14 | use flipbox\saml\core\controllers\messages\AbstractController; |
13 | 15 | use flipbox\saml\core\exceptions\InvalidMetadata; |
14 | 16 | use flipbox\saml\core\helpers\MessageHelper; |
15 | 17 | use flipbox\saml\core\services\bindings\Factory; |
16 | 18 | use flipbox\saml\core\validators\Response as ResponseValidator; |
19 | +use flipbox\saml\sp\Saml; |
|
17 | 20 | use flipbox\saml\sp\events\RelayState; |
18 | 21 | use flipbox\saml\sp\records\ProviderRecord; |
19 | -use flipbox\saml\sp\Saml; |
|
20 | 22 | use flipbox\saml\sp\traits\SamlPluginEnsured; |
21 | -use SAML2\AuthnRequest; |
|
22 | -use SAML2\Response as SamlResponse; |
|
23 | 23 | use yii\base\Event; |
24 | 24 | use yii\web\HttpException; |
25 | 25 |
@@ -8,17 +8,15 @@ |
||
8 | 8 | |
9 | 9 | namespace flipbox\saml\sp\services; |
10 | 10 | |
11 | +use SAML2\Response as SamlResponse; |
|
11 | 12 | use craft\base\Component; |
12 | 13 | use craft\elements\User; |
13 | -use flipbox\saml\core\exceptions\InvalidMessage; |
|
14 | -use flipbox\saml\core\helpers\MessageHelper; |
|
14 | +use flipbox\saml\sp\Saml; |
|
15 | 15 | use flipbox\saml\sp\events\UserLogin; |
16 | 16 | use flipbox\saml\sp\models\Settings; |
17 | 17 | use flipbox\saml\sp\records\ProviderIdentityRecord; |
18 | 18 | use flipbox\saml\sp\records\ProviderRecord; |
19 | -use flipbox\saml\sp\Saml; |
|
20 | 19 | use flipbox\saml\sp\services\login\AssertionTrait; |
21 | -use SAML2\Response as SamlResponse; |
|
22 | 20 | use yii\base\UserException; |
23 | 21 | |
24 | 22 | /** |
@@ -288,6 +288,7 @@ discard block |
||
288 | 288 | |
289 | 289 | /** |
290 | 290 | * @param UserElement $user |
291 | + * @param string $fieldHandle |
|
291 | 292 | * @return Field|null |
292 | 293 | */ |
293 | 294 | protected function getFieldLayoutField(UserElement $user, $fieldHandle) |
@@ -337,7 +338,7 @@ discard block |
||
337 | 338 | **************************************************/ |
338 | 339 | |
339 | 340 | /** |
340 | - * @param $username |
|
341 | + * @param string $username |
|
341 | 342 | * @return UserElement |
342 | 343 | * @throws UserException |
343 | 344 | */ |
@@ -6,19 +6,17 @@ |
||
6 | 6 | |
7 | 7 | namespace flipbox\saml\sp\services\login; |
8 | 8 | |
9 | +use SAML2\Response as SamlResponse; |
|
9 | 10 | use craft\base\Field; |
10 | 11 | use craft\elements\User as UserElement; |
11 | 12 | use craft\models\FieldLayout; |
12 | 13 | use flipbox\saml\core\exceptions\InvalidMessage; |
13 | -use flipbox\saml\core\helpers\MessageHelper; |
|
14 | 14 | use flipbox\saml\core\helpers\ProviderHelper; |
15 | -use flipbox\saml\core\records\ProviderInterface; |
|
15 | +use flipbox\saml\sp\Saml; |
|
16 | 16 | use flipbox\saml\sp\helpers\UserHelper; |
17 | 17 | use flipbox\saml\sp\models\Settings; |
18 | 18 | use flipbox\saml\sp\records\ProviderIdentityRecord; |
19 | 19 | use flipbox\saml\sp\records\ProviderRecord; |
20 | -use flipbox\saml\sp\Saml; |
|
21 | -use SAML2\Response as SamlResponse; |
|
22 | 20 | use yii\base\UserException; |
23 | 21 | |
24 | 22 | /** |
@@ -6,14 +6,14 @@ |
||
6 | 6 | |
7 | 7 | namespace flipbox\saml\sp\services\login; |
8 | 8 | |
9 | +use SAML2\Assertion; |
|
10 | +use SAML2\Response; |
|
9 | 11 | use craft\elements\User as UserElement; |
10 | 12 | use craft\helpers\StringHelper; |
11 | 13 | use craft\models\UserGroup; |
14 | +use flipbox\saml\sp\Saml; |
|
12 | 15 | use flipbox\saml\sp\models\Settings; |
13 | 16 | use flipbox\saml\sp\records\ProviderRecord; |
14 | -use flipbox\saml\sp\Saml; |
|
15 | -use SAML2\Assertion; |
|
16 | -use SAML2\Response; |
|
17 | 17 | use yii\base\UserException; |
18 | 18 | |
19 | 19 | /** |
@@ -2,17 +2,17 @@ |
||
2 | 2 | |
3 | 3 | namespace flipbox\saml\sp\services\messages; |
4 | 4 | |
5 | +use SAML2\AuthnRequest as SamlAuthnRequest; |
|
6 | +use SAML2\Constants; |
|
7 | +use SAML2\XML\md\EndpointType; |
|
8 | +use SAML2\XML\saml\Issuer; |
|
5 | 9 | use craft\base\Component; |
6 | 10 | use flipbox\keychain\records\KeyChainRecord; |
7 | 11 | use flipbox\saml\core\exceptions\InvalidMetadata; |
8 | 12 | use flipbox\saml\core\helpers\MessageHelper; |
9 | 13 | use flipbox\saml\core\records\AbstractProvider; |
10 | -use flipbox\saml\sp\models\Settings; |
|
11 | 14 | use flipbox\saml\sp\Saml; |
12 | -use SAML2\AuthnRequest as SamlAuthnRequest; |
|
13 | -use SAML2\Constants; |
|
14 | -use SAML2\XML\md\EndpointType; |
|
15 | -use SAML2\XML\saml\Issuer; |
|
15 | +use flipbox\saml\sp\models\Settings; |
|
16 | 16 | use yii\base\Event; |
17 | 17 | |
18 | 18 | class AuthnRequest extends Component |
@@ -8,18 +8,16 @@ |
||
8 | 8 | |
9 | 9 | namespace flipbox\saml\sp\services; |
10 | 10 | |
11 | +use SAML2\Response as SamlResponse; |
|
11 | 12 | use craft\elements\User; |
12 | 13 | use flipbox\saml\core\exceptions\InvalidMessage; |
13 | -use flipbox\saml\core\helpers\MessageHelper; |
|
14 | 14 | use flipbox\saml\core\records\ProviderInterface; |
15 | 15 | use flipbox\saml\core\services\AbstractProviderIdentityService; |
16 | +use flipbox\saml\sp\Saml; |
|
16 | 17 | use flipbox\saml\sp\records\ProviderIdentityRecord; |
17 | 18 | use flipbox\saml\sp\records\ProviderRecord; |
18 | -use flipbox\saml\sp\Saml; |
|
19 | 19 | use flipbox\saml\sp\services\login\AssertionTrait; |
20 | 20 | use flipbox\saml\sp\traits\SamlPluginEnsured; |
21 | -use SAML2\Assertion; |
|
22 | -use SAML2\Response as SamlResponse; |
|
23 | 21 | use yii\base\UserException; |
24 | 22 | |
25 | 23 | /** |