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>

7 files changed, 138 insertions, 1 deletions

diff --git a/app/Resources/FOSOAuthServerBundle/views/Authorize/authorize.html.twig b/app/Resources/FOSOAuthServerBundle/views/Authorize/authorize.html.twig
new file mode 100644
index 00000000..42566a05
--- /dev/null
+++ b/app/Resources/FOSOAuthServerBundle/views/Authorize/authorize.html.twig
@@ -0,0 +1,7 @@
+{% extends "WallabagCoreBundle::layout.html.twig" %}
+
+{% block title %}{{ 'developer.client.page_title'|trans }}{% endblock %}
+
+{% block content %}
+{% include "FOSOAuthServerBundle:Authorize:authorize_content.html.twig" %}
+{% endblock content %}
diff --git a/app/Resources/FOSOAuthServerBundle/views/Authorize/authorize_content.html.twig b/app/Resources/FOSOAuthServerBundle/views/Authorize/authorize_content.html.twig
new file mode 100644
index 00000000..d7f2dbe0
--- /dev/null
+++ b/app/Resources/FOSOAuthServerBundle/views/Authorize/authorize_content.html.twig
@@ -0,0 +1,53 @@
+<div class="row">
+    <div class="col s12">
+        <h4>A new application would like to connect to your account</h4>
+
+        <div class="center-align col l6 offset-l3">
+            <div class="row">
+                <ul class="collection">
+                    <li class="collection-item avatar">
+                        {% if client.image %}
+                        <img src="{{ client.image }}" alt="Client icon" class="circle">
+                        {% endif %}
+                        <span class="title">{{ client.name }}</span>
+                        <p>{{ client.description }}</p>
+                    </li>
+                </ul>
+            {% set scopes = form.scope.vars.value | split(' ') %}
+            {# TODO : Fix me when https://github.com/FriendsOfSymfony/FOSOAuthServerBundle/issues/309 is ok #}
+            <ul class="collapsible col s12 m12 l6 offset-l3" data-collapsible="accordion">
+                {% for scope in scopes %}
+                    {% if scope == 'read' %}
+                        <li>
+                            <div class="collapsible-header"><i class="material-icons">visibility</i>Read Permission</div>
+                            <div class="collapsible-body"><span>{{ client.name }} will be able to access the list and contents of your entries, tags and annotations.</span></div>
+                        </li>
+                    {% endif %}
+                    {% if scope == 'write' %}
+                        <li>
+                            <div class="collapsible-header"><i class="material-icons">edit</i>Edit Permission</div>
+                            <div class="collapsible-body"><span>{{ client.name }} will be able to edit and manage (including deleting) your entries, tags and annotations.</span></div>
+                        </li>
+                    {% endif %}
+                    {% if scope == 'user' %}
+                        <li>
+                            <div class="collapsible-header"><i class="material-icons">person</i>User Permission</div>
+                            <div class="collapsible-body"><span>{{ client.name }} will be able to manage your user account.</span></div>
+                        </li>
+                    {% endif %}
+                {% endfor %}
+            </ul>
+            </div>
+            {{ form_start(form, {'method': 'POST', 'action': path('fos_oauth_server_authorize'), 'label_attr': {'class': 'fos_oauth_server_authorize'} }) }}
+                <input class="waves-effect waves-light btn red" type="submit" name="rejected" value="{{ 'authorize.reject'|trans({}, 'FOSOAuthServerBundle') }}" />
+                <input class="waves-effect waves-light btn" type="submit" name="accepted" value="{{ 'authorize.accept'|trans({}, 'FOSOAuthServerBundle') }}" />
+                {{ form_row(form.client_id) }}
+                {{ form_row(form.response_type) }}
+                {{ form_row(form.redirect_uri) }}
+                {{ form_row(form.state) }}
+                {{ form_row(form.scope) }}
+                {{ form_rest(form) }}
+            </form>
+        </div>
+    </div>
+</div>
diff --git a/app/Resources/static/themes/material/css/various.scss b/app/Resources/static/themes/material/css/various.scss
index 7daf40ec..5ff18038 100644
--- a/app/Resources/static/themes/material/css/various.scss
+++ b/app/Resources/static/themes/material/css/various.scss
@@ -30,3 +30,30 @@ nav .input-field input {
 .tab {
   flex: 1;
 }
+
+.slider .slides {
+  background: #00acc1;
+
+  li {
+    img {
+      background: no-repeat;
+      background-size: contain;
+      background-position: unset;
+    }
+
+    .icon {
+      width: auto;
+      height: 180px;
+    }
+
+    .icon.browser {
+      width: auto;
+      height: 100px;
+    }
+
+    .caption {
+      width: 85%;
+      left: 10%;
+    }
+  }
+}
diff --git a/app/Resources/static/themes/material/index.js b/app/Resources/static/themes/material/index.js
index d6afbb8a..74f64f9e 100755
--- a/app/Resources/static/themes/material/index.js
+++ b/app/Resources/static/themes/material/index.js
@@ -75,4 +75,10 @@ $(document).ready(() => {
     const scrollPercent = (s / (d - c)) * 100;
     $('.progress .determinate').css('width', `${scrollPercent}%`);
   });
+
+  if ($('.slider')) {
+    $('.slider').slider({
+      height: 500,
+    });
+  }
 });
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 }