twig

Author: Rom1-B

.twig_cs.dist.php

@@ -0,0 +1,15 @@
+<?php
+
+declare(strict_types=1);
+
+use FriendsOfTwig\Twigcs;
+
+$finder = Twigcs\Finder\TemplateFinder::create()
+    ->in(__DIR__ . '/templates')
+    ->name('*.html.twig')
+    ->ignoreVCSIgnored(true);
+
+return Twigcs\Config\Config::create()
+    ->setFinder($finder)
+    ->setRuleSet(\Glpi\Tools\GlpiTwigRuleset::class)
+;

composer.json

@@ -4,6 +4,7 @@
     },
     "require-dev": {
         "friendsofphp/php-cs-fixer": "^3.75",
+        "friendsoftwig/twigcs": "^6.5",
         "glpi-project/tools": "^0.7.5",
         "php-parallel-lint/php-parallel-lint": "^1.4",
         "phpstan/extension-installer": "^1.4",
@@ -22,5 +23,10 @@
         "allow-plugins": {
             "phpstan/extension-installer": true
         }
+    },
+    "autoload-dev": {
+        "psr-4": {
+            "Glpi\\Tools\\": "../../tools/src/"
+        }
     }
 }

composer.lock

@@ -28,6 +28,7 @@
  * -------------------------------------------------------------------------
  */
 
+use Glpi\Application\View\TemplateRenderer;
 use GlpiPlugin\Oauthimap\MailCollectorFeature;
 use GlpiPlugin\Oauthimap\Provider\Azure;
 use GlpiPlugin\Oauthimap\Provider\Google;
@@ -287,53 +288,17 @@ public static function showFormExtra(int $id): void
 
         $documentation_urls_json = json_encode(self::getProvidersDocumentationUrls());
 
-        // Display/hide additionnal params and update documentation link depending on selected provider
-        $additionnal_params_js = <<<JAVASCRIPT
-            (function($) {
-                var documentation_urls = {$documentation_urls_json};
+        $callback_url = self::getCallbackUrl();
 
-                var updateDocumentationLink = function () {
-                    var provider = $('#dropdown_provider{$rand}').val();
-
-                    var url = documentation_urls.hasOwnProperty(provider)
-                        ? documentation_urls[provider]
-                        : null;
-
-                    $('.help-link').attr('href', url).toggle(url !== null);
-                };
-
-                var onProviderChange = function () {
-                    var provider = $.escapeSelector($(this).val()); // escape selector as it contains slashes
-                    $('[data-provider="' + provider + '"]').closest('.form-field').show();
-                    $('[data-provider]:not([data-provider="' + provider + '"])').closest('.form-field').hide();
-
-                    updateDocumentationLink();
-                };
-
-                $('#dropdown_provider{$rand}').change(onProviderChange);
-                onProviderChange.call($('#dropdown_provider{$rand}'));
-            })(jQuery);
-JAVASCRIPT;
-
-        echo '<div class="form-field row col-12 col-sm-6 mb-2">';
-        echo Html::scriptBlock($additionnal_params_js);
-        echo '<label class="col-form-label col-xxl-5 text-xxl-end" for="_callback_url_' . $rand . '">';
-        echo __('Callback url', 'oauthimap');
-        echo ' <i class="fa fa-info pointer" title="' . __('copy it in the management console of provider', 'oauthimap') . '"></i>';
-        echo '</label>';
-        echo '<div class="col-xxl-7 field-container">';
-        echo '<div class="input-group flex-grow-1 copy_to_clipboard_wrapper">';
-        echo Html::input(
-            '',
+        echo TemplateRenderer::getInstance()->render(
+            '@oauthimap/application_form_extra.html.twig',
             [
-                'value'    => self::getCallbackUrl(),
-                'readonly' => 'readonly',
+                'rand'                 => $rand,
+                'callback_url'         => $callback_url,
+                'documentation_urls'   => self::getProvidersDocumentationUrls(),
+                'documentation_urls_json' => $documentation_urls_json,
             ],
         );
-        echo '<i class="input-group-text fa-lg pointer copy_to_clipboard_wrapper" role="button"></i>';
-        echo '</div>';
-        echo '</div>';
-        echo '</div>';
     }
 
     public function prepareInputForAdd($input)

inc/application.class.php

@@ -0,0 +1,64 @@
+{#
+ # -------------------------------------------------------------------------
+ # oauthimap plugin for GLPI
+ # -------------------------------------------------------------------------
+ #
+ # LICENSE
+ #
+ # This file is part of oauthimap plugin.
+ #
+ # This plugin is free software: you can redistribute it and/or modify
+ # it under the terms of the GNU General Public License as published by
+ # the Free Software Foundation, either version 3 of the License, or
+ # (at your option) any later version.
+ #
+ # This plugin is distributed in the hope that it will be useful,
+ # but WITHOUT ANY WARRANTY; without even the implied warranty of
+ # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ # GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License
+ # along with this plugin. If not, see <https://www.gnu.org/licenses/>.
+ # -------------------------------------------------------------------------
+ # @copyright Copyright (C) 2020-2025 by Teclib'
+ # @license   GPLv3+ https://www.gnu.org/licenses/gpl-3.0.fr.html
+ # @link      https://services.glpi-network.com
+ # -------------------------------------------------------------------------
+ #}
+
+{% import 'components/form/fields_macros.html.twig' as fields %}
+
+{{ fields.textField(
+    'callback_url',
+    callback_url,
+    __('Callback url', 'oauthimap'), {
+        copyable: true
+    }
+) }}
+
+<script>
+    (function($) {
+        var documentation_urls = {{ documentation_urls_json|raw }};
+
+        var updateDocumentationLink = function () {
+            var provider = $('#dropdown_provider{{ rand }}').val();
+
+            var url = documentation_urls.hasOwnProperty(provider)
+                ? documentation_urls[provider]
+                : null;
+
+            $('.help-link').attr('href', url).toggle(url !== null);
+        };
+
+        var onProviderChange = function () {
+            var provider = $.escapeSelector($(this).val()); // escape selector as il contient des slashes
+            $('[data-provider="' + provider + '"]').closest('.form-field').show();
+            $('[data-provider]:not([data-provider="' + provider + '"])').closest('.form-field').hide();
+
+            updateDocumentationLink();
+        };
+
+        $('#dropdown_provider{{ rand }}').change(onProviderChange);
+        onProviderChange.call($('#dropdown_provider{{ rand }}'));
+    })(jQuery);
+</script>