Add client_credentials as grant_typeoauth-changes

Therefore, username and password are no longer needed

Signed-off-by: Thomas Citharel <tcit@tcit.fr>

Allow to have global clients, auth through direct token or auth code and bring scopes

Signed-off-by: Thomas Citharel <tcit@tcit.fr>

fix review

Signed-off-by: Thomas Citharel <tcit@tcit.fr>

remove redirect uri requirement on specific clients

add back password and depreciate it

enforce state

Signed-off-by: Thomas Citharel <tcit@tcit.fr>

Allow apps to register themselves

A handful of changes

Signed-off-by: Thomas Citharel <tcit@tcit.fr>

change timeout values

Signed-off-by: Thomas Citharel <tcit@tcit.fr>

set access_token lifetime to 1 year and double for refresh_token

Signed-off-by: Thomas Citharel <tcit@tcit.fr>

3 files changed, 45 insertions, 1 deletions

diff --git a/app/config/config.yml b/app/config/config.yml
index 2bc5e3b3..112fa012 100644
--- a/app/config/config.yml
+++ b/app/config/config.yml
@@ -35,6 +35,42 @@ framework:
     http_method_override: true
     assets: ~
 
+wallabag_core:
+    version: 2.2.3
+    paypal_url: "https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=9UBA65LG3FX9Y&lc=gb"
+    languages:
+        en: 'English'
+        fr: 'Français'
+        de: 'Deutsch'
+        tr: 'Türkçe'
+        fa: 'فارسی'
+        ro: 'Română'
+        pl: 'Polish'
+        da: 'Dansk'
+        es: 'Español'
+        oc: 'Occitan'
+        it: 'Italiano'
+        pt: 'Português'
+    items_on_page: 12
+    theme: material
+    language: '%locale%'
+    rss_limit: 50
+    reading_speed: 1
+    cache_lifetime: 10
+    action_mark_as_read: 1
+    list_mode: 0
+    fetching_error_message_title: 'No title found'
+    fetching_error_message: |
+        wallabag can't retrieve contents for this article. Please <a href="http://doc.wallabag.org/en/user/errors_during_fetching.html#how-can-i-help-to-fix-that">troubleshoot this issue</a>.
+    api_limit_mass_actions: 10
+
+wallabag_user:
+    registration_enabled: "%fosuser_registration%"
+
+wallabag_import:
+    allow_mimetypes: ['application/octet-stream', 'application/json', 'text/plain', 'text/csv']
+    resource_dir: "%kernel.root_dir%/../web/uploads/import"
+
 # Twig Configuration
 twig:
     debug: "%kernel.debug%"
@@ -194,7 +230,11 @@ fos_oauth_server:
     service:
         user_provider: fos_user.user_provider.username_email
         options:
-            refresh_token_lifetime: 1209600
+            access_token_lifetime: 31536000
+            refresh_token_lifetime: 63072000
+            supported_scopes: read write user
+            enforce_state: true
+            auth_code_lifetime: 60
 
 scheb_two_factor:
     trusted_computer:
diff --git a/app/config/routing.yml b/app/config/routing.yml
index 0bd2d130..5d26f944 100644
--- a/app/config/routing.yml
+++ b/app/config/routing.yml
@@ -44,6 +44,9 @@ fos_user:
 fos_oauth_server_token:
     resource: "@FOSOAuthServerBundle/Resources/config/routing/token.xml"
 
+fos_oauth_server_authorize:
+    resource: "@FOSOAuthServerBundle/Resources/config/routing/authorize.xml"
+
 craue_config_settings_modify:
     path: /settings
     defaults:
diff --git a/app/config/security.yml b/app/config/security.yml
index ffb1d356..0ce37661 100644
--- a/app/config/security.yml
+++ b/app/config/security.yml
@@ -57,6 +57,7 @@ security:
         - { path: ^/api/doc, roles: IS_AUTHENTICATED_ANONYMOUSLY }
         - { path: ^/api/version, roles: IS_AUTHENTICATED_ANONYMOUSLY }
         - { path: ^/api/user, roles: IS_AUTHENTICATED_ANONYMOUSLY }
+        - { path: ^/api/apps, roles: IS_AUTHENTICATED_ANONYMOUSLY }
         - { path: ^/login, roles: IS_AUTHENTICATED_ANONYMOUSLY }
         - { path: ^/register, role: IS_AUTHENTICATED_ANONYMOUSLY }
         - { path: ^/resetting, role: IS_AUTHENTICATED_ANONYMOUSLY }