@@ -9,13 +9,12 @@ |
||
9 | 9 | namespace flipbox\saml\sp\controllers; |
10 | 10 | |
11 | 11 | use Craft; |
12 | +use LightSaml\Model\Protocol\AuthnRequest; |
|
12 | 13 | use craft\web\Controller; |
13 | 14 | use flipbox\saml\core\exceptions\InvalidMetadata; |
14 | 15 | use flipbox\saml\core\helpers\SerializeHelper; |
15 | -use flipbox\saml\sp\records\ProviderRecord; |
|
16 | 16 | use flipbox\saml\sp\Saml; |
17 | -use flipbox\saml\sp\services\bindings\Factory; |
|
18 | -use LightSaml\Model\Protocol\AuthnRequest; |
|
17 | +use flipbox\saml\sp\records\ProviderRecord; |
|
19 | 18 | use yii\web\HttpException; |
20 | 19 | |
21 | 20 | class LoginController extends Controller |
@@ -206,7 +206,7 @@ |
||
206 | 206 | } |
207 | 207 | |
208 | 208 | /** |
209 | - * @param User $user |
|
209 | + * @param UserElement $user |
|
210 | 210 | * @param Attribute $attribute |
211 | 211 | * @param mixed $craftProperty |
212 | 212 | */ |
@@ -6,15 +6,15 @@ |
||
6 | 6 | |
7 | 7 | namespace flipbox\saml\sp\services\login; |
8 | 8 | |
9 | +use LightSaml\Error\LightSamlException; |
|
10 | +use LightSaml\Model\Assertion\Attribute; |
|
11 | +use LightSaml\Model\Protocol\Response as SamlResponse; |
|
9 | 12 | use craft\elements\User as UserElement; |
10 | 13 | use flipbox\saml\core\exceptions\InvalidMessage; |
14 | +use flipbox\saml\sp\Saml; |
|
11 | 15 | use flipbox\saml\sp\helpers\ProviderHelper; |
12 | 16 | use flipbox\saml\sp\helpers\UserHelper; |
13 | 17 | use flipbox\saml\sp\records\ProviderIdentityRecord; |
14 | -use flipbox\saml\sp\Saml; |
|
15 | -use LightSaml\Error\LightSamlException; |
|
16 | -use LightSaml\Model\Assertion\Attribute; |
|
17 | -use LightSaml\Model\Protocol\Response as SamlResponse; |
|
18 | 18 | use yii\base\UserException; |
19 | 19 | |
20 | 20 | /** |
@@ -8,19 +8,18 @@ |
||
8 | 8 | |
9 | 9 | namespace flipbox\saml\sp\services\messages; |
10 | 10 | |
11 | +use LightSaml\Helper; |
|
12 | +use LightSaml\Model\Assertion\Issuer; |
|
13 | +use LightSaml\Model\Protocol\AbstractRequest; |
|
14 | +use LightSaml\SamlConstants; |
|
11 | 15 | use craft\base\Component; |
12 | 16 | use flipbox\keychain\records\KeyChainRecord; |
13 | 17 | use flipbox\saml\core\helpers\SecurityHelper; |
14 | 18 | use flipbox\saml\core\records\ProviderInterface; |
15 | 19 | use flipbox\saml\core\services\messages\SamlRequestInterface; |
16 | -use flipbox\saml\core\services\traits\Security; |
|
20 | +use flipbox\saml\sp\Saml; |
|
17 | 21 | use flipbox\saml\sp\models\Settings; |
18 | 22 | use flipbox\saml\sp\records\ProviderRecord; |
19 | -use flipbox\saml\sp\Saml; |
|
20 | -use LightSaml\Helper; |
|
21 | -use LightSaml\Model\Assertion\Issuer; |
|
22 | -use LightSaml\Model\Protocol\AbstractRequest; |
|
23 | -use LightSaml\SamlConstants; |
|
24 | 23 | use yii\base\Event; |
25 | 24 | |
26 | 25 | class AuthnRequest extends Component implements SamlRequestInterface |
@@ -8,15 +8,15 @@ |
||
8 | 8 | |
9 | 9 | namespace flipbox\saml\sp\services; |
10 | 10 | |
11 | +use LightSaml\Model\Protocol\Response as SamlResponse; |
|
11 | 12 | use craft\elements\User; |
12 | 13 | use flipbox\saml\core\exceptions\InvalidMessage; |
13 | 14 | use flipbox\saml\core\records\ProviderInterface; |
14 | 15 | use flipbox\saml\core\services\AbstractProviderIdentityService; |
15 | -use flipbox\saml\sp\records\ProviderIdentityRecord; |
|
16 | 16 | use flipbox\saml\sp\Saml; |
17 | +use flipbox\saml\sp\records\ProviderIdentityRecord; |
|
17 | 18 | use flipbox\saml\sp\services\login\AssertionTrait; |
18 | 19 | use flipbox\saml\sp\traits\SamlPluginEnsured; |
19 | -use LightSaml\Model\Protocol\Response as SamlResponse; |
|
20 | 20 | use yii\base\UserException; |
21 | 21 | |
22 | 22 | /** |