Refactor the authorization server to match the new interface, autocin…

…figure the service so that it is used by the TokenAuthenticator

config.xml

@@ -8,4 +8,4 @@
     <tab><![CDATA[]]></tab>
     <is_configurable>1</is_configurable>
     <need_instance>0</need_instance>
-</module>
+</module>

config/services.yml

@@ -47,12 +47,12 @@ services:
     public: true
     autowire: true
 
-  PrestaShop\Module\KeycloakConnectorDemo\OAuth2\KeyCloakResourceServer:
-    class: PrestaShop\Module\KeycloakConnectorDemo\OAuth2\KeyCloakResourceServer
+  PrestaShop\Module\KeycloakConnectorDemo\OAuth2\KeycloakAuthorizationServer:
+    # Autoconfigure to get tag from interface and to be injected in TokenAuthenticator
+    autoconfigure: true
+    class: PrestaShop\Module\KeycloakConnectorDemo\OAuth2\KeycloakAuthorizationServer
     arguments:
       - '@prestashop.module.keycloak_connector_demo.client'
       - '@prestashop.adapter.legacy.configuration'
       - '@prestashop.module.keycloak_connector_demo.php_encrypt'
       - '@PrestaShop\Module\KeycloakConnectorDemo\RequestBuilder'
-
-  PrestaShop\PrestaShop\Core\OAuth2\OAuth2Interface: '@PrestaShop\Module\KeycloakConnectorDemo\OAuth2\KeyCloakResourceServer'

keycloak_connector_demo.php

@@ -18,6 +18,7 @@
  * @license   https://opensource.org/licenses/AFL-3.0 Academic Free License version 3.0
  */
 
+use PrestaShop\Module\KeycloakConnectorDemo\Form\ConfigurationDataConfiguration;
 use PrestaShop\PrestaShop\Adapter\SymfonyContainer;
 
 if (!defined('_PS_VERSION_')) {
@@ -53,4 +54,28 @@ public function getContent(): void
         $router = $container->get('router');
         Tools::redirectAdmin($router->generate('keycloak_connector_configuration'));
     }
+
+    public function install()
+    {
+        if (!parent::install()) {
+            return false;
+        }
+
+        // Inject default configuration on install (the value is encrypted in the DB);
+        $encryption = new PhpEncryption(_NEW_COOKIE_KEY_);
+
+        return Configuration::updateValue(ConfigurationDataConfiguration::REALM_ENDPOINT, $encryption->encrypt('http://localhost:8003/realms/prestashop'));
+    }
+
+    public function uninstall()
+    {
+        if (!parent::uninstall()) {
+            return false;
+        }
+
+        // Delete configuration if present
+        Configuration::deleteByName(ConfigurationDataConfiguration::REALM_ENDPOINT);
+
+        return true;
+    }
 }

src/Form/ConfigurationDataConfiguration.php

@@ -28,7 +28,6 @@
 use PrestaShop\PrestaShop\Core\ConfigurationInterface;
 use Psr\Http\Client\ClientExceptionInterface;
 use Psr\Http\Client\ClientInterface;
-use RuntimeException;
 
 final class ConfigurationDataConfiguration implements DataConfigurationInterface
 {
@@ -72,7 +71,7 @@ public function getConfiguration(): array
         if (!empty($endpoint)) {
             $endpoint = $this->encryption->decrypt($endpoint);
             if (!is_string($endpoint)) {
-                throw new RuntimeException('Unable to decrypt realm endpoint configuration');
+                $endpoint = '';
             }
         }
 

src/Form/ConfigurationType.php

@@ -32,7 +32,7 @@ public function buildForm(FormBuilderInterface $builder, array $options): void
     {
         $builder->add(ConfigurationDataConfiguration::REALM_ENDPOINT, TextType::class, [
             'label' => $this->trans('Keycloak realm endpoint', 'Modules.Keycloakconnectordemo.Admin'),
-            'help' => $this->trans('i.e. https://my.keycloak.instance.org/realms/master', 'Modules.Keycloakconnectordemo.Admin'),
+            'help' => $this->trans('i.e. http://localhost:8003/realms/prestashop', 'Modules.Keycloakconnectordemo.Admin'),
         ]);
     }
 }