diff --git a/config/packages/security.yaml b/config/packages/security.yaml index 980fb59f7ac..c9ec5a22dab 100644 --- a/config/packages/security.yaml +++ b/config/packages/security.yaml @@ -52,6 +52,9 @@ security: authentication_required_handler: sulu_security.two_factor_authentication_required_handler success_handler: sulu_security.two_factor_authentication_success_handler failure_handler: sulu_security.two_factor_authentication_failure_handler + access_token: + token_handler: sulu_security.single_sign_on_token_handler + token_extractors: sulu_security.single_sign_on_token_extractor # website: # pattern: ^/ diff --git a/config/routes/sulu_admin.yaml b/config/routes/sulu_admin.yaml index 0b19447d89f..d0ccf7e9b8d 100644 --- a/config/routes/sulu_admin.yaml +++ b/config/routes/sulu_admin.yaml @@ -113,3 +113,9 @@ sulu_audience_targeting_api: type: rest resource: "@SuluAudienceTargetingBundle/Resources/config/routing_api.yml" prefix: /admin/api + +sulu_admin_single_sign_on: + path: /openid + controller: Symfony\Bundle\FrameworkBundle\Controller\RedirectController::redirectAction + defaults: + route: sulu_admin diff --git a/src/Sulu/Bundle/AdminBundle/Resources/js/components/Input/Input.js b/src/Sulu/Bundle/AdminBundle/Resources/js/components/Input/Input.js index 5ef30ac2819..c551189d02b 100644 --- a/src/Sulu/Bundle/AdminBundle/Resources/js/components/Input/Input.js +++ b/src/Sulu/Bundle/AdminBundle/Resources/js/components/Input/Input.js @@ -19,6 +19,7 @@ export default class Input extends React.PureComponent) => { @@ -86,6 +87,7 @@ export default class Input extends React.PureComponent extends React.PureComponent diff --git a/src/Sulu/Bundle/AdminBundle/Resources/js/containers/Login/LoginForm.js b/src/Sulu/Bundle/AdminBundle/Resources/js/containers/Login/LoginForm.js index eba77b9a23e..e2c076ffc63 100644 --- a/src/Sulu/Bundle/AdminBundle/Resources/js/containers/Login/LoginForm.js +++ b/src/Sulu/Bundle/AdminBundle/Resources/js/containers/Login/LoginForm.js @@ -119,7 +119,7 @@ class LoginForm extends React.Component { /> )} - {!this.props.hasSingleSignOn || (this.props.hasSingleSignOn && this.props.hasOnlyPassword) && ( + {(!this.props.hasSingleSignOn || (this.props.hasSingleSignOn && this.props.hasOnlyPassword)) && (