Skip to content

Commit 12ad8eb

Browse files
committed
Merge pull request #178 from chalasr/patch_class_parameters
Remove deprecated usage of class parameters
2 parents f6f7722 + 5f9fee1 commit 12ad8eb

File tree

1 file changed

+11
-25
lines changed

1 file changed

+11
-25
lines changed

Resources/config/services.xml

+11-25
Original file line numberDiff line numberDiff line change
@@ -4,27 +4,13 @@
44
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
55
xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
66

7-
<parameters>
8-
<parameter key="lexik_jwt_authentication.jwt_encoder.class">Lexik\Bundle\JWTAuthenticationBundle\Encoder\JWTEncoder</parameter>
9-
<parameter key="lexik_jwt_authentication.jwt_manager.class">Lexik\Bundle\JWTAuthenticationBundle\Services\JWTManager</parameter>
10-
<parameter key="lexik_jwt_authentication.handler.authentication_success.class">Lexik\Bundle\JWTAuthenticationBundle\Security\Http\Authentication\AuthenticationSuccessHandler</parameter>
11-
<parameter key="lexik_jwt_authentication.handler.authentication_failure.class">Lexik\Bundle\JWTAuthenticationBundle\Security\Http\Authentication\AuthenticationFailureHandler</parameter>
12-
<parameter key="lexik_jwt_authentication.openssl_key_loader.class">Lexik\Bundle\JWTAuthenticationBundle\Services\OpenSSLKeyLoader</parameter>
13-
<parameter key="lexik_jwt_authentication.security.authentication.provider.class">Lexik\Bundle\JWTAuthenticationBundle\Security\Authentication\Provider\JWTProvider</parameter>
14-
<parameter key="lexik_jwt_authentication.security.authentication.listener.class">Lexik\Bundle\JWTAuthenticationBundle\Security\Firewall\JWTListener</parameter>
15-
<parameter key="lexik_jwt_authentication.security.authentication.entry_point.class">Lexik\Bundle\JWTAuthenticationBundle\Security\Http\EntryPoint\JWTEntryPoint</parameter>
16-
<parameter key="lexik_jwt_authentication.extractor.authorization_header_extractor.class">Lexik\Bundle\JWTAuthenticationBundle\TokenExtractor\AuthorizationHeaderTokenExtractor</parameter>
17-
<parameter key="lexik_jwt_authentication.extractor.query_parameter_extractor.class">Lexik\Bundle\JWTAuthenticationBundle\TokenExtractor\QueryParameterTokenExtractor</parameter>
18-
<parameter key="lexik_jwt_authentication.extractor.cookie_extractor.class">Lexik\Bundle\JWTAuthenticationBundle\TokenExtractor\CookieTokenExtractor</parameter>
19-
</parameters>
20-
217
<services>
228
<!-- JWT Encoder / Decoder / Default implementation -->
23-
<service id="lexik_jwt_authentication.jwt_encoder" class="%lexik_jwt_authentication.jwt_encoder.class%">
9+
<service id="lexik_jwt_authentication.jwt_encoder" class="Lexik\Bundle\JWTAuthenticationBundle\Encoder\JWTEncoder">
2410
<argument type="service" id="lexik_jwt_authentication.openssl_key_loader"/>
2511
</service>
2612
<!-- JWT Manager / Default implementation -->
27-
<service id="lexik_jwt_authentication.jwt_manager" class="%lexik_jwt_authentication.jwt_manager.class%">
13+
<service id="lexik_jwt_authentication.jwt_manager" class="Lexik\Bundle\JWTAuthenticationBundle\Services\JWTManager">
2814
<argument type="service" id="lexik_jwt_authentication.encoder"/>
2915
<argument type="service" id="event_dispatcher"/>
3016
<argument type="service" id="request_stack"/>
@@ -34,23 +20,23 @@
3420
</call>
3521
</service>
3622
<!-- JWT Authentication response interceptor -->
37-
<service id="lexik_jwt_authentication.handler.authentication_success" class="%lexik_jwt_authentication.handler.authentication_success.class%">
23+
<service id="lexik_jwt_authentication.handler.authentication_success" class="Lexik\Bundle\JWTAuthenticationBundle\Security\Http\Authentication\AuthenticationSuccessHandler">
3824
<argument type="service" id="lexik_jwt_authentication.jwt_manager"/>
3925
<argument type="service" id="event_dispatcher"/>
4026
<tag name="monolog.logger" channel="security"></tag>
4127
</service>
42-
<service id="lexik_jwt_authentication.handler.authentication_failure" class="%lexik_jwt_authentication.handler.authentication_failure.class%">
28+
<service id="lexik_jwt_authentication.handler.authentication_failure" class="Lexik\Bundle\JWTAuthenticationBundle\Security\Http\Authentication\AuthenticationFailureHandler">
4329
<tag name="monolog.logger" channel="security"></tag>
4430
<argument type="service" id="event_dispatcher"/>
4531
</service>
4632
<!-- OpenSSL Key Loader -->
47-
<service id="lexik_jwt_authentication.openssl_key_loader" class="%lexik_jwt_authentication.openssl_key_loader.class%">
33+
<service id="lexik_jwt_authentication.openssl_key_loader" class="Lexik\Bundle\JWTAuthenticationBundle\Services\OpenSSLKeyLoader">
4834
<argument>%lexik_jwt_authentication.private_key_path%</argument>
4935
<argument>%lexik_jwt_authentication.public_key_path%</argument>
5036
<argument>%lexik_jwt_authentication.pass_phrase%</argument>
5137
</service>
5238
<!-- JWT Security Authentication Provider -->
53-
<service id="lexik_jwt_authentication.security.authentication.provider" class="%lexik_jwt_authentication.security.authentication.provider.class%" public="false">
39+
<service id="lexik_jwt_authentication.security.authentication.provider" class="Lexik\Bundle\JWTAuthenticationBundle\Security\Authentication\Provider\JWTProvider" public="false">
5440
<argument /> <!-- User Provider -->
5541
<argument type="service" id="lexik_jwt_authentication.jwt_manager" />
5642
<call method="setUserIdentityField">
@@ -59,7 +45,7 @@
5945
<argument type="service" id="event_dispatcher"/>
6046
</service>
6147
<!-- JWT Security Authentication Listener -->
62-
<service id="lexik_jwt_authentication.security.authentication.listener" class="%lexik_jwt_authentication.security.authentication.listener.class%" public="false">
48+
<service id="lexik_jwt_authentication.security.authentication.listener" class="Lexik\Bundle\JWTAuthenticationBundle\Security\Firewall\JWTListener" public="false">
6349
<argument type="service" id="security.token_storage"/>
6450
<argument type="service" id="security.authentication.manager"/>
6551
<argument /> <!-- Options -->
@@ -68,20 +54,20 @@
6854
</call>
6955
</service>
7056
<!-- Authorization Header Token Extractor -->
71-
<service id="lexik_jwt_authentication.extractor.authorization_header_extractor" class="%lexik_jwt_authentication.extractor.authorization_header_extractor.class%" public="false">
57+
<service id="lexik_jwt_authentication.extractor.authorization_header_extractor" class="Lexik\Bundle\JWTAuthenticationBundle\TokenExtractor\AuthorizationHeaderTokenExtractor" public="false">
7258
<argument /> <!-- Header Value Prefix -->
7359
<argument /> <!-- Header Value Name -->
7460
</service>
7561
<!-- Query Parameter Token Extractor -->
76-
<service id="lexik_jwt_authentication.extractor.query_parameter_extractor" class="%lexik_jwt_authentication.extractor.query_parameter_extractor.class%" public="false">
62+
<service id="lexik_jwt_authentication.extractor.query_parameter_extractor" class="Lexik\Bundle\JWTAuthenticationBundle\TokenExtractor\QueryParameterTokenExtractor" public="false">
7763
<argument /> <!-- Parameter Name -->
7864
</service>
7965
<!-- Cookie Token Extractor -->
80-
<service id="lexik_jwt_authentication.extractor.cookie_extractor" class="%lexik_jwt_authentication.extractor.cookie_extractor.class%" public="false">
66+
<service id="lexik_jwt_authentication.extractor.cookie_extractor" class="Lexik\Bundle\JWTAuthenticationBundle\TokenExtractor\CookieTokenExtractor" public="false">
8167
<argument /> <!-- Name -->
8268
</service>
8369
<!-- JWT Security Authentication Entry Point -->
84-
<service id="lexik_jwt_authentication.security.authentication.entry_point" class="%lexik_jwt_authentication.security.authentication.entry_point.class%" public="false"></service>
70+
<service id="lexik_jwt_authentication.security.authentication.entry_point" class="Lexik\Bundle\JWTAuthenticationBundle\Security\Http\EntryPoint\JWTEntryPoint" public="false"></service>
8571
</services>
8672

8773
</container>

0 commit comments

Comments
 (0)