Switch to knpuniversity/oauth2-client-bundle

app/config/config.yml

@@ -71,31 +71,24 @@ framework:
           - mustache
           - twig
 
-hwi_oauth:
-    firewall_names:
-      - main
-    resource_owners:
-        elife:
-            type: oauth2
-            class: eLife\Journal\Security\OAuth2\ElifeResourceOwner
-            client_id: '%oauth2_client_id%'
-            client_secret: '%oauth2_client_secret%'
-            access_token_url: '%api_url%/oauth2/token'
-            authorization_url: '%api_url_public%/oauth2/authorize'
-            paths:
-                identifier: id
-                nickname: id
-                realname: name
-            options:
-                csrf: true
-    use_referer: true
-
 isometriks_spam:
     honeypot:
         field: '%honeypot_field%'
         global: true
         message: Please try submitting the form again.
 
+knpu_oauth2_client:
+    clients:
+        elife:
+            type: generic
+            provider_class: eLife\Journal\Security\OAuth2\ElifeProvider
+            client_id: '%oauth2_client_id%'
+            client_secret: '%oauth2_client_secret%'
+            redirect_route: log-in-check
+            provider_options:
+                api_url: '%api_url%'
+                api_url_public: '%api_url_public%'
+
 monolog:
     channels:
       - api

app/config/security.yml

@@ -1,23 +1,19 @@
 security:
     providers:
         oauth:
-            id: hwi_oauth.user.provider
+            id: knpu.oauth2.user_provider
     firewalls:
         dev:
             pattern: ^/(_(profiler|wdt))/
             security: false
         main:
             anonymous: ~
+            guard:
+                authenticators:
+                  - elife.journal.security.authenticator.elife
             logout:
                 path: /log-out
                 target: /
-            oauth:
-                login_path: /log-in
-                failure_path: /
-                oauth_user_provider:
-                    service: hwi_oauth.user.provider
-                resource_owners:
-                    elife: /log-in/check
     access_control:
         - path: ^/log-in
           roles: IS_AUTHENTICATED_ANONYMOUSLY

app/config/services.yml

@@ -241,6 +241,14 @@ services:
           - '%hypothesis_client_id%'
           - '%hypothesis_client_secret%'
 
+    elife.journal.security.authenticator.elife:
+        class: eLife\Journal\Security\Authenticator\ElifeAuthenticator
+        public: false
+        arguments:
+          - '@oauth2.registry'
+          - '@router'
+          - '@security.http_utils'
+
     elife.journal.security.voter.feature.can_authenticate:
         class: eLife\Journal\Security\Voter\SessionAttributeVoter
         public: false

app/config/services_test.yml

@@ -27,7 +27,7 @@ services:
         class: Csa\Bundle\GuzzleBundle\Cache\MockStorageAdapter
         arguments:
           - '%api_mock%'
-          - ['Authorization', 'Content-Length', 'Host', 'host', 'Referer', 'referer', 'User-Agent', 'user-agent', 'X-Guzzle-Cache']
+          - ['authorization', 'content-length', 'host', 'referer', 'user-agent', 'x-guzzle-cache']
 
     elife.guzzle.middleware.mock.storage.validating:
         class: test\eLife\Journal\ValidatingStorageAdapter
@@ -36,6 +36,12 @@ services:
           - '@elife.guzzle.middleware.mock.storage.validating.inner'
           - '@elife.api_validator.validator'
 
+    elife.guzzle.middleware.mock.storage.normalizing:
+        class: test\eLife\Journal\NormalizingStorageAdapter
+        decorates: elife.guzzle.middleware.mock.storage
+        arguments:
+          - '@elife.guzzle.middleware.mock.storage.normalizing.inner'
+
     elife.guzzle.middleware.mock:
         class: Csa\Bundle\GuzzleBundle\GuzzleHttp\Middleware\MockMiddleware
         arguments:

composer.json

@@ -25,9 +25,9 @@
         "fabpot/goutte": "^3.2",
         "firebase/php-jwt": "^5.0",
         "guzzlehttp/promises": "^1.3",
-        "hwi/oauth-bundle": "^0.6@dev",
         "isometriks/spam-bundle": "^1.0",
         "kevinrob/guzzle-cache-middleware": "^3.2",
+        "knpuniversity/oauth2-client-bundle": "^1.16",
         "mindplay/composer-locator": "^2.1",
         "mustache/mustache": "^2.12",
         "nelmio/security-bundle": "^2.4",