Skip to content

Commit

Permalink
Add symfony 4.0
Browse files Browse the repository at this point in the history
  • Loading branch information
Evgen14 committed Oct 5, 2018
1 parent 3333209 commit fa87861
Show file tree
Hide file tree
Showing 3 changed files with 34 additions and 25 deletions.
20 changes: 16 additions & 4 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,17 +19,29 @@

"doctrine/orm": "~2.3",

"symfony/symfony": "~2.8|~3.0",
"symfony/framework-bundle": "~2.8|~3.0|~4.0",

"korotovsky/sso-library": "~0.3.0",
"symfony/security-bundle": "~3.1|~4.0",

"symfony/templating": "~3.1|~4.0",

"symfony/twig-bundle": "~3.1|~4.0",

"symfony/form": "~3.1|~4.0",

"symfony/console": "~3.1|~4.0",

"korotovsky/sso-library": "~0.3.1",

"ext-openssl": "*"
},
"require-dev": {
"phpunit/phpunit": ">=4.4",
"phpunit/phpunit": "^5.7",

"doctrine/doctrine-bundle": "~1.6",
"doctrine/doctrine-fixtures-bundle": "~2.3"
"doctrine/doctrine-fixtures-bundle": "~2.3",

"symfony/var-dumper": "^3.4|^4.1"
},
"autoload": {
"psr-4": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,47 +8,47 @@
</parameters>

<services>
<service id="krtv_single_sign_on_identity_provider.routing.loader" class="Krtv\Bundle\SingleSignOnIdentityProviderBundle\Routing\SsoRoutesLoader">
<service id="krtv_single_sign_on_identity_provider.routing.loader" class="Krtv\Bundle\SingleSignOnIdentityProviderBundle\Routing\SsoRoutesLoader" public="true">
<tag name="routing.loader"/>
<argument/> <!-- sso host -->
<argument/> <!-- sso login path -->
<argument/> <!-- sso logout path -->
</service>

<service id="krtv_single_sign_on_identity_provider.security.authentication.otp_manager.orm" class="Krtv\SingleSignOn\Manager\ORM\OneTimePasswordManager">
<service id="krtv_single_sign_on_identity_provider.security.authentication.otp_manager.orm" class="Krtv\SingleSignOn\Manager\ORM\OneTimePasswordManager" public="true">
<argument type="service" id="doctrine.orm.entity_manager"/>
<argument type="string">Krtv\Bundle\SingleSignOnIdentityProviderBundle\Entity\OneTimePassword</argument>
</service>

<service id="krtv_single_sign_on_identity_provider.manager.service_manager" class="Krtv\Bundle\SingleSignOnIdentityProviderBundle\Manager\ServiceManager">
<service id="krtv_single_sign_on_identity_provider.manager.service_manager" class="Krtv\Bundle\SingleSignOnIdentityProviderBundle\Manager\ServiceManager" public="true">
<argument type="service" id="request_stack" />
<argument type="service" id="session" />
<argument type="string">%krtv_single_sign_on_identity_provider.security.firewall_id%</argument> <!-- main firewall id -->
<argument type="collection" /> <!-- ServiceProvider managers loaded by sso.service_provider tag -->
<argument type="collection" /> <!-- options -->
</service>

<service id="krtv_single_sign_on_identity_provider.manager.logout_manager" class="Krtv\Bundle\SingleSignOnIdentityProviderBundle\Manager\LogoutManager">
<service id="krtv_single_sign_on_identity_provider.manager.logout_manager" class="Krtv\Bundle\SingleSignOnIdentityProviderBundle\Manager\LogoutManager" public="true">
<argument type="service" id="krtv_single_sign_on_identity_provider.manager.service_manager" />
<argument type="service" id="session" />
<argument type="service" id="router" />
</service>

<service id="krtv_single_sign_on_identity_provider.event_listener.service_subscriber" class="Krtv\Bundle\SingleSignOnIdentityProviderBundle\EventListener\TargetPathSubscriber">
<service id="krtv_single_sign_on_identity_provider.event_listener.service_subscriber" class="Krtv\Bundle\SingleSignOnIdentityProviderBundle\EventListener\TargetPathSubscriber" public="true">
<argument type="service" id="krtv_single_sign_on_identity_provider.manager.service_manager" />
<argument type="service" id="krtv_single_sign_on_identity_provider.uri_signer" />
<tag name="kernel.event_subscriber" />
</service>

<service id="krtv_single_sign_on_identity_provider.security.authentication.encoder" class="Krtv\SingleSignOn\Encoder\OneTimePasswordEncoder">
<service id="krtv_single_sign_on_identity_provider.security.authentication.encoder" class="Krtv\SingleSignOn\Encoder\OneTimePasswordEncoder" public="true">
<argument/> <!-- secret -->
</service>

<service id="krtv_single_sign_on_identity_provider.uri_signer" class="Symfony\Component\HttpKernel\UriSigner">
<service id="krtv_single_sign_on_identity_provider.uri_signer" class="Symfony\Component\HttpKernel\UriSigner" public="true">
<argument/> <!-- secret -->
</service>

<service id="krtv_single_sign_on_identity_provider.security.http_utils" class="Krtv\Bundle\SingleSignOnIdentityProviderBundle\Security\Http\HttpUtils">
<service id="krtv_single_sign_on_identity_provider.security.http_utils" class="Krtv\Bundle\SingleSignOnIdentityProviderBundle\Security\Http\HttpUtils" public="true">
<argument type="service" id="krtv_single_sign_on_identity_provider.uri_signer"/>
<argument type="service" id="security.http_utils"/>
<argument type="string">%krtv_single_sign_on_identity_provider.otp_parameter%</argument>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ framework:
profiler:
collect: false

secret: %secret%
secret: '%secret%'
router:
resource: %kernel.root_dir%/config/routing.yml
resource: '%kernel.root_dir%/config/routing.yml'
strict_requirements: ~

form: ~
Expand All @@ -19,12 +19,9 @@ framework:
engines:
- twig

trusted_proxies: ~
session: ~

security:
access_decision_manager:
strategy: affirmative
strategy: affirmative

providers:
in_memory:
Expand All @@ -50,7 +47,7 @@ security:
path: /logout

access_control:
- { host: %host%, path: ^/sso/login/$, role: IS_AUTHENTICATED_ANONYMOUSLY }
- { host: '%host%', path: ^/sso/login/$, role: IS_AUTHENTICATED_ANONYMOUSLY }

doctrine:
dbal:
Expand All @@ -62,13 +59,13 @@ doctrine:
auto_mapping: true

krtv_single_sign_on_identity_provider:
host: %host%
host_scheme: %host.scheme%
host: '%host%'
host_scheme: '%host.scheme%'

login_path: /sso/login/
logout_path: /sso/logout

services: %sso_active_services%
services: '%sso_active_services%'

otp_parameter: _otp
secret_parameter: secret
Expand All @@ -94,6 +91,6 @@ parameters:
- consumer1
- consumer2

router.request_context.host: %host%
router.request_context.scheme: %host.scheme%
router.request_context.base_url: ~
router.request_context.host: '%host%'
router.request_context.scheme: '%host.scheme%'
router.request_context.base_url: '/'

0 comments on commit fa87861

Please sign in to comment.