| @@ -253,7 +253,7 @@ | ||
| 253 | 253 | **************************************************/ | 
| 254 | 254 | |
| 255 | 255 | /** | 
| 256 | - * @param $username | |
| 256 | + * @param string|null $username | |
| 257 | 257 | * @return UserElement | 
| 258 | 258 | * @throws UserException | 
| 259 | 259 | */ | 
| @@ -6,15 +6,15 @@ | ||
| 6 | 6 | |
| 7 | 7 | namespace flipbox\saml\sp\services\login; | 
| 8 | 8 | |
| 9 | +use SAML2\Response as SamlResponse; | |
| 9 | 10 | use craft\elements\User as UserElement; | 
| 10 | 11 | use flipbox\saml\core\exceptions\InvalidMessage; | 
| 11 | 12 | use flipbox\saml\core\helpers\MessageHelper; | 
| 12 | 13 | use flipbox\saml\core\helpers\ProviderHelper; | 
| 14 | +use flipbox\saml\sp\Saml; | |
| 13 | 15 | use flipbox\saml\sp\helpers\UserHelper; | 
| 14 | 16 | use flipbox\saml\sp\records\ProviderIdentityRecord; | 
| 15 | -use flipbox\saml\sp\Saml; | |
| 16 | 17 | use yii\base\UserException; | 
| 17 | -use SAML2\Response as SamlResponse; | |
| 18 | 18 | |
| 19 | 19 | /** | 
| 20 | 20 | * Class User | 
| @@ -8,17 +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 | 14 | use flipbox\saml\core\helpers\MessageHelper; | 
| 14 | 15 | use flipbox\saml\core\records\ProviderInterface; | 
| 15 | 16 | use flipbox\saml\core\services\AbstractProviderIdentityService; | 
| 16 | -use flipbox\saml\sp\records\ProviderIdentityRecord; | |
| 17 | 17 | use flipbox\saml\sp\Saml; | 
| 18 | +use flipbox\saml\sp\records\ProviderIdentityRecord; | |
| 18 | 19 | use flipbox\saml\sp\services\login\AssertionTrait; | 
| 19 | 20 | use flipbox\saml\sp\traits\SamlPluginEnsured; | 
| 20 | -use SAML2\Assertion; | |
| 21 | -use SAML2\Response as SamlResponse; | |
| 22 | 21 | use yii\base\UserException; | 
| 23 | 22 | |
| 24 | 23 | /** | 
| @@ -114,7 +114,6 @@ | ||
| 114 | 114 | } | 
| 115 | 115 | |
| 116 | 116 | /** | 
| 117 | - * @param SamlResponse $response | |
| 118 | 117 | * @throws HttpException | 
| 119 | 118 | */ | 
| 120 | 119 | protected function throwIdpNotFoundWithUid($uid) | 
| @@ -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\helpers\SerializeHelper; | 
| 16 | 18 | use flipbox\saml\core\services\bindings\Factory; | 
| 17 | 19 | use flipbox\saml\core\validators\Response as ResponseValidator; | 
| 18 | -use flipbox\saml\sp\records\ProviderRecord; | |
| 19 | 20 | use flipbox\saml\sp\Saml; | 
| 21 | +use flipbox\saml\sp\records\ProviderRecord; | |
| 20 | 22 | use flipbox\saml\sp\traits\SamlPluginEnsured; | 
| 21 | -use SAML2\AuthnRequest; | |
| 22 | -use SAML2\Response as SamlResponse; | |
| 23 | 23 | use yii\web\HttpException; | 
| 24 | 24 | |
| 25 | 25 | class LoginController extends AbstractController | 
| @@ -10,8 +10,8 @@ | ||
| 10 | 10 | |
| 11 | 11 | use flipbox\saml\core\records\AbstractProvider; | 
| 12 | 12 | use flipbox\saml\core\records\ProviderInterface; | 
| 13 | -use flipbox\saml\sp\models\Settings; | |
| 14 | 13 | use flipbox\saml\sp\Saml; | 
| 14 | +use flipbox\saml\sp\models\Settings; | |
| 15 | 15 | |
| 16 | 16 | class ProviderRecord extends AbstractProvider implements ProviderInterface | 
| 17 | 17 |  { | 
| @@ -6,12 +6,12 @@ | ||
| 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; | 
| 12 | 14 | use flipbox\saml\sp\Saml; | 
| 13 | -use SAML2\Assertion; | |
| 14 | -use SAML2\Response; | |
| 15 | 15 | use yii\base\UserException; | 
| 16 | 16 | |
| 17 | 17 | /** | 
| @@ -21,7 +21,7 @@ | ||
| 21 | 21 | |
| 22 | 22 | /** | 
| 23 | 23 | * @param AbstractProvider $identityProvider | 
| 24 | - * @return \SAML2\XML\md\IndexedEndpointType|null | |
| 24 | + * @return EndpointType | |
| 25 | 25 | * @throws InvalidMetadata | 
| 26 | 26 | */ | 
| 27 | 27 | private function firstIdpSsoService(AbstractProvider $identityProvider): EndpointType | 
| @@ -2,16 +2,16 @@ | ||
| 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; | |
| 5 | 8 | use craft\base\Component; | 
| 6 | 9 | use flipbox\keychain\records\KeyChainRecord; | 
| 7 | 10 | use flipbox\saml\core\exceptions\InvalidMetadata; | 
| 8 | 11 | use flipbox\saml\core\helpers\MessageHelper; | 
| 9 | 12 | use flipbox\saml\core\records\AbstractProvider; | 
| 10 | -use flipbox\saml\sp\models\Settings; | |
| 11 | 13 | use flipbox\saml\sp\Saml; | 
| 12 | -use SAML2\AuthnRequest as SamlAuthnRequest; | |
| 13 | -use SAML2\Constants; | |
| 14 | -use SAML2\XML\md\EndpointType; | |
| 14 | +use flipbox\saml\sp\models\Settings; | |
| 15 | 15 | use yii\base\Event; | 
| 16 | 16 | |
| 17 | 17 | class AuthnRequest extends Component |