From b61fed1fd371f7bd375aa572468172bbe05f4861 Mon Sep 17 00:00:00 2001
From: hschoenenberger <herve.schoenenberger@prestashop.com>
Date: Mon, 4 Nov 2024 19:14:02 +0100
Subject: [PATCH 01/46] refactor: get rid of module-lib-service-container

---
 config/common.yml                             | 362 +++++++++---------
 config/config.php                             |  28 ++
 doc/upgrade-strategy.md                       |  31 ++
 ps_accounts.php                               |  29 +-
 .../CommandHandler/DeleteUserShopHandler.php  |  19 +-
 .../CommandHandler/LinkShopHandler.php        |  16 +-
 .../CommandHandler/UnlinkShopHandler.php      |  18 +-
 .../CommandHandler/UpdateUserShopHandler.php  |  19 +-
 .../CommandHandler/UpgradeModuleHandler.php   |  21 +-
 .../UpgradeModuleMultiHandler.php             |  17 +-
 src/Account/LinkShop.php                      |  16 +-
 src/Account/Session/Firebase/OwnerSession.php |  17 +-
 src/Account/Session/Firebase/ShopSession.php  |  17 +-
 src/Account/Session/ShopSession.php           |  19 +-
 src/Adapter/Configuration.php                 |  17 +-
 src/Adapter/Link.php                          |  16 +-
 src/Api/Client/AccountsClient.php             |  18 +-
 src/Api/Client/ServicesBillingClient.php      |  18 +-
 src/Context/ShopContext.php                   |  17 +-
 src/Cqrs/CommandBus.php                       |  17 +-
 src/Factory/CircuitBreakerFactory.php         |  16 +-
 src/Installer/Installer.php                   |  17 +-
 src/Middleware/Oauth2Middleware.php           |  16 +-
 src/Presenter/PsAccountsPresenter.php         |  16 +-
 src/Provider/OAuth2/Oauth2Client.php          |  16 +-
 src/Provider/OAuth2/PrestaShopSession.php     |  14 +-
 src/Provider/OAuth2/ShopProvider.php          |  14 +-
 src/Provider/RsaKeysProvider.php              |  16 +-
 src/Provider/ShopProvider.php                 |  17 +-
 src/Repository/ConfigurationRepository.php    |  16 +-
 src/Repository/ShopTokenRepository.php        |  16 +-
 src/Repository/UserTokenRepository.php        |  16 +-
 src/Service/AnalyticsService.php              |  17 +-
 src/Service/PsAccountsService.php             |  16 +-
 src/Service/PsBillingService.php              |  18 +-
 src/Service/SentryService.php                 |  19 +-
 .../IServiceContainerService.php              |  13 +
 .../ParameterNotFoundException.php            |   8 +
 src/ServiceContainer/ServiceContainer.php     | 152 ++++++++
 .../ServiceNotFoundException.php              |   8 +
 40 files changed, 947 insertions(+), 226 deletions(-)
 create mode 100644 config/config.php
 create mode 100644 doc/upgrade-strategy.md
 create mode 100644 src/ServiceContainer/IServiceContainerService.php
 create mode 100644 src/ServiceContainer/ParameterNotFoundException.php
 create mode 100644 src/ServiceContainer/ServiceContainer.php
 create mode 100644 src/ServiceContainer/ServiceNotFoundException.php

diff --git a/config/common.yml b/config/common.yml
index adf37dd99..0472de573 100644
--- a/config/common.yml
+++ b/config/common.yml
@@ -2,220 +2,220 @@ imports:
   - { resource: command.yml }
 
 services:
-  ps_accounts.module:
-    class: Ps_accounts
-    public: true
-    factory: ['Module', 'getInstanceByName']
-    arguments:
-      - 'ps_accounts'
-
-  ps_accounts.context:
-    class: Context
-    public: true
-    factory: [ 'Context', 'getContext' ]
-
-  ps_accounts.logger:
-    class: PrestaShop\Module\PsAccounts\Vendor\Monolog\Logger
-    public: true
-    factory: [ 'PrestaShop\Module\PsAccounts\Log\Logger', 'create' ]
-#    arguments:
-#      - '%ps_accounts.log_level%'
-
-  PrestaShop\Module\PsAccounts\Provider\OAuth2\ShopProvider:
-    class: PrestaShop\Module\PsAccounts\Provider\OAuth2\ShopProvider
-    public: true
-    factory: [ 'PrestaShop\Module\PsAccounts\Provider\OAuth2\ShopProvider', 'create' ]
-
-  PrestaShop\Module\PsAccounts\Provider\OAuth2\PrestaShopSession:
-    class: PrestaShop\Module\PsAccounts\Provider\OAuth2\PrestaShopSession
-    public: true
-    factory: [ 'PrestaShop\Module\PsAccounts\Factory\PrestaShopSessionFactory', 'create' ]
-
-  PrestaShop\Module\PsAccounts\Provider\OAuth2\Oauth2Client:
-    class: PrestaShop\Module\PsAccounts\Provider\OAuth2\Oauth2Client
-    public: true
-    arguments:
-      - '@PrestaShop\Module\PsAccounts\Repository\ConfigurationRepository'
-
-  PrestaShop\Module\PsAccounts\Context\ShopContext:
-    class: PrestaShop\Module\PsAccounts\Context\ShopContext
-    public: true
-    arguments:
-      - '@PrestaShop\Module\PsAccounts\Repository\ConfigurationRepository'
-      - '@ps_accounts.context'
-
-  PrestaShop\Module\PsAccounts\Adapter\Configuration:
-    class: PrestaShop\Module\PsAccounts\Adapter\Configuration
-    public: true
-    arguments:
-      - '@ps_accounts.context'
-
-  PrestaShop\Module\PsAccounts\Adapter\Link:
-    class: PrestaShop\Module\PsAccounts\Adapter\Link
-    public: true
-    arguments:
-      - '@PrestaShop\Module\PsAccounts\Context\ShopContext'
+#  ps_accounts.module:
+#    class: Ps_accounts
+#    public: true
+#    factory: ['Module', 'getInstanceByName']
+#    arguments:
+#      - 'ps_accounts'
+
+#  ps_accounts.context:
+#    class: Context
+#    public: true
+#    factory: [ 'Context', 'getContext' ]
+
+#  ps_accounts.logger:
+#    class: PrestaShop\Module\PsAccounts\Vendor\Monolog\Logger
+#    public: true
+#    factory: [ 'PrestaShop\Module\PsAccounts\Log\Logger', 'create' ]
+##    arguments:
+##      - '%ps_accounts.log_level%'
+
+#  PrestaShop\Module\PsAccounts\Provider\OAuth2\ShopProvider:
+#    class: PrestaShop\Module\PsAccounts\Provider\OAuth2\ShopProvider
+#    public: true
+#    factory: [ 'PrestaShop\Module\PsAccounts\Provider\OAuth2\ShopProvider', 'create' ]
+
+#  PrestaShop\Module\PsAccounts\Provider\OAuth2\PrestaShopSession:
+#    class: PrestaShop\Module\PsAccounts\Provider\OAuth2\PrestaShopSession
+#    public: true
+#    factory: [ 'PrestaShop\Module\PsAccounts\Factory\PrestaShopSessionFactory', 'create' ]
+
+#  PrestaShop\Module\PsAccounts\Provider\OAuth2\Oauth2Client:
+#    class: PrestaShop\Module\PsAccounts\Provider\OAuth2\Oauth2Client
+#    public: true
+#    arguments:
+#      - '@PrestaShop\Module\PsAccounts\Repository\ConfigurationRepository'
+
+#  PrestaShop\Module\PsAccounts\Context\ShopContext:
+#    class: PrestaShop\Module\PsAccounts\Context\ShopContext
+#    public: true
+#    arguments:
+#      - '@PrestaShop\Module\PsAccounts\Repository\ConfigurationRepository'
+#      - '@ps_accounts.context'
+
+#  PrestaShop\Module\PsAccounts\Adapter\Configuration:
+#    class: PrestaShop\Module\PsAccounts\Adapter\Configuration
+#    public: true
+#    arguments:
+#      - '@ps_accounts.context'
+
+#  PrestaShop\Module\PsAccounts\Adapter\Link:
+#    class: PrestaShop\Module\PsAccounts\Adapter\Link
+#    public: true
+#    arguments:
+#      - '@PrestaShop\Module\PsAccounts\Context\ShopContext'
 
   #####################
   # installer
 
-  PrestaShop\Module\PsAccounts\Installer\Installer:
-    class: PrestaShop\Module\PsAccounts\Installer\Installer
-    public: true
-    arguments:
-      - '@PrestaShop\Module\PsAccounts\Context\ShopContext'
-      - '@PrestaShop\Module\PsAccounts\Adapter\Link'
+#  PrestaShop\Module\PsAccounts\Installer\Installer:
+#    class: PrestaShop\Module\PsAccounts\Installer\Installer
+#    public: true
+#    arguments:
+#      - '@PrestaShop\Module\PsAccounts\Context\ShopContext'
+#      - '@PrestaShop\Module\PsAccounts\Adapter\Link'
 
   #####################
   # services
 
-  PrestaShop\Module\PsAccounts\Service\PsAccountsService:
-    class: PrestaShop\Module\PsAccounts\Service\PsAccountsService
-    public: true
-    arguments:
-      - '@ps_accounts.module'
-
-  PrestaShop\Module\PsAccounts\Account\LinkShop:
-    class: PrestaShop\Module\PsAccounts\Account\LinkShop
-    public: true
-    arguments:
-      - '@PrestaShop\Module\PsAccounts\Repository\ConfigurationRepository'
-
-  PrestaShop\Module\PsAccounts\Service\PsBillingService:
-    class: PrestaShop\Module\PsAccounts\Service\PsBillingService
-    public: true
-    arguments:
-      - '@PrestaShop\Module\PsAccounts\Api\Client\ServicesBillingClient'
-      - '@PrestaShop\Module\PsAccounts\Repository\ShopTokenRepository'
-      - '@PrestaShop\Module\PsAccounts\Repository\ConfigurationRepository'
-
-  PrestaShop\Module\PsAccounts\Service\AnalyticsService:
-    class: PrestaShop\Module\PsAccounts\Service\AnalyticsService
-    public: true
-    arguments:
-      - '%ps_accounts.segment_write_key%'
-      - '@ps_accounts.logger'
+#  PrestaShop\Module\PsAccounts\Service\PsAccountsService:
+#    class: PrestaShop\Module\PsAccounts\Service\PsAccountsService
+#    public: true
+#    arguments:
+#      - '@ps_accounts.module'
+
+#  PrestaShop\Module\PsAccounts\Account\LinkShop:
+#    class: PrestaShop\Module\PsAccounts\Account\LinkShop
+#    public: true
+#    arguments:
+#      - '@PrestaShop\Module\PsAccounts\Repository\ConfigurationRepository'
+
+#  PrestaShop\Module\PsAccounts\Service\PsBillingService:
+#    class: PrestaShop\Module\PsAccounts\Service\PsBillingService
+#    public: true
+#    arguments:
+#      - '@PrestaShop\Module\PsAccounts\Api\Client\ServicesBillingClient'
+#      - '@PrestaShop\Module\PsAccounts\Repository\ShopTokenRepository'
+#      - '@PrestaShop\Module\PsAccounts\Repository\ConfigurationRepository'
+
+#  PrestaShop\Module\PsAccounts\Service\AnalyticsService:
+#    class: PrestaShop\Module\PsAccounts\Service\AnalyticsService
+#    public: true
+#    arguments:
+#      - '%ps_accounts.segment_write_key%'
+#      - '@ps_accounts.logger'
 
   #####################
   # providers
 
-  PrestaShop\Module\PsAccounts\Provider\ShopProvider:
-    class: PrestaShop\Module\PsAccounts\Provider\ShopProvider
-    public: true
-    arguments:
-      - '@PrestaShop\Module\PsAccounts\Context\ShopContext'
-      - '@PrestaShop\Module\PsAccounts\Adapter\Link'
-
-  PrestaShop\Module\PsAccounts\Provider\RsaKeysProvider:
-    class: PrestaShop\Module\PsAccounts\Provider\RsaKeysProvider
-    public: true
-    arguments:
-      - '@PrestaShop\Module\PsAccounts\Repository\ConfigurationRepository'
-
-  PrestaShop\Module\PsAccounts\Factory\CircuitBreakerFactory:
-    class: PrestaShop\Module\PsAccounts\Factory\CircuitBreakerFactory
-    public: true
-    arguments:
-      - '@PrestaShop\Module\PsAccounts\Adapter\Configuration'
+#  PrestaShop\Module\PsAccounts\Provider\ShopProvider:
+#    class: PrestaShop\Module\PsAccounts\Provider\ShopProvider
+#    public: true
+#    arguments:
+#      - '@PrestaShop\Module\PsAccounts\Context\ShopContext'
+#      - '@PrestaShop\Module\PsAccounts\Adapter\Link'
+
+#  PrestaShop\Module\PsAccounts\Provider\RsaKeysProvider:
+#    class: PrestaShop\Module\PsAccounts\Provider\RsaKeysProvider
+#    public: true
+#    arguments:
+#      - '@PrestaShop\Module\PsAccounts\Repository\ConfigurationRepository'
+
+#  PrestaShop\Module\PsAccounts\Factory\CircuitBreakerFactory:
+#    class: PrestaShop\Module\PsAccounts\Factory\CircuitBreakerFactory
+#    public: true
+#    arguments:
+#      - '@PrestaShop\Module\PsAccounts\Adapter\Configuration'
 
   #####################
   # handlers
 
-  PrestaShop\Module\PsAccounts\Service\SentryService:
-    class: PrestaShop\Module\PsAccounts\Service\SentryService
-    public: true
-    arguments:
-      - '%ps_accounts.sentry_credentials%'
-      - '%ps_accounts.environment%'
-      - '@PrestaShop\Module\PsAccounts\Account\LinkShop'
-      - '@ps_accounts.context'
+#  PrestaShop\Module\PsAccounts\Service\SentryService:
+#    class: PrestaShop\Module\PsAccounts\Service\SentryService
+#    public: true
+#    arguments:
+#      - '%ps_accounts.sentry_credentials%'
+#      - '%ps_accounts.environment%'
+#      - '@PrestaShop\Module\PsAccounts\Account\LinkShop'
+#      - '@ps_accounts.context'
 
   ###############
   # api clients
 
-  PrestaShop\Module\PsAccounts\Api\Client\AccountsClient:
-    class: PrestaShop\Module\PsAccounts\Api\Client\AccountsClient
-    public: true
-    arguments:
-      - '%ps_accounts.accounts_api_url%'
-      - null
-      - 10
-
-  PrestaShop\Module\PsAccounts\Api\Client\ServicesBillingClient:
-    class: PrestaShop\Module\PsAccounts\Api\Client\ServicesBillingClient
-    public: true
-    arguments:
-      - '%ps_accounts.billing_api_url%'
-      - '@PrestaShop\Module\PsAccounts\Service\PsAccountsService'
-      - '@PrestaShop\Module\PsAccounts\Provider\ShopProvider'
+#  PrestaShop\Module\PsAccounts\Api\Client\AccountsClient:
+#    class: PrestaShop\Module\PsAccounts\Api\Client\AccountsClient
+#    public: true
+#    arguments:
+#      - '%ps_accounts.accounts_api_url%'
+#      - null
+#      - 10
+
+#  PrestaShop\Module\PsAccounts\Api\Client\ServicesBillingClient:
+#    class: PrestaShop\Module\PsAccounts\Api\Client\ServicesBillingClient
+#    public: true
+#    arguments:
+#      - '%ps_accounts.billing_api_url%'
+#      - '@PrestaShop\Module\PsAccounts\Service\PsAccountsService'
+#      - '@PrestaShop\Module\PsAccounts\Provider\ShopProvider'
 
   #####################
   # repositories
 
-  PrestaShop\Module\PsAccounts\Account\Session\ShopSession:
-    class: PrestaShop\Module\PsAccounts\Account\Session\ShopSession
-    public: true
-    arguments:
-      - '@PrestaShop\Module\PsAccounts\Repository\ConfigurationRepository'
-      - '@PrestaShop\Module\PsAccounts\Provider\OAuth2\ShopProvider'
-      - '@PrestaShop\Module\PsAccounts\Account\LinkShop'
-      - '@PrestaShop\Module\PsAccounts\Cqrs\CommandBus'
-
-  PrestaShop\Module\PsAccounts\Account\Session\Firebase\ShopSession:
-    class: PrestaShop\Module\PsAccounts\Account\Session\Firebase\ShopSession
-    public: true
-    arguments:
-      - '@PrestaShop\Module\PsAccounts\Repository\ConfigurationRepository'
-      - '@PrestaShop\Module\PsAccounts\Account\Session\ShopSession'
-
-  PrestaShop\Module\PsAccounts\Account\Session\Firebase\OwnerSession:
-    class: PrestaShop\Module\PsAccounts\Account\Session\Firebase\OwnerSession
-    public: true
-    arguments:
-      - '@PrestaShop\Module\PsAccounts\Repository\ConfigurationRepository'
-      - '@PrestaShop\Module\PsAccounts\Account\Session\ShopSession'
-
-  PrestaShop\Module\PsAccounts\Repository\ConfigurationRepository:
-    class: PrestaShop\Module\PsAccounts\Repository\ConfigurationRepository
-    public: true
-    arguments:
-      - '@PrestaShop\Module\PsAccounts\Adapter\Configuration'
-
-  PrestaShop\Module\PsAccounts\Repository\ShopTokenRepository:
-    class: PrestaShop\Module\PsAccounts\Repository\ShopTokenRepository
-    public: true
-    arguments:
-      - '@PrestaShop\Module\PsAccounts\Account\Session\Firebase\ShopSession'
-
-  PrestaShop\Module\PsAccounts\Repository\UserTokenRepository:
-    class: PrestaShop\Module\PsAccounts\Repository\UserTokenRepository
-    public: true
-    arguments:
-      - '@PrestaShop\Module\PsAccounts\Account\Session\Firebase\OwnerSession'
+#  PrestaShop\Module\PsAccounts\Account\Session\ShopSession:
+#    class: PrestaShop\Module\PsAccounts\Account\Session\ShopSession
+#    public: true
+#    arguments:
+#      - '@PrestaShop\Module\PsAccounts\Repository\ConfigurationRepository'
+#      - '@PrestaShop\Module\PsAccounts\Provider\OAuth2\ShopProvider'
+#      - '@PrestaShop\Module\PsAccounts\Account\LinkShop'
+#      - '@PrestaShop\Module\PsAccounts\Cqrs\CommandBus'
+
+#  PrestaShop\Module\PsAccounts\Account\Session\Firebase\ShopSession:
+#    class: PrestaShop\Module\PsAccounts\Account\Session\Firebase\ShopSession
+#    public: true
+#    arguments:
+#      - '@PrestaShop\Module\PsAccounts\Repository\ConfigurationRepository'
+#      - '@PrestaShop\Module\PsAccounts\Account\Session\ShopSession'
+
+#  PrestaShop\Module\PsAccounts\Account\Session\Firebase\OwnerSession:
+#    class: PrestaShop\Module\PsAccounts\Account\Session\Firebase\OwnerSession
+#    public: true
+#    arguments:
+#      - '@PrestaShop\Module\PsAccounts\Repository\ConfigurationRepository'
+#      - '@PrestaShop\Module\PsAccounts\Account\Session\ShopSession'
+
+#  PrestaShop\Module\PsAccounts\Repository\ConfigurationRepository:
+#    class: PrestaShop\Module\PsAccounts\Repository\ConfigurationRepository
+#    public: true
+#    arguments:
+#      - '@PrestaShop\Module\PsAccounts\Adapter\Configuration'
+
+#  PrestaShop\Module\PsAccounts\Repository\ShopTokenRepository:
+#    class: PrestaShop\Module\PsAccounts\Repository\ShopTokenRepository
+#    public: true
+#    arguments:
+#      - '@PrestaShop\Module\PsAccounts\Account\Session\Firebase\ShopSession'
+#
+#  PrestaShop\Module\PsAccounts\Repository\UserTokenRepository:
+#    class: PrestaShop\Module\PsAccounts\Repository\UserTokenRepository
+#    public: true
+#    arguments:
+#      - '@PrestaShop\Module\PsAccounts\Account\Session\Firebase\OwnerSession'
 
   #####################
   # presenters
 
-  PrestaShop\Module\PsAccounts\Presenter\PsAccountsPresenter:
-    class: PrestaShop\Module\PsAccounts\Presenter\PsAccountsPresenter
-    public: true
-    arguments:
-      - '@ps_accounts.module'
+#  PrestaShop\Module\PsAccounts\Presenter\PsAccountsPresenter:
+#    class: PrestaShop\Module\PsAccounts\Presenter\PsAccountsPresenter
+#    public: true
+#    arguments:
+#      - '@ps_accounts.module'
 
   #####################
   # CQRS
 
-  PrestaShop\Module\PsAccounts\Cqrs\CommandBus:
-    class: PrestaShop\Module\PsAccounts\Cqrs\CommandBus
-    public: true
-    arguments:
-      - '@ps_accounts.module'
+#  PrestaShop\Module\PsAccounts\Cqrs\CommandBus:
+#    class: PrestaShop\Module\PsAccounts\Cqrs\CommandBus
+#    public: true
+#    arguments:
+#      - '@ps_accounts.module'
 
   #####################
   # Middleware
 
-  PrestaShop\Module\PsAccounts\Middleware\Oauth2Middleware:
-    class: PrestaShop\Module\PsAccounts\Middleware\Oauth2Middleware
-    public: true
-    arguments:
-      - '@ps_accounts.module'
+#  PrestaShop\Module\PsAccounts\Middleware\Oauth2Middleware:
+#    class: PrestaShop\Module\PsAccounts\Middleware\Oauth2Middleware
+#    public: true
+#    arguments:
+#      - '@ps_accounts.module'
diff --git a/config/config.php b/config/config.php
new file mode 100644
index 000000000..2a1ba4889
--- /dev/null
+++ b/config/config.php
@@ -0,0 +1,28 @@
+<?php
+return [
+  'ps_accounts.environment' => 'development',
+  'ps_accounts.accounts_api_url' => 'https://accounts-api.prestashop.local/',
+  'ps_accounts.accounts_ui_url' => 'https://accounts.prestashop.local',
+  'ps_accounts.sso_api_url' => 'https://auth.prestashop.local/api/',
+  'ps_accounts.sso_account_url' => 'https://auth.prestashop.local/login',
+  'ps_accounts.sso_resend_verification_email_url' => 'https://auth.prestashop.local/account/send-verification-email',
+  'ps_accounts.billing_api_url' => 'https://billing-api.psessentials-integration.net',
+  'ps_accounts.indirect_channel_api_url' => 'https://indirect-channel-api-integration.prestashop.net',
+  'ps_accounts.sentry_credentials' => 'https://12e8e4574d50b54d878db8ee2c3f8380@o298402.ingest.us.sentry.io/5354585',
+  '#ps_accounts.segment_write_key' => 'UITzSdsFTgYsXaiJG09hsCiupUPwgJQB',
+  'ps_accounts.segment_write_key' => 'eYODaH20rT1lMRTTUtAa15BKBlV1XUXQ',
+  'ps_accounts.check_api_ssl_cert' => false,
+  'ps_accounts.verify_account_tokens' => false,
+  'ps_accounts.accounts_vue_cdn_url' => 'http://prestashop8.docker.localhost/upload/psaccountsVue.umd.min.js',
+  #ps_accounts.accounts_cdn_url' => 'http://prestashop8.docker.localhost/upload/psaccountsVue.js'
+  #ps_accounts.accounts_cdn_url' => 'https://unpkg.com/prestashop_accounts_vue_components@5.1.0-test-1/dist/psaccountsVue.js'
+  'ps_accounts.accounts_cdn_url' => 'http://localhost:5174/dist/psaccountsVue.js',
+
+  # a page to display "Update Your Module" message
+  'ps_accounts.svc_accounts_ui_url' => 'https://accounts.prestashop.local/',
+
+  # OAuth2 setup
+  'ps_accounts.oauth2_url' => 'https://oauth.prestashop.local',
+
+  'ps_accounts.testimonials_url' => 'https://assets.prestashop3.com/dst/accounts/assets/testimonials.json'
+];
diff --git a/doc/upgrade-strategy.md b/doc/upgrade-strategy.md
new file mode 100644
index 000000000..5ae05f0ec
--- /dev/null
+++ b/doc/upgrade-strategy.md
@@ -0,0 +1,31 @@
+# Upgrade strategy
+
+## Hook (current solution)
+* We must improve stability and avoid sending events if we detect an SQL error
+* Maintaining upgrade status of the module is a core responsibility
+* We take a risk every time we does an upgrade (crash, spamming shops ....)
+* Heavy to use a hook triggered every time we display an admin page
+* Having a look at the mixpanel we can see we have a regular number of shops spamming with disconnection events
+
+## Upgrade script with Curl & SQL
+* Fastidious & we must duplicate rw code into every upgrade script
+
+## Autoload Hack
+* positive benefits / risk balance
+* seemless upgrade
+* limited risk (only upgrade phase can be affected)
+* NOT WORKING on PS1.7 (not reaching upgrade script)
+
+
+# Dependencies with the core & between modules
+## Dependencies collision
+### fix: Scoping
+# Dependencies between modules (sharing functionalities)
+## fix: MBO
+# Upgrade issues
+## early hooks
+### fix: stop using `actionDispatcherBefore` like hooks
+## not up-to-date autoload
+### fix: enforce autoload script
+
+
diff --git a/ps_accounts.php b/ps_accounts.php
index 8f72891c4..c842d48e5 100644
--- a/ps_accounts.php
+++ b/ps_accounts.php
@@ -230,22 +230,23 @@ public function getCoreServiceContainer()
     }
 
     /**
-     * @return \PrestaShop\Module\PsAccounts\DependencyInjection\ServiceContainer
+     * @return \PrestaShop\Module\PsAccounts\ServiceContainer\ServiceContainer
      *
      * @throws Exception
      */
     public function getServiceContainer()
     {
-        if (null === $this->serviceContainer) {
-            // append version number to force cache generation (1.6 Core won't clear it)
-            $this->serviceContainer = new \PrestaShop\Module\PsAccounts\DependencyInjection\ServiceContainer(
-                $this->name . str_replace(['.', '-', '+'], '', $this->version),
-                $this->getLocalPath(),
-                $this->getModuleEnv()
-            );
-        }
-
-        return $this->serviceContainer;
+//        if (null === $this->serviceContainer) {
+//            // append version number to force cache generation (1.6 Core won't clear it)
+//            $this->serviceContainer = new \PrestaShop\Module\PsAccounts\DependencyInjection\ServiceContainer(
+//                $this->name . str_replace(['.', '-', '+'], '', $this->version),
+//                $this->getLocalPath(),
+//                $this->getModuleEnv()
+//            );
+//        }
+//
+//        return $this->serviceContainer;
+        return \PrestaShop\Module\PsAccounts\ServiceContainer\ServiceContainer::getInstance();
     }
 
     /**
@@ -265,7 +266,8 @@ public function getService($serviceName)
      */
     public function getParameter($name)
     {
-        return $this->getServiceContainer()->getContainer()->getParameter($name);
+        //return $this->getServiceContainer()->getContainer()->getParameter($name);
+        return $this->getServiceContainer()->getParameter($name);
     }
 
     /**
@@ -275,7 +277,8 @@ public function getParameter($name)
      */
     public function hasParameter($name)
     {
-        return $this->getServiceContainer()->getContainer()->hasParameter($name);
+        //return $this->getServiceContainer()->getContainer()->hasParameter($name);
+        return $this->getServiceContainer()->hasParameter($name);
     }
 
     /**
diff --git a/src/Account/CommandHandler/DeleteUserShopHandler.php b/src/Account/CommandHandler/DeleteUserShopHandler.php
index d13c6c6eb..9777e5cf5 100644
--- a/src/Account/CommandHandler/DeleteUserShopHandler.php
+++ b/src/Account/CommandHandler/DeleteUserShopHandler.php
@@ -26,8 +26,10 @@
 use PrestaShop\Module\PsAccounts\Api\Client\AccountsClient;
 use PrestaShop\Module\PsAccounts\Context\ShopContext;
 use PrestaShop\Module\PsAccounts\Exception\RefreshTokenException;
+use PrestaShop\Module\PsAccounts\ServiceContainer\IServiceContainerService;
+use PrestaShop\Module\PsAccounts\ServiceContainer\ServiceContainer;
 
-class DeleteUserShopHandler
+class DeleteUserShopHandler implements IServiceContainerService
 {
     /**
      * @var AccountsClient
@@ -87,4 +89,19 @@ public function handle(DeleteUserShopCommand $command)
             );
         });
     }
+
+    /**
+     * @param ServiceContainer $serviceContainer
+     *
+     * @return static
+     */
+    static function getInstance(ServiceContainer $serviceContainer)
+    {
+        return new static(
+            $serviceContainer->get(AccountsClient::class),
+            $serviceContainer->get(ShopContext::class),
+            $serviceContainer->get(ShopSession::class),
+            $serviceContainer->get(OwnerSession::class)
+        );
+    }
 }
diff --git a/src/Account/CommandHandler/LinkShopHandler.php b/src/Account/CommandHandler/LinkShopHandler.php
index 2b8b429a9..cd4ee304f 100644
--- a/src/Account/CommandHandler/LinkShopHandler.php
+++ b/src/Account/CommandHandler/LinkShopHandler.php
@@ -24,9 +24,11 @@
 use PrestaShop\Module\PsAccounts\Account\Command\LinkShopCommand;
 use PrestaShop\Module\PsAccounts\Account\LinkShop;
 use PrestaShop\Module\PsAccounts\Hook\ActionShopAccountLinkAfter;
+use PrestaShop\Module\PsAccounts\ServiceContainer\IServiceContainerService;
+use PrestaShop\Module\PsAccounts\ServiceContainer\ServiceContainer;
 use PrestaShopException;
 
-class LinkShopHandler
+class LinkShopHandler implements IServiceContainerService
 {
     /**
      * @var LinkShop
@@ -54,4 +56,16 @@ public function handle(LinkShopCommand $command)
             'shopId' => $command->payload->shopId,
         ]);
     }
+
+    /**
+     * @param ServiceContainer $serviceContainer
+     *
+     * @return static
+     */
+    static function getInstance(ServiceContainer $serviceContainer)
+    {
+        return new static(
+            $serviceContainer->get(LinkShop::class)
+        );
+    }
 }
diff --git a/src/Account/CommandHandler/UnlinkShopHandler.php b/src/Account/CommandHandler/UnlinkShopHandler.php
index a70a9d23e..9e3b8e325 100644
--- a/src/Account/CommandHandler/UnlinkShopHandler.php
+++ b/src/Account/CommandHandler/UnlinkShopHandler.php
@@ -26,8 +26,10 @@
 use PrestaShop\Module\PsAccounts\Hook\ActionShopAccountUnlinkAfter;
 use PrestaShop\Module\PsAccounts\Provider\ShopProvider;
 use PrestaShop\Module\PsAccounts\Service\AnalyticsService;
+use PrestaShop\Module\PsAccounts\ServiceContainer\IServiceContainerService;
+use PrestaShop\Module\PsAccounts\ServiceContainer\ServiceContainer;
 
-class UnlinkShopHandler
+class UnlinkShopHandler implements IServiceContainerService
 {
     /**
      * @var LinkShop
@@ -99,4 +101,18 @@ public function handle(UnlinkShopCommand $command)
 
         Hook::exec(ActionShopAccountUnlinkAfter::getName(), $hookData);
     }
+
+    /**
+     * @param ServiceContainer $serviceContainer
+     *
+     * @return static
+     */
+    static function getInstance(ServiceContainer $serviceContainer)
+    {
+        return new static(
+            $serviceContainer->get(LinkShop::class),
+            $serviceContainer->get(AnalyticsService::class),
+            $serviceContainer->get(ShopProvider::class)
+        );
+    }
 }
diff --git a/src/Account/CommandHandler/UpdateUserShopHandler.php b/src/Account/CommandHandler/UpdateUserShopHandler.php
index 01051ecf3..a4e2987d5 100644
--- a/src/Account/CommandHandler/UpdateUserShopHandler.php
+++ b/src/Account/CommandHandler/UpdateUserShopHandler.php
@@ -26,8 +26,10 @@
 use PrestaShop\Module\PsAccounts\Api\Client\AccountsClient;
 use PrestaShop\Module\PsAccounts\Context\ShopContext;
 use PrestaShop\Module\PsAccounts\Exception\RefreshTokenException;
+use PrestaShop\Module\PsAccounts\ServiceContainer\IServiceContainerService;
+use PrestaShop\Module\PsAccounts\ServiceContainer\ServiceContainer;
 
-class UpdateUserShopHandler
+class UpdateUserShopHandler implements IServiceContainerService
 {
     /**
      * @var AccountsClient
@@ -88,4 +90,19 @@ public function handle(UpdateUserShopCommand $command)
             );
         });
     }
+
+    /**
+     * @param ServiceContainer $serviceContainer
+     *
+     * @return static
+     */
+    static function getInstance(ServiceContainer $serviceContainer)
+    {
+        return new static(
+            $serviceContainer->get(AccountsClient::class),
+            $serviceContainer->get(ShopContext::class),
+            $serviceContainer->get(ShopSession::class),
+            $serviceContainer->get(OwnerSession::class)
+        );
+    }
 }
diff --git a/src/Account/CommandHandler/UpgradeModuleHandler.php b/src/Account/CommandHandler/UpgradeModuleHandler.php
index e41d6539a..76de124a5 100644
--- a/src/Account/CommandHandler/UpgradeModuleHandler.php
+++ b/src/Account/CommandHandler/UpgradeModuleHandler.php
@@ -31,8 +31,10 @@
 use PrestaShop\Module\PsAccounts\Exception\RefreshTokenException;
 use PrestaShop\Module\PsAccounts\Log\Logger;
 use PrestaShop\Module\PsAccounts\Repository\ConfigurationRepository;
+use PrestaShop\Module\PsAccounts\ServiceContainer\IServiceContainerService;
+use PrestaShop\Module\PsAccounts\ServiceContainer\ServiceContainer;
 
-class UpgradeModuleHandler
+class UpgradeModuleHandler implements IServiceContainerService
 {
     /**
      * @var LinkShop
@@ -164,4 +166,21 @@ private function lastChanceToRefreshShopToken()
             $tokens['refresh_token']
         );
     }
+
+    /**
+     * @param ServiceContainer $serviceContainer
+     *
+     * @return static
+     */
+    static function getInstance(ServiceContainer $serviceContainer)
+    {
+        return new static(
+            $serviceContainer->get(AccountsClient::class),
+            $serviceContainer->get(LinkShop::class),
+            $serviceContainer->get(ShopSession::class),
+            $serviceContainer->get(ShopContext::class),
+            $serviceContainer->get(ConfigurationRepository::class),
+            $serviceContainer->get(CommandBus::class)
+        );
+    }
 }
diff --git a/src/Account/CommandHandler/UpgradeModuleMultiHandler.php b/src/Account/CommandHandler/UpgradeModuleMultiHandler.php
index aa59f8025..7609a6ac5 100644
--- a/src/Account/CommandHandler/UpgradeModuleMultiHandler.php
+++ b/src/Account/CommandHandler/UpgradeModuleMultiHandler.php
@@ -27,9 +27,11 @@
 use PrestaShop\Module\PsAccounts\Exception\DtoException;
 use PrestaShop\Module\PsAccounts\Exception\RefreshTokenException;
 use PrestaShop\Module\PsAccounts\Repository\ConfigurationRepository;
+use PrestaShop\Module\PsAccounts\ServiceContainer\IServiceContainerService;
+use PrestaShop\Module\PsAccounts\ServiceContainer\ServiceContainer;
 use PrestaShopDatabaseException;
 
-class UpgradeModuleMultiHandler
+class UpgradeModuleMultiHandler implements IServiceContainerService
 {
     /**
      * @var ConfigurationRepository
@@ -93,4 +95,17 @@ private function getShops($multishop)
 
         return $shops;
     }
+
+    /**
+     * @param ServiceContainer $serviceContainer
+     *
+     * @return static
+     */
+    static function getInstance(ServiceContainer $serviceContainer)
+    {
+        return new static(
+            $serviceContainer->get(CommandBus::class),
+            $serviceContainer->get(ConfigurationRepository::class)
+        );
+    }
 }
diff --git a/src/Account/LinkShop.php b/src/Account/LinkShop.php
index 962e351b8..77fadabab 100644
--- a/src/Account/LinkShop.php
+++ b/src/Account/LinkShop.php
@@ -21,8 +21,10 @@
 namespace PrestaShop\Module\PsAccounts\Account;
 
 use PrestaShop\Module\PsAccounts\Repository\ConfigurationRepository;
+use PrestaShop\Module\PsAccounts\ServiceContainer\IServiceContainerService;
+use PrestaShop\Module\PsAccounts\ServiceContainer\ServiceContainer;
 
-class LinkShop
+class LinkShop implements IServiceContainerService
 {
     /**
      * @var ConfigurationRepository
@@ -189,4 +191,16 @@ public function setUnlinkedOnError($errorMsg)
     {
         $this->configuration->updateUnlinkedOnError($errorMsg);
     }
+
+    /**
+     * @param ServiceContainer $serviceContainer
+     *
+     * @return static
+     */
+    static function getInstance(ServiceContainer $serviceContainer)
+    {
+        return new static(
+            $serviceContainer->get(ConfigurationRepository::class)
+        );
+    }
 }
diff --git a/src/Account/Session/Firebase/OwnerSession.php b/src/Account/Session/Firebase/OwnerSession.php
index 603257ec3..f8114e070 100644
--- a/src/Account/Session/Firebase/OwnerSession.php
+++ b/src/Account/Session/Firebase/OwnerSession.php
@@ -23,8 +23,10 @@
 use PrestaShop\Module\PsAccounts\Account\Session\SessionInterface;
 use PrestaShop\Module\PsAccounts\Account\Token\Token;
 use PrestaShop\Module\PsAccounts\Repository\ConfigurationRepository;
+use PrestaShop\Module\PsAccounts\ServiceContainer\IServiceContainerService;
+use PrestaShop\Module\PsAccounts\ServiceContainer\ServiceContainer;
 
-class OwnerSession extends FirebaseSession implements SessionInterface
+class OwnerSession extends FirebaseSession implements SessionInterface, IServiceContainerService
 {
     /**
      * @var ConfigurationRepository
@@ -73,4 +75,17 @@ public function setToken($token, $refreshToken = null)
     {
         $this->configurationRepository->updateUserFirebaseIdAndRefreshToken($token, $refreshToken);
     }
+
+    /**
+     * @param ServiceContainer $serviceContainer
+     *
+     * @return static
+     */
+    static function getInstance(ServiceContainer $serviceContainer)
+    {
+        return new static(
+            $serviceContainer->get(ConfigurationRepository::class),
+            $serviceContainer->get(\PrestaShop\Module\PsAccounts\Account\Session\ShopSession::class)
+        );
+    }
 }
diff --git a/src/Account/Session/Firebase/ShopSession.php b/src/Account/Session/Firebase/ShopSession.php
index ad0d50515..d2dc7bc55 100644
--- a/src/Account/Session/Firebase/ShopSession.php
+++ b/src/Account/Session/Firebase/ShopSession.php
@@ -23,8 +23,10 @@
 use PrestaShop\Module\PsAccounts\Account\Session\SessionInterface;
 use PrestaShop\Module\PsAccounts\Account\Token\Token;
 use PrestaShop\Module\PsAccounts\Repository\ConfigurationRepository;
+use PrestaShop\Module\PsAccounts\ServiceContainer\IServiceContainerService;
+use PrestaShop\Module\PsAccounts\ServiceContainer\ServiceContainer;
 
-class ShopSession extends FirebaseSession implements SessionInterface
+class ShopSession extends FirebaseSession implements SessionInterface, IServiceContainerService
 {
     /**
      * @var ConfigurationRepository
@@ -73,4 +75,17 @@ public function setToken($token, $refreshToken = null)
     {
         $this->configurationRepository->updateFirebaseIdAndRefreshTokens($token, $refreshToken);
     }
+
+    /**
+     * @param ServiceContainer $serviceContainer
+     *
+     * @return static
+     */
+    static function getInstance(ServiceContainer $serviceContainer)
+    {
+        return new static(
+            $serviceContainer->get(ConfigurationRepository::class),
+            $serviceContainer->get(\PrestaShop\Module\PsAccounts\Account\Session\ShopSession::class)
+        );
+    }
 }
diff --git a/src/Account/Session/ShopSession.php b/src/Account/Session/ShopSession.php
index fb94ad396..1ed441dfd 100644
--- a/src/Account/Session/ShopSession.php
+++ b/src/Account/Session/ShopSession.php
@@ -30,12 +30,14 @@
 use PrestaShop\Module\PsAccounts\Log\Logger;
 use PrestaShop\Module\PsAccounts\Provider\OAuth2\ShopProvider;
 use PrestaShop\Module\PsAccounts\Repository\ConfigurationRepository;
+use PrestaShop\Module\PsAccounts\ServiceContainer\IServiceContainerService;
+use PrestaShop\Module\PsAccounts\ServiceContainer\ServiceContainer;
 use PrestaShop\Module\PsAccounts\Vendor\League\OAuth2\Client\Grant\ClientCredentials;
 use PrestaShop\Module\PsAccounts\Vendor\League\OAuth2\Client\Provider\Exception\IdentityProviderException;
 use PrestaShop\Module\PsAccounts\Vendor\League\OAuth2\Client\Token\AccessToken;
 use PrestaShop\Module\PsAccounts\Vendor\League\OAuth2\Client\Token\AccessTokenInterface;
 
-class ShopSession extends Session implements SessionInterface
+class ShopSession extends Session implements SessionInterface, IServiceContainerService
 {
     /**
      * @var CommandBus
@@ -203,4 +205,19 @@ private function getShopUuid()
     {
         return $this->linkShop->getShopUuid();
     }
+
+    /**
+     * @param ServiceContainer $serviceContainer
+     *
+     * @return static
+     */
+    static function getInstance(ServiceContainer $serviceContainer)
+    {
+        return new static(
+            $serviceContainer->get(ConfigurationRepository::class),
+            $serviceContainer->get(ShopProvider::class),
+            $serviceContainer->get(LinkShop::class),
+            $serviceContainer->get(CommandBus::class)
+        );
+    }
 }
diff --git a/src/Adapter/Configuration.php b/src/Adapter/Configuration.php
index 6bd455add..610a7f198 100644
--- a/src/Adapter/Configuration.php
+++ b/src/Adapter/Configuration.php
@@ -20,7 +20,10 @@
 
 namespace PrestaShop\Module\PsAccounts\Adapter;
 
-class Configuration
+use PrestaShop\Module\PsAccounts\ServiceContainer\IServiceContainerService;
+use PrestaShop\Module\PsAccounts\ServiceContainer\ServiceContainer;
+
+class Configuration implements IServiceContainerService
 {
     /**
      * @var int
@@ -229,4 +232,16 @@ public function isMultishopActive()
         return \Db::getInstance()->getValue('SELECT value FROM `' . _DB_PREFIX_ . 'configuration` WHERE `name` = "PS_MULTISHOP_FEATURE_ACTIVE"')
             && (\Db::getInstance()->getValue('SELECT COUNT(*) FROM ' . _DB_PREFIX_ . 'shop') > 1);
     }
+
+    /**
+     * @param ServiceContainer $serviceContainer
+     *
+     * @return static
+     */
+    static function getInstance(ServiceContainer $serviceContainer)
+    {
+        return new static(
+            $serviceContainer->get('ps_accounts.context')
+        );
+    }
 }
diff --git a/src/Adapter/Link.php b/src/Adapter/Link.php
index 89f516f10..03bde44b2 100644
--- a/src/Adapter/Link.php
+++ b/src/Adapter/Link.php
@@ -21,11 +21,13 @@
 namespace PrestaShop\Module\PsAccounts\Adapter;
 
 use PrestaShop\Module\PsAccounts\Context\ShopContext;
+use PrestaShop\Module\PsAccounts\ServiceContainer\IServiceContainerService;
+use PrestaShop\Module\PsAccounts\ServiceContainer\ServiceContainer;
 
 /**
  * Link adapter
  */
-class Link
+class Link implements IServiceContainerService
 {
     /**
      * @var ShopContext
@@ -119,4 +121,16 @@ public function getAdminLinkWithCustomDomain($sslDomain, $domain, $controller, $
 
         return $boBaseUrl;
     }
+
+    /**
+     * @param ServiceContainer $serviceContainer
+     *
+     * @return static
+     */
+    static function getInstance(ServiceContainer $serviceContainer)
+    {
+        return new static(
+            $serviceContainer->get(ShopContext::class)
+        );
+    }
 }
diff --git a/src/Api/Client/AccountsClient.php b/src/Api/Client/AccountsClient.php
index 3dd35116b..b8a579797 100644
--- a/src/Api/Client/AccountsClient.php
+++ b/src/Api/Client/AccountsClient.php
@@ -24,9 +24,11 @@
 use PrestaShop\Module\PsAccounts\Account\Dto\UpgradeModule;
 use PrestaShop\Module\PsAccounts\Http\Client\Guzzle\GuzzleClient;
 use PrestaShop\Module\PsAccounts\Http\Client\Guzzle\GuzzleClientFactory;
+use PrestaShop\Module\PsAccounts\ServiceContainer\IServiceContainerService;
+use PrestaShop\Module\PsAccounts\ServiceContainer\ServiceContainer;
 use PrestaShop\Module\PsAccounts\Vendor\Ramsey\Uuid\Uuid;
 
-class AccountsClient
+class AccountsClient implements IServiceContainerService
 {
     /**
      * @var string
@@ -241,4 +243,18 @@ public function healthCheck()
 
         return $this->getClient()->get();
     }
+
+    /**
+     * @param ServiceContainer $serviceContainer
+     *
+     * @return static
+     */
+    static function getInstance(ServiceContainer $serviceContainer)
+    {
+        return new static(
+            $serviceContainer->getParameter('ps_accounts.accounts_api_url'),
+            null,
+            10
+        );
+    }
 }
diff --git a/src/Api/Client/ServicesBillingClient.php b/src/Api/Client/ServicesBillingClient.php
index 28da29e3c..365bca263 100644
--- a/src/Api/Client/ServicesBillingClient.php
+++ b/src/Api/Client/ServicesBillingClient.php
@@ -24,11 +24,13 @@
 use PrestaShop\Module\PsAccounts\Http\Client\Guzzle\GuzzleClientFactory;
 use PrestaShop\Module\PsAccounts\Provider\ShopProvider;
 use PrestaShop\Module\PsAccounts\Service\PsAccountsService;
+use PrestaShop\Module\PsAccounts\ServiceContainer\IServiceContainerService;
+use PrestaShop\Module\PsAccounts\ServiceContainer\ServiceContainer;
 
 /**
  * Handle call api Services
  */
-class ServicesBillingClient
+class ServicesBillingClient implements IServiceContainerService
 {
     /**
      * @var GuzzleClient
@@ -130,4 +132,18 @@ public function createBillingSubscriptions($shopUuidV4, $module, $bodyHttp)
             'body' => $bodyHttp,
         ]);
     }
+
+    /**
+     * @param ServiceContainer $serviceContainer
+     *
+     * @return static
+     */
+    static function getInstance(ServiceContainer $serviceContainer)
+    {
+        return new static(
+            $serviceContainer->getParameter('ps_accounts.billing_api_url'),
+            $serviceContainer->get(PsAccountsService::class),
+            $serviceContainer->get(ShopProvider::class)
+        );
+    }
 }
diff --git a/src/Context/ShopContext.php b/src/Context/ShopContext.php
index 6b1e8c382..3a3e36d70 100644
--- a/src/Context/ShopContext.php
+++ b/src/Context/ShopContext.php
@@ -22,11 +22,13 @@
 
 use Context;
 use PrestaShop\Module\PsAccounts\Repository\ConfigurationRepository;
+use PrestaShop\Module\PsAccounts\ServiceContainer\IServiceContainerService;
+use PrestaShop\Module\PsAccounts\ServiceContainer\ServiceContainer;
 
 /**
  * Get the shop context
  */
-class ShopContext
+class ShopContext implements IServiceContainerService
 {
     /**
      * @var ConfigurationRepository
@@ -187,4 +189,17 @@ public function execInShopContext($shopId, $closure)
         }
         throw $e;
     }
+
+    /**
+     * @param ServiceContainer $serviceContainer
+     *
+     * @return static
+     */
+    static function getInstance(ServiceContainer $serviceContainer)
+    {
+        return new static(
+            $serviceContainer->get(ConfigurationRepository::class),
+            $serviceContainer->get('ps_accounts.context')
+        );
+    }
 }
diff --git a/src/Cqrs/CommandBus.php b/src/Cqrs/CommandBus.php
index ef392d3e8..1752ff6be 100755
--- a/src/Cqrs/CommandBus.php
+++ b/src/Cqrs/CommandBus.php
@@ -20,7 +20,10 @@
 
 namespace PrestaShop\Module\PsAccounts\Cqrs;
 
-class CommandBus extends Bus
+use PrestaShop\Module\PsAccounts\ServiceContainer\IServiceContainerService;
+use PrestaShop\Module\PsAccounts\ServiceContainer\ServiceContainer;
+
+class CommandBus extends Bus implements IServiceContainerService
 {
     /**
      * @param string $className
@@ -34,4 +37,16 @@ public function resolveHandlerClass($className)
             '${2}Handler\\\\${4}Handler',
             $className, 1);
     }
+
+    /**
+     * @param ServiceContainer $serviceContainer
+     *
+     * @return static
+     */
+    static function getInstance(ServiceContainer $serviceContainer)
+    {
+        return new static(
+            $serviceContainer->get('ps_accounts.module')
+        );
+    }
 }
diff --git a/src/Factory/CircuitBreakerFactory.php b/src/Factory/CircuitBreakerFactory.php
index 42924ffba..aeb15a5d3 100644
--- a/src/Factory/CircuitBreakerFactory.php
+++ b/src/Factory/CircuitBreakerFactory.php
@@ -24,8 +24,10 @@
 use PrestaShop\Module\PsAccounts\Api\Client\AccountsClient;
 use PrestaShop\Module\PsAccounts\Http\Client\CircuitBreaker\CircuitBreaker;
 use PrestaShop\Module\PsAccounts\Http\Client\CircuitBreaker\PersistentCircuitBreaker;
+use PrestaShop\Module\PsAccounts\ServiceContainer\IServiceContainerService;
+use PrestaShop\Module\PsAccounts\ServiceContainer\ServiceContainer;
 
-class CircuitBreakerFactory
+class CircuitBreakerFactory implements IServiceContainerService
 {
     /**
      * @var array
@@ -132,4 +134,16 @@ protected function className($className)
     {
         return strtoupper(preg_replace(['/^.*\\\\/', '/([^A-Z])([A-Z])/'], ['', '$1_$2'], $className));
     }
+
+    /**
+     * @param ServiceContainer $serviceContainer
+     *
+     * @return static
+     */
+    static function getInstance(ServiceContainer $serviceContainer)
+    {
+        return new static(
+            $serviceContainer->get(Configuration::class)
+        );
+    }
 }
diff --git a/src/Installer/Installer.php b/src/Installer/Installer.php
index ff754926b..6f78c2339 100644
--- a/src/Installer/Installer.php
+++ b/src/Installer/Installer.php
@@ -24,6 +24,8 @@
 use PrestaShop\Module\PsAccounts\Adapter\Link;
 use PrestaShop\Module\PsAccounts\Context\ShopContext;
 use PrestaShop\Module\PsAccounts\Service\SentryService;
+use PrestaShop\Module\PsAccounts\ServiceContainer\IServiceContainerService;
+use PrestaShop\Module\PsAccounts\ServiceContainer\ServiceContainer;
 use PrestaShop\PrestaShop\Adapter\SymfonyContainer;
 use PrestaShop\PrestaShop\Core\Addon\Module\ModuleManagerBuilder;
 use Tools;
@@ -33,7 +35,7 @@
  *
  * Install ps_accounts module
  */
-class Installer
+class Installer implements IServiceContainerService
 {
     /**
      * @var ShopContext
@@ -172,4 +174,17 @@ public function isEnabled($module)
 
         return $moduleManager->isEnabled($module);
     }
+
+    /**
+     * @param ServiceContainer $serviceContainer
+     *
+     * @return static
+     */
+    static function getInstance(ServiceContainer $serviceContainer)
+    {
+        return new static(
+            $serviceContainer->get(ShopContext::class),
+            $serviceContainer->get(Link::class)
+        );
+    }
 }
diff --git a/src/Middleware/Oauth2Middleware.php b/src/Middleware/Oauth2Middleware.php
index d6294e052..ea9dbfc79 100644
--- a/src/Middleware/Oauth2Middleware.php
+++ b/src/Middleware/Oauth2Middleware.php
@@ -25,10 +25,12 @@
 use PrestaShop\Module\PsAccounts\Provider\OAuth2\PrestaShopSession;
 use PrestaShop\Module\PsAccounts\Provider\OAuth2\ShopProvider;
 use PrestaShop\Module\PsAccounts\Service\PsAccountsService;
+use PrestaShop\Module\PsAccounts\ServiceContainer\IServiceContainerService;
+use PrestaShop\Module\PsAccounts\ServiceContainer\ServiceContainer;
 use PrestaShop\Module\PsAccounts\Vendor\League\OAuth2\Client\Provider\Exception\IdentityProviderException;
 use Ps_accounts;
 
-class Oauth2Middleware
+class Oauth2Middleware implements IServiceContainerService
 {
     use PrestaShopLogoutTrait;
 
@@ -121,4 +123,16 @@ protected function onLogoutCallback()
             \Tools::redirectLink($this->getProvider()->getRedirectUri());
         }
     }
+
+    /**
+     * @param ServiceContainer $serviceContainer
+     *
+     * @return static
+     */
+    static function getInstance(ServiceContainer $serviceContainer)
+    {
+        return new static(
+            $serviceContainer->get('ps_accounts.module')
+        );
+    }
 }
diff --git a/src/Presenter/PsAccountsPresenter.php b/src/Presenter/PsAccountsPresenter.php
index d2b54ccbe..b5ef2b5cb 100644
--- a/src/Presenter/PsAccountsPresenter.php
+++ b/src/Presenter/PsAccountsPresenter.php
@@ -26,12 +26,14 @@
 use PrestaShop\Module\PsAccounts\Repository\ConfigurationRepository;
 use PrestaShop\Module\PsAccounts\Service\PsAccountsService;
 use PrestaShop\Module\PsAccounts\Service\SentryService;
+use PrestaShop\Module\PsAccounts\ServiceContainer\IServiceContainerService;
+use PrestaShop\Module\PsAccounts\ServiceContainer\ServiceContainer;
 use PrestaShopException;
 
 /**
  * Construct the psaccounts module.
  */
-class PsAccountsPresenter implements PresenterInterface
+class PsAccountsPresenter implements PresenterInterface, IServiceContainerService
 {
     /**
      * @var ShopProvider
@@ -168,4 +170,16 @@ public function present($psxName = 'ps_accounts')
 
         return [];
     }
+
+    /**
+     * @param ServiceContainer $serviceContainer
+     *
+     * @return static
+     */
+    static function getInstance(ServiceContainer $serviceContainer)
+    {
+        return new static(
+            $serviceContainer->get('ps_accounts.module')
+        );
+    }
 }
diff --git a/src/Provider/OAuth2/Oauth2Client.php b/src/Provider/OAuth2/Oauth2Client.php
index 8b0f07623..c33b89076 100644
--- a/src/Provider/OAuth2/Oauth2Client.php
+++ b/src/Provider/OAuth2/Oauth2Client.php
@@ -21,8 +21,10 @@
 namespace PrestaShop\Module\PsAccounts\Provider\OAuth2;
 
 use PrestaShop\Module\PsAccounts\Repository\ConfigurationRepository;
+use PrestaShop\Module\PsAccounts\ServiceContainer\IServiceContainerService;
+use PrestaShop\Module\PsAccounts\ServiceContainer\ServiceContainer;
 
-class Oauth2Client
+class Oauth2Client implements IServiceContainerService
 {
     /**
      * @var ConfigurationRepository
@@ -79,4 +81,16 @@ public function getClientSecret()
     {
         return $this->cfRepos->getOauth2ClientSecret();
     }
+
+    /**
+     * @param ServiceContainer $serviceContainer
+     *
+     * @return static
+     */
+    static function getInstance(ServiceContainer $serviceContainer)
+    {
+        return new static(
+            $serviceContainer->get(ConfigurationRepository::class)
+        );
+    }
 }
diff --git a/src/Provider/OAuth2/PrestaShopSession.php b/src/Provider/OAuth2/PrestaShopSession.php
index 3b5c88476..8ace75537 100644
--- a/src/Provider/OAuth2/PrestaShopSession.php
+++ b/src/Provider/OAuth2/PrestaShopSession.php
@@ -20,12 +20,14 @@
 
 namespace PrestaShop\Module\PsAccounts\Provider\OAuth2;
 
+use PrestaShop\Module\PsAccounts\ServiceContainer\IServiceContainerService;
+use PrestaShop\Module\PsAccounts\ServiceContainer\ServiceContainer;
 use PrestaShop\Module\PsAccounts\Vendor\League\OAuth2\Client\Provider\Exception\IdentityProviderException;
 use PrestaShop\Module\PsAccounts\Vendor\League\OAuth2\Client\Token\AccessToken;
 use PrestaShop\OAuth2\Client\Provider\PrestaShopUser;
 use Symfony\Component\HttpFoundation\Session\SessionInterface;
 
-class PrestaShopSession
+class PrestaShopSession implements IServiceContainerService
 {
     const TOKEN_NAME = 'accessToken';
 
@@ -133,4 +135,14 @@ private function getTokenProvider()
 
         return $this->session->get(self::TOKEN_NAME);
     }
+
+    /**
+     * @param ServiceContainer $serviceContainer
+     *
+     * @return static
+     */
+    static function getInstance(ServiceContainer $serviceContainer)
+    {
+        return \PrestaShop\Module\PsAccounts\Factory\PrestaShopSessionFactory::create();
+    }
 }
diff --git a/src/Provider/OAuth2/ShopProvider.php b/src/Provider/OAuth2/ShopProvider.php
index a05e3c194..ad14f000b 100644
--- a/src/Provider/OAuth2/ShopProvider.php
+++ b/src/Provider/OAuth2/ShopProvider.php
@@ -21,10 +21,12 @@
 namespace PrestaShop\Module\PsAccounts\Provider\OAuth2;
 
 use PrestaShop\Module\PsAccounts\Adapter\Link;
+use PrestaShop\Module\PsAccounts\ServiceContainer\IServiceContainerService;
+use PrestaShop\Module\PsAccounts\ServiceContainer\ServiceContainer;
 use PrestaShop\Module\PsAccounts\Vendor\League\OAuth2\Client\Provider\AbstractProvider;
 use PrestaShop\OAuth2\Client\Provider\PrestaShop;
 
-class ShopProvider extends PrestaShop
+class ShopProvider extends PrestaShop implements IServiceContainerService
 {
     const QUERY_LOGOUT_CALLBACK_PARAM = 'oauth2Callback';
 
@@ -168,4 +170,14 @@ private function syncOauth2ClientProps()
         $this->clientId = $this->getOauth2Client()->getClientId();
         $this->clientSecret = $this->getOauth2Client()->getClientSecret();
     }
+
+    /**
+     * @param ServiceContainer $serviceContainer
+     *
+     * @return PrestaShop
+     */
+    static function getInstance(ServiceContainer $serviceContainer)
+    {
+        return \PrestaShop\Module\PsAccounts\Provider\OAuth2\ShopProvider::create();
+    }
 }
diff --git a/src/Provider/RsaKeysProvider.php b/src/Provider/RsaKeysProvider.php
index d2ef123f8..043c1ef9c 100644
--- a/src/Provider/RsaKeysProvider.php
+++ b/src/Provider/RsaKeysProvider.php
@@ -22,12 +22,14 @@
 
 use PrestaShop\Module\PsAccounts\Exception\SshKeysNotFoundException;
 use PrestaShop\Module\PsAccounts\Repository\ConfigurationRepository;
+use PrestaShop\Module\PsAccounts\ServiceContainer\IServiceContainerService;
+use PrestaShop\Module\PsAccounts\ServiceContainer\ServiceContainer;
 use PrestaShop\Module\PsAccounts\Vendor\phpseclib\Crypt\RSA;
 
 /**
  * Manage RSA
  */
-class RsaKeysProvider
+class RsaKeysProvider implements IServiceContainerService
 {
     /**
      * @var RSA
@@ -191,4 +193,16 @@ public function cleanupKeys()
         $this->configuration->updateAccountsRsaPrivateKey('');
         $this->configuration->updateAccountsRsaPublicKey('');
     }
+
+    /**
+     * @param ServiceContainer $serviceContainer
+     *
+     * @return static
+     */
+    static function getInstance(ServiceContainer $serviceContainer)
+    {
+        return new static(
+            $serviceContainer->get(ConfigurationRepository::class)
+        );
+    }
 }
diff --git a/src/Provider/ShopProvider.php b/src/Provider/ShopProvider.php
index 5baf221f6..3b369b1d5 100644
--- a/src/Provider/ShopProvider.php
+++ b/src/Provider/ShopProvider.php
@@ -25,8 +25,10 @@
 use PrestaShop\Module\PsAccounts\Account\Session\Firebase\OwnerSession;
 use PrestaShop\Module\PsAccounts\Adapter\Link;
 use PrestaShop\Module\PsAccounts\Context\ShopContext;
+use PrestaShop\Module\PsAccounts\ServiceContainer\IServiceContainerService;
+use PrestaShop\Module\PsAccounts\ServiceContainer\ServiceContainer;
 
-class ShopProvider
+class ShopProvider implements IServiceContainerService
 {
     /**
      * @var ShopContext
@@ -264,4 +266,17 @@ private function getShopUrl($shopData)
             ($shopData['domain_ssl'] ?: $shopData['domain']) .
             $shopData['uri'];
     }
+
+    /**
+     * @param ServiceContainer $serviceContainer
+     *
+     * @return static
+     */
+    static function getInstance(ServiceContainer $serviceContainer)
+    {
+        return new static(
+            $serviceContainer->get(ShopContext::class),
+            $serviceContainer->get(Link::class)
+        );
+    }
 }
diff --git a/src/Repository/ConfigurationRepository.php b/src/Repository/ConfigurationRepository.php
index d808e5169..c6e446a82 100644
--- a/src/Repository/ConfigurationRepository.php
+++ b/src/Repository/ConfigurationRepository.php
@@ -23,8 +23,10 @@
 use PrestaShop\Module\PsAccounts\Adapter\Configuration;
 use PrestaShop\Module\PsAccounts\Adapter\ConfigurationKeys;
 use PrestaShop\Module\PsAccounts\Log\Logger;
+use PrestaShop\Module\PsAccounts\ServiceContainer\IServiceContainerService;
+use PrestaShop\Module\PsAccounts\ServiceContainer\ServiceContainer;
 
-class ConfigurationRepository
+class ConfigurationRepository implements IServiceContainerService
 {
     /**
      * @var Configuration
@@ -462,4 +464,16 @@ protected function migrateToSingleShop()
             ' AND id_shop = ' . (int) $shop->id . ';'
         );
     }
+
+    /**
+     * @param ServiceContainer $serviceContainer
+     *
+     * @return static
+     */
+    static function getInstance(ServiceContainer $serviceContainer)
+    {
+        return new static(
+            $serviceContainer->get(Configuration::class)
+        );
+    }
 }
diff --git a/src/Repository/ShopTokenRepository.php b/src/Repository/ShopTokenRepository.php
index 653f6a195..a13dc7392 100644
--- a/src/Repository/ShopTokenRepository.php
+++ b/src/Repository/ShopTokenRepository.php
@@ -21,16 +21,30 @@
 namespace PrestaShop\Module\PsAccounts\Repository;
 
 use PrestaShop\Module\PsAccounts\Account\Session\Firebase\ShopSession;
+use PrestaShop\Module\PsAccounts\ServiceContainer\IServiceContainerService;
+use PrestaShop\Module\PsAccounts\ServiceContainer\ServiceContainer;
 
 /**
  * Class ShopTokenRepository
  *
  * @deprecated
  */
-class ShopTokenRepository extends TokenRepository
+class ShopTokenRepository extends TokenRepository implements IServiceContainerService
 {
     /**
      * @var ShopSession
      */
     protected $session;
+
+    /**
+     * @param ServiceContainer $serviceContainer
+     *
+     * @return static
+     */
+    static function getInstance(ServiceContainer $serviceContainer)
+    {
+        return new static(
+            $serviceContainer->get(ShopSession::class)
+        );
+    }
 }
diff --git a/src/Repository/UserTokenRepository.php b/src/Repository/UserTokenRepository.php
index 5905d7c55..dbc250367 100644
--- a/src/Repository/UserTokenRepository.php
+++ b/src/Repository/UserTokenRepository.php
@@ -21,13 +21,15 @@
 namespace PrestaShop\Module\PsAccounts\Repository;
 
 use PrestaShop\Module\PsAccounts\Account\Session\Firebase\OwnerSession;
+use PrestaShop\Module\PsAccounts\ServiceContainer\IServiceContainerService;
+use PrestaShop\Module\PsAccounts\ServiceContainer\ServiceContainer;
 
 /**
  * Class UserTokenRepository
  *
  * @deprecated
  */
-class UserTokenRepository extends TokenRepository
+class UserTokenRepository extends TokenRepository implements IServiceContainerService
 {
     /**
      * @var OwnerSession
@@ -51,4 +53,16 @@ public function getTokenEmailVerified()
     {
         return $this->session->isEmailVerified();
     }
+
+    /**
+     * @param ServiceContainer $serviceContainer
+     *
+     * @return static
+     */
+    static function getInstance(ServiceContainer $serviceContainer)
+    {
+        return new static(
+            $serviceContainer->get(OwnerSession::class)
+        );
+    }
 }
diff --git a/src/Service/AnalyticsService.php b/src/Service/AnalyticsService.php
index 9006852a9..dd6365b6e 100644
--- a/src/Service/AnalyticsService.php
+++ b/src/Service/AnalyticsService.php
@@ -20,11 +20,13 @@
 
 namespace PrestaShop\Module\PsAccounts\Service;
 
+use PrestaShop\Module\PsAccounts\ServiceContainer\IServiceContainerService;
+use PrestaShop\Module\PsAccounts\ServiceContainer\ServiceContainer;
 use PrestaShop\Module\PsAccounts\Vendor\Monolog\Logger;
 use PrestaShop\Module\PsAccounts\Vendor\Ramsey\Uuid\Uuid;
 use Segment;
 
-class AnalyticsService
+class AnalyticsService implements IServiceContainerService
 {
     const COOKIE_ANONYMOUS_ID = 'ajs_anonymous_id';
 
@@ -315,4 +317,17 @@ private function initAnonymousId()
             }
         }
     }
+
+    /**
+     * @param ServiceContainer $serviceContainer
+     *
+     * @return static
+     */
+    static function getInstance(ServiceContainer $serviceContainer)
+    {
+        return new static(
+            $serviceContainer->getParameter('ps_accounts.segment_write_key'),
+            $serviceContainer->get('ps_accounts.logger')
+        );
+    }
 }
diff --git a/src/Service/PsAccountsService.php b/src/Service/PsAccountsService.php
index 99ce5cc85..10db897e0 100644
--- a/src/Service/PsAccountsService.php
+++ b/src/Service/PsAccountsService.php
@@ -32,11 +32,13 @@
 use PrestaShop\Module\PsAccounts\Provider\ShopProvider;
 use PrestaShop\Module\PsAccounts\Repository\ConfigurationRepository;
 use PrestaShop\Module\PsAccounts\Repository\EmployeeAccountRepository;
+use PrestaShop\Module\PsAccounts\ServiceContainer\IServiceContainerService;
+use PrestaShop\Module\PsAccounts\ServiceContainer\ServiceContainer;
 
 /**
  * Class PsAccountsService
  */
-class PsAccountsService
+class PsAccountsService implements IServiceContainerService
 {
     /**
      * @var Link
@@ -338,4 +340,16 @@ public function getEmployeeAccount()
             return null;
         }
     }
+
+    /**
+     * @param ServiceContainer $serviceContainer
+     *
+     * @return static
+     */
+    static function getInstance(ServiceContainer $serviceContainer)
+    {
+        return new static(
+            $serviceContainer->get('ps_accounts.module')
+        );
+    }
 }
diff --git a/src/Service/PsBillingService.php b/src/Service/PsBillingService.php
index 1d238088d..e93cf1739 100644
--- a/src/Service/PsBillingService.php
+++ b/src/Service/PsBillingService.php
@@ -25,13 +25,15 @@
 use PrestaShop\Module\PsAccounts\Exception\BillingException;
 use PrestaShop\Module\PsAccounts\Repository\ConfigurationRepository;
 use PrestaShop\Module\PsAccounts\Repository\ShopTokenRepository;
+use PrestaShop\Module\PsAccounts\ServiceContainer\IServiceContainerService;
+use PrestaShop\Module\PsAccounts\ServiceContainer\ServiceContainer;
 
 /**
  * @deprecated
  *
  * Construct the psbilling service
  */
-class PsBillingService
+class PsBillingService implements IServiceContainerService
 {
     /**
      * @var ConfigurationRepository
@@ -147,4 +149,18 @@ public function subscribeToFreePlan($module, $planName, $shopId = false, $custom
 
         throw new \Exception('Shop account unknown.', 10);
     }
+
+    /**
+     * @param ServiceContainer $serviceContainer
+     *
+     * @return static
+     */
+    static function getInstance(ServiceContainer $serviceContainer)
+    {
+        return new static(
+            $serviceContainer->get(ServicesBillingClient::class),
+            $serviceContainer->get(ShopTokenRepository::class),
+            $serviceContainer->get(ConfigurationRepository::class)
+        );
+    }
 }
diff --git a/src/Service/SentryService.php b/src/Service/SentryService.php
index ee979d640..d06f4ccfd 100644
--- a/src/Service/SentryService.php
+++ b/src/Service/SentryService.php
@@ -24,13 +24,15 @@
 use Module;
 use PrestaShop\Module\PsAccounts\Account\LinkShop;
 use PrestaShop\Module\PsAccounts\Service\Sentry\ModuleFilteredRavenClient;
+use PrestaShop\Module\PsAccounts\ServiceContainer\IServiceContainerService;
+use PrestaShop\Module\PsAccounts\ServiceContainer\ServiceContainer;
 use Ps_accounts;
 use Raven_Client;
 
 /**
  * FIXME: outdated sentry client due to PHP 5.6 support
  */
-class SentryService
+class SentryService implements IServiceContainerService
 {
     /**
      * @var Raven_Client
@@ -179,4 +181,19 @@ private function isContextInFrontOffice(Context $context = null)
 
         return in_array($controller->controller_type, ['front', 'modulefront']);
     }
+
+    /**
+     * @param ServiceContainer $serviceContainer
+     *
+     * @return static
+     */
+    static function getInstance(ServiceContainer $serviceContainer)
+    {
+        return new static(
+            $serviceContainer->getParameter('ps_accounts.sentry_credentials'),
+            $serviceContainer->getParameter('ps_accounts.environment'),
+            $serviceContainer->get(LinkShop::class),
+            $serviceContainer->get('ps_accounts.context')
+        );
+    }
 }
diff --git a/src/ServiceContainer/IServiceContainerService.php b/src/ServiceContainer/IServiceContainerService.php
new file mode 100644
index 000000000..674eca8bc
--- /dev/null
+++ b/src/ServiceContainer/IServiceContainerService.php
@@ -0,0 +1,13 @@
+<?php
+
+namespace PrestaShop\Module\PsAccounts\ServiceContainer;
+
+interface IServiceContainerService
+{
+    /**
+     * @param ServiceContainer $serviceContainer
+     *
+     * @return mixed
+     */
+    static function getInstance(ServiceContainer $serviceContainer);
+}
diff --git a/src/ServiceContainer/ParameterNotFoundException.php b/src/ServiceContainer/ParameterNotFoundException.php
new file mode 100644
index 000000000..312241e09
--- /dev/null
+++ b/src/ServiceContainer/ParameterNotFoundException.php
@@ -0,0 +1,8 @@
+<?php
+
+namespace PrestaShop\Module\PsAccounts\ServiceContainer;
+
+class ParameterNotFoundException extends \Exception
+{
+
+}
diff --git a/src/ServiceContainer/ServiceContainer.php b/src/ServiceContainer/ServiceContainer.php
new file mode 100644
index 000000000..95ed52715
--- /dev/null
+++ b/src/ServiceContainer/ServiceContainer.php
@@ -0,0 +1,152 @@
+<?php
+
+namespace PrestaShop\Module\PsAccounts\ServiceContainer;
+
+class ServiceContainer
+{
+    /**
+     * @var array
+     */
+    protected $config = [];
+
+    /**
+     * @var array
+     */
+    protected $services  = [];
+
+    /**
+     * @var array|\Closure[]
+     */
+    protected $providers = [];
+
+    /**
+     * @var string
+     */
+    protected $configName = 'config';
+
+    /**
+     * @var ServiceContainer
+     */
+    private static $instance;
+
+    public function __construct()
+    {
+        $this->config = require __DIR__ . '/../../config/' . $this->configName . '.php';
+
+        $this->providers = [
+            'ps_accounts.context' => function () {
+                return \Context::getContext();
+            },
+            'ps_accounts.logger' => function () {
+                return \PrestaShop\Module\PsAccounts\Log\Logger::create();
+            },
+            'ps_accounts.module' => function () {
+                return \Module::getInstanceByName('ps_accounts');
+            }
+        ];
+    }
+
+    /**
+     * @return ServiceContainer
+     */
+    public static function getInstance()
+    {
+        if (null === self::$instance) {
+            self::$instance = new ServiceContainer();
+        }
+        return self::$instance;
+    }
+
+    /**
+     * @param string $name
+     *
+     * @return mixed
+     *
+     * @throws ServiceNotFoundException
+     */
+    public function get($name)
+    {
+        if ($this->has($name)) {
+            return $this->services[$name];
+        }
+        if (array_key_exists($name, $this->providers)) {
+            return $this->providers[$name]();
+        }
+        return $this->provideInstanceFromClassname($name);
+    }
+
+    /**
+     * @param string $name
+     *
+     * @return mixed
+     *
+     * @throws ServiceNotFoundException
+     */
+    public function getService($name)
+    {
+        return $this->get($name);
+    }
+
+    /**
+     * @param string $name
+     * @param mixed $value
+     *
+     * @return void
+     */
+    public function set($name, $value)
+    {
+        $this->services[$name] = $value;
+    }
+
+    /**
+     * @param string $name
+     *
+     * @return bool
+     */
+    public function has($name)
+    {
+        return array_key_exists($name, $this->services);
+    }
+
+    /**
+     * @param string $name
+     *
+     * @return string
+     *
+     * @throws ParameterNotFoundException
+     */
+    public function getParameter($name)
+    {
+        if (array_key_exists($name, $this->config)) {
+            return $this->config[$name];
+        }
+        throw new ParameterNotFoundException('Configuration parameter "' . $name . '" not found.');
+    }
+
+    /**
+     * @param string $name
+     *
+     * @return bool
+     */
+    public function hasParameter($name)
+    {
+        return array_key_exists($name, $this->config);
+    }
+
+    /**
+     * @param string $className
+     *
+     * @return mixed
+     *
+     * @throws ServiceNotFoundException
+     */
+    protected function provideInstanceFromClassname($className)
+    {
+        if (class_exists($className) && method_exists($className, 'getInstance')) {
+            $this->set($className, $className::getInstance($this));
+
+            return $this->services[$className];
+        }
+        throw new ServiceNotFoundException('Service Not Found: ' . $className);
+    }
+}
diff --git a/src/ServiceContainer/ServiceNotFoundException.php b/src/ServiceContainer/ServiceNotFoundException.php
new file mode 100644
index 000000000..51682ec69
--- /dev/null
+++ b/src/ServiceContainer/ServiceNotFoundException.php
@@ -0,0 +1,8 @@
+<?php
+
+namespace PrestaShop\Module\PsAccounts\ServiceContainer;
+
+class ServiceNotFoundException extends \Exception
+{
+
+}

From 4107e053017e856463f57e730b15fc4c2f83a73c Mon Sep 17 00:00:00 2001
From: hschoenenberger <herve.schoenenberger@prestashop.com>
Date: Mon, 4 Nov 2024 19:23:34 +0100
Subject: [PATCH 02/46] refactor: remove useless deps

---
 .dir-scoped                                   |    8 -
 composer.json                                 |    1 -
 composer.lock                                 | 2367 +----------------
 src/DependencyInjection/ContainerProvider.php |  119 -
 src/DependencyInjection/ServiceContainer.php  |  108 -
 5 files changed, 121 insertions(+), 2482 deletions(-)
 delete mode 100644 src/DependencyInjection/ContainerProvider.php
 delete mode 100644 src/DependencyInjection/ServiceContainer.php

diff --git a/.dir-scoped b/.dir-scoped
index 7f1fd74db..801d3c5e3 100644
--- a/.dir-scoped
+++ b/.dir-scoped
@@ -1,16 +1,8 @@
-symfony/cache
-symfony/config
-symfony/dependency-injection
-symfony/expression-language
-symfony/filesystem
-symfony/yaml
 psr
 guzzlehttp
 league
 prestashopcorp
 lcobucci
-prestashop/module-lib-service-container
-prestashop/module-lib-cache-directory-provider
 monolog
 ramsey/uuid
 ralouphie/getallheaders
diff --git a/composer.json b/composer.json
index 20eb213b5..db8310fcb 100644
--- a/composer.json
+++ b/composer.json
@@ -64,7 +64,6 @@
         "ext-json": "*",
         "lcobucci/jwt": "^3.3",
         "monolog/monolog": "1.25.3",
-        "prestashop/module-lib-service-container": "^1.2",
         "sentry/sentry": "^1.0",
         "segmentio/analytics-php": "^1.8",
         "ramsey/uuid": "^3.9",
diff --git a/composer.lock b/composer.lock
index 2d6c5c0d0..dd9f4ac96 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "6e055dca05422e341b9113dee727fc68",
+    "content-hash": "dcee7e637472ebda3e0d920dc5415ad5",
     "packages": [
         {
             "name": "guzzlehttp/guzzle",
@@ -698,109 +698,6 @@
             ],
             "time": "2024-02-26T04:55:38+00:00"
         },
-        {
-            "name": "prestashop/module-lib-cache-directory-provider",
-            "version": "v1.0.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/PrestaShopCorp/module-lib-cache-directory-provider.git",
-                "reference": "34a577b66a7e52ae16d6f40efd1db17290bad453"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/PrestaShopCorp/module-lib-cache-directory-provider/zipball/34a577b66a7e52ae16d6f40efd1db17290bad453",
-                "reference": "34a577b66a7e52ae16d6f40efd1db17290bad453",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.6.0"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "~5.7"
-            },
-            "type": "project",
-            "autoload": {
-                "psr-4": {
-                    "PrestaShop\\ModuleLibCacheDirectoryProvider\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "AFL-3.0"
-            ],
-            "authors": [
-                {
-                    "name": "PrestaShop SA",
-                    "email": "contact@prestashop.com"
-                }
-            ],
-            "description": "Cache directory provider to use on prestashop modules",
-            "keywords": [
-                "composer",
-                "modules",
-                "package",
-                "prestashop"
-            ],
-            "support": {
-                "issues": "https://github.com/PrestaShopCorp/module-lib-cache-directory-provider/issues",
-                "source": "https://github.com/PrestaShopCorp/module-lib-cache-directory-provider/tree/master"
-            },
-            "time": "2020-09-08T14:13:23+00:00"
-        },
-        {
-            "name": "prestashop/module-lib-service-container",
-            "version": "1.4.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/PrestaShopCorp/module-lib-service-container.git",
-                "reference": "96f4f551b96cffb1f78462cd4722f0d2b057abda"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/PrestaShopCorp/module-lib-service-container/zipball/96f4f551b96cffb1f78462cd4722f0d2b057abda",
-                "reference": "96f4f551b96cffb1f78462cd4722f0d2b057abda",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.6.0",
-                "prestashop/module-lib-cache-directory-provider": "^1.0",
-                "symfony/config": "^3.4",
-                "symfony/dependency-injection": "^3.4",
-                "symfony/expression-language": "^3.4",
-                "symfony/yaml": "^3.4"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "~5.7"
-            },
-            "type": "library",
-            "autoload": {
-                "psr-4": {
-                    "PrestaShop\\ModuleLibServiceContainer\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "AFL-3.0"
-            ],
-            "authors": [
-                {
-                    "name": "PrestaShop SA",
-                    "email": "contact@prestashop.com"
-                }
-            ],
-            "description": "Service container to use on prestashop modules",
-            "keywords": [
-                "composer",
-                "modules",
-                "package",
-                "prestashop"
-            ],
-            "support": {
-                "issues": "https://github.com/PrestaShopCorp/module-lib-service-container/issues",
-                "source": "https://github.com/PrestaShopCorp/module-lib-service-container/tree/1.4.0"
-            },
-            "time": "2021-06-01T15:21:20+00:00"
-        },
         {
             "name": "prestashopcorp/oauth2-prestashop",
             "version": "v2.0.0",
@@ -857,108 +754,6 @@
             },
             "time": "2024-05-22T12:33:38+00:00"
         },
-        {
-            "name": "psr/cache",
-            "version": "1.0.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/php-fig/cache.git",
-                "reference": "d11b50ad223250cf17b86e38383413f5a6764bf8"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/php-fig/cache/zipball/d11b50ad223250cf17b86e38383413f5a6764bf8",
-                "reference": "d11b50ad223250cf17b86e38383413f5a6764bf8",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.0"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.0.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Psr\\Cache\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "PHP-FIG",
-                    "homepage": "http://www.php-fig.org/"
-                }
-            ],
-            "description": "Common interface for caching libraries",
-            "keywords": [
-                "cache",
-                "psr",
-                "psr-6"
-            ],
-            "support": {
-                "source": "https://github.com/php-fig/cache/tree/master"
-            },
-            "time": "2016-08-06T20:24:11+00:00"
-        },
-        {
-            "name": "psr/container",
-            "version": "1.0.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/php-fig/container.git",
-                "reference": "b7ce3b176482dbbc1245ebf52b181af44c2cf55f"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/php-fig/container/zipball/b7ce3b176482dbbc1245ebf52b181af44c2cf55f",
-                "reference": "b7ce3b176482dbbc1245ebf52b181af44c2cf55f",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.0"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.0.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Psr\\Container\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "PHP-FIG",
-                    "homepage": "http://www.php-fig.org/"
-                }
-            ],
-            "description": "Common Container Interface (PHP FIG PSR-11)",
-            "homepage": "https://github.com/php-fig/container",
-            "keywords": [
-                "PSR-11",
-                "container",
-                "container-interface",
-                "container-interop",
-                "psr"
-            ],
-            "support": {
-                "issues": "https://github.com/php-fig/container/issues",
-                "source": "https://github.com/php-fig/container/tree/master"
-            },
-            "time": "2017-02-14T16:28:37+00:00"
-        },
         {
             "name": "psr/http-message",
             "version": "1.0.1",
@@ -1062,57 +857,6 @@
             },
             "time": "2021-05-03T11:20:27+00:00"
         },
-        {
-            "name": "psr/simple-cache",
-            "version": "1.0.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/php-fig/simple-cache.git",
-                "reference": "408d5eafb83c57f6365a3ca330ff23aa4a5fa39b"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/php-fig/simple-cache/zipball/408d5eafb83c57f6365a3ca330ff23aa4a5fa39b",
-                "reference": "408d5eafb83c57f6365a3ca330ff23aa4a5fa39b",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.0"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.0.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Psr\\SimpleCache\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "PHP-FIG",
-                    "homepage": "http://www.php-fig.org/"
-                }
-            ],
-            "description": "Common interfaces for simple caching",
-            "keywords": [
-                "cache",
-                "caching",
-                "psr",
-                "psr-16",
-                "simple-cache"
-            ],
-            "support": {
-                "source": "https://github.com/php-fig/simple-cache/tree/master"
-            },
-            "time": "2017-10-23T01:57:42+00:00"
-        },
         {
             "name": "ralouphie/getallheaders",
             "version": "3.0.3",
@@ -1381,47 +1125,42 @@
             "time": "2020-02-12T18:38:11+00:00"
         },
         {
-            "name": "symfony/cache",
-            "version": "v3.4.47",
+            "name": "symfony/polyfill-ctype",
+            "version": "v1.19.0",
             "source": {
                 "type": "git",
-                "url": "https://github.com/symfony/cache.git",
-                "reference": "a7a14c4832760bd1fbd31be2859ffedc9b6ff813"
+                "url": "https://github.com/symfony/polyfill-ctype.git",
+                "reference": "aed596913b70fae57be53d86faa2e9ef85a2297b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/cache/zipball/a7a14c4832760bd1fbd31be2859ffedc9b6ff813",
-                "reference": "a7a14c4832760bd1fbd31be2859ffedc9b6ff813",
+                "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/aed596913b70fae57be53d86faa2e9ef85a2297b",
+                "reference": "aed596913b70fae57be53d86faa2e9ef85a2297b",
                 "shasum": ""
             },
             "require": {
-                "php": "^5.5.9|>=7.0.8",
-                "psr/cache": "~1.0",
-                "psr/log": "~1.0",
-                "psr/simple-cache": "^1.0",
-                "symfony/polyfill-apcu": "~1.1"
-            },
-            "conflict": {
-                "symfony/var-dumper": "<3.3"
-            },
-            "provide": {
-                "psr/cache-implementation": "1.0",
-                "psr/simple-cache-implementation": "1.0"
+                "php": ">=5.3.3"
             },
-            "require-dev": {
-                "cache/integration-tests": "dev-master",
-                "doctrine/cache": "^1.6",
-                "doctrine/dbal": "^2.4|^3.0",
-                "predis/predis": "^1.0"
+            "suggest": {
+                "ext-ctype": "For best performance"
             },
             "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-main": "1.19-dev"
+                },
+                "thanks": {
+                    "name": "symfony/polyfill",
+                    "url": "https://github.com/symfony/polyfill"
+                }
+            },
             "autoload": {
+                "files": [
+                    "bootstrap.php"
+                ],
                 "psr-4": {
-                    "Symfony\\Component\\Cache\\": ""
-                },
-                "exclude-from-classmap": [
-                    "/Tests/"
-                ]
+                    "Symfony\\Polyfill\\Ctype\\": ""
+                }
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
@@ -1429,22 +1168,24 @@
             ],
             "authors": [
                 {
-                    "name": "Nicolas Grekas",
-                    "email": "p@tchwork.com"
+                    "name": "Gert de Pagter",
+                    "email": "BackEndTea@gmail.com"
                 },
                 {
                     "name": "Symfony Community",
                     "homepage": "https://symfony.com/contributors"
                 }
             ],
-            "description": "Symfony Cache component with PSR-6, PSR-16, and tags",
+            "description": "Symfony polyfill for ctype functions",
             "homepage": "https://symfony.com",
             "keywords": [
-                "caching",
-                "psr6"
+                "compatibility",
+                "ctype",
+                "polyfill",
+                "portable"
             ],
             "support": {
-                "source": "https://github.com/symfony/cache/tree/v3.4.47"
+                "source": "https://github.com/symfony/polyfill-ctype/tree/v1.19.0"
             },
             "funding": [
                 {
@@ -1460,48 +1201,48 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2020-10-24T10:57:07+00:00"
+            "time": "2020-10-23T09:01:57+00:00"
         },
         {
-            "name": "symfony/config",
-            "version": "v3.4.47",
+            "name": "symfony/polyfill-intl-idn",
+            "version": "v1.19.0",
             "source": {
                 "type": "git",
-                "url": "https://github.com/symfony/config.git",
-                "reference": "bc6b3fd3930d4b53a60b42fe2ed6fc466b75f03f"
+                "url": "https://github.com/symfony/polyfill-intl-idn.git",
+                "reference": "4ad5115c0f5d5172a9fe8147675ec6de266d8826"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/config/zipball/bc6b3fd3930d4b53a60b42fe2ed6fc466b75f03f",
-                "reference": "bc6b3fd3930d4b53a60b42fe2ed6fc466b75f03f",
+                "url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/4ad5115c0f5d5172a9fe8147675ec6de266d8826",
+                "reference": "4ad5115c0f5d5172a9fe8147675ec6de266d8826",
                 "shasum": ""
             },
             "require": {
-                "php": "^5.5.9|>=7.0.8",
-                "symfony/filesystem": "~2.8|~3.0|~4.0",
-                "symfony/polyfill-ctype": "~1.8"
-            },
-            "conflict": {
-                "symfony/dependency-injection": "<3.3",
-                "symfony/finder": "<3.3"
-            },
-            "require-dev": {
-                "symfony/dependency-injection": "~3.3|~4.0",
-                "symfony/event-dispatcher": "~3.3|~4.0",
-                "symfony/finder": "~3.3|~4.0",
-                "symfony/yaml": "~3.0|~4.0"
+                "php": ">=5.3.3",
+                "symfony/polyfill-intl-normalizer": "^1.10",
+                "symfony/polyfill-php70": "^1.10",
+                "symfony/polyfill-php72": "^1.10"
             },
             "suggest": {
-                "symfony/yaml": "To use the yaml reference dumper"
+                "ext-intl": "For best performance"
             },
             "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-main": "1.19-dev"
+                },
+                "thanks": {
+                    "name": "symfony/polyfill",
+                    "url": "https://github.com/symfony/polyfill"
+                }
+            },
             "autoload": {
+                "files": [
+                    "bootstrap.php"
+                ],
                 "psr-4": {
-                    "Symfony\\Component\\Config\\": ""
-                },
-                "exclude-from-classmap": [
-                    "/Tests/"
-                ]
+                    "Symfony\\Polyfill\\Intl\\Idn\\": ""
+                }
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
@@ -1509,226 +1250,30 @@
             ],
             "authors": [
                 {
-                    "name": "Fabien Potencier",
-                    "email": "fabien@symfony.com"
+                    "name": "Laurent Bassin",
+                    "email": "laurent@bassin.info"
+                },
+                {
+                    "name": "Trevor Rowbotham",
+                    "email": "trevor.rowbotham@pm.me"
                 },
                 {
                     "name": "Symfony Community",
                     "homepage": "https://symfony.com/contributors"
                 }
             ],
-            "description": "Symfony Config Component",
+            "description": "Symfony polyfill for intl's idn_to_ascii and idn_to_utf8 functions",
             "homepage": "https://symfony.com",
-            "support": {
-                "source": "https://github.com/symfony/config/tree/v3.4.47"
-            },
-            "funding": [
-                {
-                    "url": "https://symfony.com/sponsor",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/fabpot",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                    "type": "tidelift"
-                }
-            ],
-            "time": "2020-10-24T10:57:07+00:00"
-        },
-        {
-            "name": "symfony/dependency-injection",
-            "version": "v3.4.47",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/dependency-injection.git",
-                "reference": "51d2a2708c6ceadad84393f8581df1dcf9e5e84b"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/51d2a2708c6ceadad84393f8581df1dcf9e5e84b",
-                "reference": "51d2a2708c6ceadad84393f8581df1dcf9e5e84b",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^5.5.9|>=7.0.8",
-                "psr/container": "^1.0"
-            },
-            "conflict": {
-                "symfony/config": "<3.3.7",
-                "symfony/finder": "<3.3",
-                "symfony/proxy-manager-bridge": "<3.4",
-                "symfony/yaml": "<3.4"
-            },
-            "provide": {
-                "psr/container-implementation": "1.0"
-            },
-            "require-dev": {
-                "symfony/config": "~3.3|~4.0",
-                "symfony/expression-language": "~2.8|~3.0|~4.0",
-                "symfony/yaml": "~3.4|~4.0"
-            },
-            "suggest": {
-                "symfony/config": "",
-                "symfony/expression-language": "For using expressions in service container configuration",
-                "symfony/finder": "For using double-star glob patterns or when GLOB_BRACE portability is required",
-                "symfony/proxy-manager-bridge": "Generate service proxies to lazy load them",
-                "symfony/yaml": ""
-            },
-            "type": "library",
-            "autoload": {
-                "psr-4": {
-                    "Symfony\\Component\\DependencyInjection\\": ""
-                },
-                "exclude-from-classmap": [
-                    "/Tests/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Fabien Potencier",
-                    "email": "fabien@symfony.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "description": "Symfony DependencyInjection Component",
-            "homepage": "https://symfony.com",
-            "support": {
-                "source": "https://github.com/symfony/dependency-injection/tree/v3.4.47"
-            },
-            "funding": [
-                {
-                    "url": "https://symfony.com/sponsor",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/fabpot",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                    "type": "tidelift"
-                }
-            ],
-            "time": "2020-10-24T10:57:07+00:00"
-        },
-        {
-            "name": "symfony/expression-language",
-            "version": "v3.4.47",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/expression-language.git",
-                "reference": "de38e66398fca1fcb9c48e80279910e6889cb28f"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/expression-language/zipball/de38e66398fca1fcb9c48e80279910e6889cb28f",
-                "reference": "de38e66398fca1fcb9c48e80279910e6889cb28f",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^5.5.9|>=7.0.8",
-                "symfony/cache": "~3.1|~4.0",
-                "symfony/polyfill-php70": "~1.6"
-            },
-            "type": "library",
-            "autoload": {
-                "psr-4": {
-                    "Symfony\\Component\\ExpressionLanguage\\": ""
-                },
-                "exclude-from-classmap": [
-                    "/Tests/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Fabien Potencier",
-                    "email": "fabien@symfony.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "description": "Symfony ExpressionLanguage Component",
-            "homepage": "https://symfony.com",
-            "support": {
-                "source": "https://github.com/symfony/expression-language/tree/v3.4.47"
-            },
-            "funding": [
-                {
-                    "url": "https://symfony.com/sponsor",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/fabpot",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                    "type": "tidelift"
-                }
-            ],
-            "time": "2020-10-24T10:57:07+00:00"
-        },
-        {
-            "name": "symfony/filesystem",
-            "version": "v3.4.47",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/filesystem.git",
-                "reference": "e58d7841cddfed6e846829040dca2cca0ebbbbb3"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/filesystem/zipball/e58d7841cddfed6e846829040dca2cca0ebbbbb3",
-                "reference": "e58d7841cddfed6e846829040dca2cca0ebbbbb3",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^5.5.9|>=7.0.8",
-                "symfony/polyfill-ctype": "~1.8"
-            },
-            "type": "library",
-            "autoload": {
-                "psr-4": {
-                    "Symfony\\Component\\Filesystem\\": ""
-                },
-                "exclude-from-classmap": [
-                    "/Tests/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Fabien Potencier",
-                    "email": "fabien@symfony.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
+            "keywords": [
+                "compatibility",
+                "idn",
+                "intl",
+                "polyfill",
+                "portable",
+                "shim"
             ],
-            "description": "Symfony Filesystem Component",
-            "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/filesystem/tree/v3.4.47"
+                "source": "https://github.com/symfony/polyfill-intl-idn/tree/v1.19.0"
             },
             "funding": [
                 {
@@ -1744,25 +1289,28 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2020-10-24T10:57:07+00:00"
+            "time": "2020-10-21T09:57:48+00:00"
         },
         {
-            "name": "symfony/polyfill-apcu",
+            "name": "symfony/polyfill-intl-normalizer",
             "version": "v1.19.0",
             "source": {
                 "type": "git",
-                "url": "https://github.com/symfony/polyfill-apcu.git",
-                "reference": "b44b51e7814c23bfbd793a16ead5d7ce43ed23c5"
+                "url": "https://github.com/symfony/polyfill-intl-normalizer.git",
+                "reference": "8db0ae7936b42feb370840cf24de1a144fb0ef27"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-apcu/zipball/b44b51e7814c23bfbd793a16ead5d7ce43ed23c5",
-                "reference": "b44b51e7814c23bfbd793a16ead5d7ce43ed23c5",
+                "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/8db0ae7936b42feb370840cf24de1a144fb0ef27",
+                "reference": "8db0ae7936b42feb370840cf24de1a144fb0ef27",
                 "shasum": ""
             },
             "require": {
                 "php": ">=5.3.3"
             },
+            "suggest": {
+                "ext-intl": "For best performance"
+            },
             "type": "library",
             "extra": {
                 "branch-alias": {
@@ -1778,8 +1326,11 @@
                     "bootstrap.php"
                 ],
                 "psr-4": {
-                    "Symfony\\Polyfill\\Apcu\\": ""
-                }
+                    "Symfony\\Polyfill\\Intl\\Normalizer\\": ""
+                },
+                "classmap": [
+                    "Resources/stubs"
+                ]
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
@@ -1795,17 +1346,18 @@
                     "homepage": "https://symfony.com/contributors"
                 }
             ],
-            "description": "Symfony polyfill backporting apcu_* functions to lower PHP versions",
+            "description": "Symfony polyfill for intl's Normalizer class and related functions",
             "homepage": "https://symfony.com",
             "keywords": [
-                "apcu",
                 "compatibility",
+                "intl",
+                "normalizer",
                 "polyfill",
                 "portable",
                 "shim"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-apcu/tree/v1.19.0"
+                "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.19.0"
             },
             "funding": [
                 {
@@ -1821,28 +1373,26 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2020-10-21T09:57:48+00:00"
+            "time": "2020-10-23T09:01:57+00:00"
         },
         {
-            "name": "symfony/polyfill-ctype",
+            "name": "symfony/polyfill-php70",
             "version": "v1.19.0",
             "source": {
                 "type": "git",
-                "url": "https://github.com/symfony/polyfill-ctype.git",
-                "reference": "aed596913b70fae57be53d86faa2e9ef85a2297b"
+                "url": "https://github.com/symfony/polyfill-php70.git",
+                "reference": "3fe414077251a81a1b15b1c709faf5c2fbae3d4e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/aed596913b70fae57be53d86faa2e9ef85a2297b",
-                "reference": "aed596913b70fae57be53d86faa2e9ef85a2297b",
+                "url": "https://api.github.com/repos/symfony/polyfill-php70/zipball/3fe414077251a81a1b15b1c709faf5c2fbae3d4e",
+                "reference": "3fe414077251a81a1b15b1c709faf5c2fbae3d4e",
                 "shasum": ""
             },
             "require": {
+                "paragonie/random_compat": "~1.0|~2.0|~9.99",
                 "php": ">=5.3.3"
             },
-            "suggest": {
-                "ext-ctype": "For best performance"
-            },
             "type": "library",
             "extra": {
                 "branch-alias": {
@@ -1858,8 +1408,11 @@
                     "bootstrap.php"
                 ],
                 "psr-4": {
-                    "Symfony\\Polyfill\\Ctype\\": ""
-                }
+                    "Symfony\\Polyfill\\Php70\\": ""
+                },
+                "classmap": [
+                    "Resources/stubs"
+                ]
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
@@ -1867,24 +1420,24 @@
             ],
             "authors": [
                 {
-                    "name": "Gert de Pagter",
-                    "email": "BackEndTea@gmail.com"
+                    "name": "Nicolas Grekas",
+                    "email": "p@tchwork.com"
                 },
                 {
                     "name": "Symfony Community",
                     "homepage": "https://symfony.com/contributors"
                 }
             ],
-            "description": "Symfony polyfill for ctype functions",
+            "description": "Symfony polyfill backporting some PHP 7.0+ features to lower PHP versions",
             "homepage": "https://symfony.com",
             "keywords": [
                 "compatibility",
-                "ctype",
                 "polyfill",
-                "portable"
+                "portable",
+                "shim"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-ctype/tree/v1.19.0"
+                "source": "https://github.com/symfony/polyfill-php70/tree/v1.19.0"
             },
             "funding": [
                 {
@@ -1903,27 +1456,21 @@
             "time": "2020-10-23T09:01:57+00:00"
         },
         {
-            "name": "symfony/polyfill-intl-idn",
+            "name": "symfony/polyfill-php72",
             "version": "v1.19.0",
             "source": {
                 "type": "git",
-                "url": "https://github.com/symfony/polyfill-intl-idn.git",
-                "reference": "4ad5115c0f5d5172a9fe8147675ec6de266d8826"
+                "url": "https://github.com/symfony/polyfill-php72.git",
+                "reference": "beecef6b463b06954638f02378f52496cb84bacc"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/4ad5115c0f5d5172a9fe8147675ec6de266d8826",
-                "reference": "4ad5115c0f5d5172a9fe8147675ec6de266d8826",
+                "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/beecef6b463b06954638f02378f52496cb84bacc",
+                "reference": "beecef6b463b06954638f02378f52496cb84bacc",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.3.3",
-                "symfony/polyfill-intl-normalizer": "^1.10",
-                "symfony/polyfill-php70": "^1.10",
-                "symfony/polyfill-php72": "^1.10"
-            },
-            "suggest": {
-                "ext-intl": "For best performance"
+                "php": ">=5.3.3"
             },
             "type": "library",
             "extra": {
@@ -1940,7 +1487,7 @@
                     "bootstrap.php"
                 ],
                 "psr-4": {
-                    "Symfony\\Polyfill\\Intl\\Idn\\": ""
+                    "Symfony\\Polyfill\\Php72\\": ""
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
@@ -1949,1575 +1496,24 @@
             ],
             "authors": [
                 {
-                    "name": "Laurent Bassin",
-                    "email": "laurent@bassin.info"
-                },
-                {
-                    "name": "Trevor Rowbotham",
-                    "email": "trevor.rowbotham@pm.me"
+                    "name": "Nicolas Grekas",
+                    "email": "p@tchwork.com"
                 },
                 {
                     "name": "Symfony Community",
                     "homepage": "https://symfony.com/contributors"
                 }
             ],
-            "description": "Symfony polyfill for intl's idn_to_ascii and idn_to_utf8 functions",
+            "description": "Symfony polyfill backporting some PHP 7.2+ features to lower PHP versions",
             "homepage": "https://symfony.com",
             "keywords": [
                 "compatibility",
-                "idn",
-                "intl",
                 "polyfill",
                 "portable",
                 "shim"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-intl-idn/tree/v1.19.0"
-            },
-            "funding": [
-                {
-                    "url": "https://symfony.com/sponsor",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/fabpot",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                    "type": "tidelift"
-                }
-            ],
-            "time": "2020-10-21T09:57:48+00:00"
-        },
-        {
-            "name": "symfony/polyfill-intl-normalizer",
-            "version": "v1.19.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/polyfill-intl-normalizer.git",
-                "reference": "8db0ae7936b42feb370840cf24de1a144fb0ef27"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/8db0ae7936b42feb370840cf24de1a144fb0ef27",
-                "reference": "8db0ae7936b42feb370840cf24de1a144fb0ef27",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.3"
-            },
-            "suggest": {
-                "ext-intl": "For best performance"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-main": "1.19-dev"
-                },
-                "thanks": {
-                    "name": "symfony/polyfill",
-                    "url": "https://github.com/symfony/polyfill"
-                }
-            },
-            "autoload": {
-                "files": [
-                    "bootstrap.php"
-                ],
-                "psr-4": {
-                    "Symfony\\Polyfill\\Intl\\Normalizer\\": ""
-                },
-                "classmap": [
-                    "Resources/stubs"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Nicolas Grekas",
-                    "email": "p@tchwork.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "description": "Symfony polyfill for intl's Normalizer class and related functions",
-            "homepage": "https://symfony.com",
-            "keywords": [
-                "compatibility",
-                "intl",
-                "normalizer",
-                "polyfill",
-                "portable",
-                "shim"
-            ],
-            "support": {
-                "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.19.0"
-            },
-            "funding": [
-                {
-                    "url": "https://symfony.com/sponsor",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/fabpot",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                    "type": "tidelift"
-                }
-            ],
-            "time": "2020-10-23T09:01:57+00:00"
-        },
-        {
-            "name": "symfony/polyfill-php70",
-            "version": "v1.19.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/polyfill-php70.git",
-                "reference": "3fe414077251a81a1b15b1c709faf5c2fbae3d4e"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-php70/zipball/3fe414077251a81a1b15b1c709faf5c2fbae3d4e",
-                "reference": "3fe414077251a81a1b15b1c709faf5c2fbae3d4e",
-                "shasum": ""
-            },
-            "require": {
-                "paragonie/random_compat": "~1.0|~2.0|~9.99",
-                "php": ">=5.3.3"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-main": "1.19-dev"
-                },
-                "thanks": {
-                    "name": "symfony/polyfill",
-                    "url": "https://github.com/symfony/polyfill"
-                }
-            },
-            "autoload": {
-                "files": [
-                    "bootstrap.php"
-                ],
-                "psr-4": {
-                    "Symfony\\Polyfill\\Php70\\": ""
-                },
-                "classmap": [
-                    "Resources/stubs"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Nicolas Grekas",
-                    "email": "p@tchwork.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "description": "Symfony polyfill backporting some PHP 7.0+ features to lower PHP versions",
-            "homepage": "https://symfony.com",
-            "keywords": [
-                "compatibility",
-                "polyfill",
-                "portable",
-                "shim"
-            ],
-            "support": {
-                "source": "https://github.com/symfony/polyfill-php70/tree/v1.19.0"
-            },
-            "funding": [
-                {
-                    "url": "https://symfony.com/sponsor",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/fabpot",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                    "type": "tidelift"
-                }
-            ],
-            "time": "2020-10-23T09:01:57+00:00"
-        },
-        {
-            "name": "symfony/polyfill-php72",
-            "version": "v1.19.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/polyfill-php72.git",
-                "reference": "beecef6b463b06954638f02378f52496cb84bacc"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/beecef6b463b06954638f02378f52496cb84bacc",
-                "reference": "beecef6b463b06954638f02378f52496cb84bacc",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.3"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-main": "1.19-dev"
-                },
-                "thanks": {
-                    "name": "symfony/polyfill",
-                    "url": "https://github.com/symfony/polyfill"
-                }
-            },
-            "autoload": {
-                "files": [
-                    "bootstrap.php"
-                ],
-                "psr-4": {
-                    "Symfony\\Polyfill\\Php72\\": ""
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Nicolas Grekas",
-                    "email": "p@tchwork.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "description": "Symfony polyfill backporting some PHP 7.2+ features to lower PHP versions",
-            "homepage": "https://symfony.com",
-            "keywords": [
-                "compatibility",
-                "polyfill",
-                "portable",
-                "shim"
-            ],
-            "support": {
-                "source": "https://github.com/symfony/polyfill-php72/tree/v1.19.0"
-            },
-            "funding": [
-                {
-                    "url": "https://symfony.com/sponsor",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/fabpot",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                    "type": "tidelift"
-                }
-            ],
-            "time": "2020-10-23T09:01:57+00:00"
-        },
-        {
-            "name": "symfony/yaml",
-            "version": "v3.4.47",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/yaml.git",
-                "reference": "88289caa3c166321883f67fe5130188ebbb47094"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/yaml/zipball/88289caa3c166321883f67fe5130188ebbb47094",
-                "reference": "88289caa3c166321883f67fe5130188ebbb47094",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^5.5.9|>=7.0.8",
-                "symfony/polyfill-ctype": "~1.8"
-            },
-            "conflict": {
-                "symfony/console": "<3.4"
-            },
-            "require-dev": {
-                "symfony/console": "~3.4|~4.0"
-            },
-            "suggest": {
-                "symfony/console": "For validating YAML files using the lint command"
-            },
-            "type": "library",
-            "autoload": {
-                "psr-4": {
-                    "Symfony\\Component\\Yaml\\": ""
-                },
-                "exclude-from-classmap": [
-                    "/Tests/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Fabien Potencier",
-                    "email": "fabien@symfony.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "description": "Symfony Yaml Component",
-            "homepage": "https://symfony.com",
-            "support": {
-                "source": "https://github.com/symfony/yaml/tree/v3.4.47"
-            },
-            "funding": [
-                {
-                    "url": "https://symfony.com/sponsor",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/fabpot",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                    "type": "tidelift"
-                }
-            ],
-            "time": "2020-10-24T10:57:07+00:00"
-        }
-    ],
-    "packages-dev": [
-        {
-            "name": "composer/pcre",
-            "version": "1.0.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/composer/pcre.git",
-                "reference": "67a32d7d6f9f560b726ab25a061b38ff3a80c560"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/composer/pcre/zipball/67a32d7d6f9f560b726ab25a061b38ff3a80c560",
-                "reference": "67a32d7d6f9f560b726ab25a061b38ff3a80c560",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^5.3.2 || ^7.0 || ^8.0"
-            },
-            "require-dev": {
-                "phpstan/phpstan": "^1.3",
-                "phpstan/phpstan-strict-rules": "^1.1",
-                "symfony/phpunit-bridge": "^4.2 || ^5"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-main": "1.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Composer\\Pcre\\": "src"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Jordi Boggiano",
-                    "email": "j.boggiano@seld.be",
-                    "homepage": "http://seld.be"
-                }
-            ],
-            "description": "PCRE wrapping library that offers type-safe preg_* replacements.",
-            "keywords": [
-                "PCRE",
-                "preg",
-                "regex",
-                "regular expression"
-            ],
-            "support": {
-                "issues": "https://github.com/composer/pcre/issues",
-                "source": "https://github.com/composer/pcre/tree/1.0.1"
-            },
-            "funding": [
-                {
-                    "url": "https://packagist.com",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/composer",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/composer/composer",
-                    "type": "tidelift"
-                }
-            ],
-            "time": "2022-01-21T20:24:37+00:00"
-        },
-        {
-            "name": "composer/semver",
-            "version": "3.4.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/composer/semver.git",
-                "reference": "35e8d0af4486141bc745f23a29cc2091eb624a32"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/composer/semver/zipball/35e8d0af4486141bc745f23a29cc2091eb624a32",
-                "reference": "35e8d0af4486141bc745f23a29cc2091eb624a32",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^5.3.2 || ^7.0 || ^8.0"
-            },
-            "require-dev": {
-                "phpstan/phpstan": "^1.4",
-                "symfony/phpunit-bridge": "^4.2 || ^5"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-main": "3.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Composer\\Semver\\": "src"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Nils Adermann",
-                    "email": "naderman@naderman.de",
-                    "homepage": "http://www.naderman.de"
-                },
-                {
-                    "name": "Jordi Boggiano",
-                    "email": "j.boggiano@seld.be",
-                    "homepage": "http://seld.be"
-                },
-                {
-                    "name": "Rob Bast",
-                    "email": "rob.bast@gmail.com",
-                    "homepage": "http://robbast.nl"
-                }
-            ],
-            "description": "Semver library that offers utilities, version constraint parsing and validation.",
-            "keywords": [
-                "semantic",
-                "semver",
-                "validation",
-                "versioning"
-            ],
-            "support": {
-                "irc": "ircs://irc.libera.chat:6697/composer",
-                "issues": "https://github.com/composer/semver/issues",
-                "source": "https://github.com/composer/semver/tree/3.4.0"
-            },
-            "funding": [
-                {
-                    "url": "https://packagist.com",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/composer",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/composer/composer",
-                    "type": "tidelift"
-                }
-            ],
-            "time": "2023-08-31T09:50:34+00:00"
-        },
-        {
-            "name": "composer/xdebug-handler",
-            "version": "2.0.5",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/composer/xdebug-handler.git",
-                "reference": "9e36aeed4616366d2b690bdce11f71e9178c579a"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/composer/xdebug-handler/zipball/9e36aeed4616366d2b690bdce11f71e9178c579a",
-                "reference": "9e36aeed4616366d2b690bdce11f71e9178c579a",
-                "shasum": ""
-            },
-            "require": {
-                "composer/pcre": "^1",
-                "php": "^5.3.2 || ^7.0 || ^8.0",
-                "psr/log": "^1 || ^2 || ^3"
-            },
-            "require-dev": {
-                "phpstan/phpstan": "^1.0",
-                "phpstan/phpstan-strict-rules": "^1.1",
-                "symfony/phpunit-bridge": "^4.2 || ^5.0 || ^6.0"
-            },
-            "type": "library",
-            "autoload": {
-                "psr-4": {
-                    "Composer\\XdebugHandler\\": "src"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "John Stevenson",
-                    "email": "john-stevenson@blueyonder.co.uk"
-                }
-            ],
-            "description": "Restarts a process without Xdebug.",
-            "keywords": [
-                "Xdebug",
-                "performance"
-            ],
-            "support": {
-                "irc": "irc://irc.freenode.org/composer",
-                "issues": "https://github.com/composer/xdebug-handler/issues",
-                "source": "https://github.com/composer/xdebug-handler/tree/2.0.5"
-            },
-            "funding": [
-                {
-                    "url": "https://packagist.com",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/composer",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/composer/composer",
-                    "type": "tidelift"
-                }
-            ],
-            "time": "2022-02-24T20:20:32+00:00"
-        },
-        {
-            "name": "doctrine/annotations",
-            "version": "v1.4.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/doctrine/annotations.git",
-                "reference": "54cacc9b81758b14e3ce750f205a393d52339e97"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/annotations/zipball/54cacc9b81758b14e3ce750f205a393d52339e97",
-                "reference": "54cacc9b81758b14e3ce750f205a393d52339e97",
-                "shasum": ""
-            },
-            "require": {
-                "doctrine/lexer": "1.*",
-                "php": "^5.6 || ^7.0"
-            },
-            "require-dev": {
-                "doctrine/cache": "1.*",
-                "phpunit/phpunit": "^5.7"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.4.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Doctrine\\Common\\Annotations\\": "lib/Doctrine/Common/Annotations"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Roman Borschel",
-                    "email": "roman@code-factory.org"
-                },
-                {
-                    "name": "Benjamin Eberlei",
-                    "email": "kontakt@beberlei.de"
-                },
-                {
-                    "name": "Guilherme Blanco",
-                    "email": "guilhermeblanco@gmail.com"
-                },
-                {
-                    "name": "Jonathan Wage",
-                    "email": "jonwage@gmail.com"
-                },
-                {
-                    "name": "Johannes Schmitt",
-                    "email": "schmittjoh@gmail.com"
-                }
-            ],
-            "description": "Docblock Annotations Parser",
-            "homepage": "http://www.doctrine-project.org",
-            "keywords": [
-                "annotations",
-                "docblock",
-                "parser"
-            ],
-            "support": {
-                "issues": "https://github.com/doctrine/annotations/issues",
-                "source": "https://github.com/doctrine/annotations/tree/v1.4.0"
-            },
-            "time": "2017-02-24T16:22:25+00:00"
-        },
-        {
-            "name": "doctrine/lexer",
-            "version": "1.0.2",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/doctrine/lexer.git",
-                "reference": "1febd6c3ef84253d7c815bed85fc622ad207a9f8"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/lexer/zipball/1febd6c3ef84253d7c815bed85fc622ad207a9f8",
-                "reference": "1febd6c3ef84253d7c815bed85fc622ad207a9f8",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.2"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "^4.5"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.0.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Doctrine\\Common\\Lexer\\": "lib/Doctrine/Common/Lexer"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Roman Borschel",
-                    "email": "roman@code-factory.org"
-                },
-                {
-                    "name": "Guilherme Blanco",
-                    "email": "guilhermeblanco@gmail.com"
-                },
-                {
-                    "name": "Johannes Schmitt",
-                    "email": "schmittjoh@gmail.com"
-                }
-            ],
-            "description": "PHP Doctrine Lexer parser library that can be used in Top-Down, Recursive Descent Parsers.",
-            "homepage": "https://www.doctrine-project.org/projects/lexer.html",
-            "keywords": [
-                "annotations",
-                "docblock",
-                "lexer",
-                "parser",
-                "php"
-            ],
-            "support": {
-                "issues": "https://github.com/doctrine/lexer/issues",
-                "source": "https://github.com/doctrine/lexer/tree/1.0.2"
-            },
-            "time": "2019-06-08T11:03:04+00:00"
-        },
-        {
-            "name": "friendsofphp/php-cs-fixer",
-            "version": "v2.19.3",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/FriendsOfPHP/PHP-CS-Fixer.git",
-                "reference": "75ac86f33fab4714ea5a39a396784d83ae3b5ed8"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/FriendsOfPHP/PHP-CS-Fixer/zipball/75ac86f33fab4714ea5a39a396784d83ae3b5ed8",
-                "reference": "75ac86f33fab4714ea5a39a396784d83ae3b5ed8",
-                "shasum": ""
-            },
-            "require": {
-                "composer/semver": "^1.4 || ^2.0 || ^3.0",
-                "composer/xdebug-handler": "^1.2 || ^2.0",
-                "doctrine/annotations": "^1.2",
-                "ext-json": "*",
-                "ext-tokenizer": "*",
-                "php": "^5.6 || ^7.0 || ^8.0",
-                "php-cs-fixer/diff": "^1.3",
-                "symfony/console": "^3.4.43 || ^4.1.6 || ^5.0",
-                "symfony/event-dispatcher": "^3.0 || ^4.0 || ^5.0",
-                "symfony/filesystem": "^3.0 || ^4.0 || ^5.0",
-                "symfony/finder": "^3.0 || ^4.0 || ^5.0",
-                "symfony/options-resolver": "^3.0 || ^4.0 || ^5.0",
-                "symfony/polyfill-php70": "^1.0",
-                "symfony/polyfill-php72": "^1.4",
-                "symfony/process": "^3.0 || ^4.0 || ^5.0",
-                "symfony/stopwatch": "^3.0 || ^4.0 || ^5.0"
-            },
-            "require-dev": {
-                "justinrainbow/json-schema": "^5.0",
-                "keradus/cli-executor": "^1.4",
-                "mikey179/vfsstream": "^1.6",
-                "php-coveralls/php-coveralls": "^2.4.2",
-                "php-cs-fixer/accessible-object": "^1.0",
-                "php-cs-fixer/phpunit-constraint-isidenticalstring": "^1.2",
-                "php-cs-fixer/phpunit-constraint-xmlmatchesxsd": "^1.2.1",
-                "phpspec/prophecy-phpunit": "^1.1 || ^2.0",
-                "phpunit/phpunit": "^5.7.27 || ^6.5.14 || ^7.5.20 || ^8.5.13 || ^9.5",
-                "phpunitgoodpractices/polyfill": "^1.5",
-                "phpunitgoodpractices/traits": "^1.9.1",
-                "sanmai/phpunit-legacy-adapter": "^6.4 || ^8.2.1",
-                "symfony/phpunit-bridge": "^5.2.1",
-                "symfony/yaml": "^3.0 || ^4.0 || ^5.0"
-            },
-            "suggest": {
-                "ext-dom": "For handling output formats in XML",
-                "ext-mbstring": "For handling non-UTF8 characters.",
-                "php-cs-fixer/phpunit-constraint-isidenticalstring": "For IsIdenticalString constraint.",
-                "php-cs-fixer/phpunit-constraint-xmlmatchesxsd": "For XmlMatchesXsd constraint.",
-                "symfony/polyfill-mbstring": "When enabling `ext-mbstring` is not possible."
-            },
-            "bin": [
-                "php-cs-fixer"
-            ],
-            "type": "application",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.19-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "PhpCsFixer\\": "src/"
-                },
-                "classmap": [
-                    "tests/Test/AbstractFixerTestCase.php",
-                    "tests/Test/AbstractIntegrationCaseFactory.php",
-                    "tests/Test/AbstractIntegrationTestCase.php",
-                    "tests/Test/Assert/AssertTokensTrait.php",
-                    "tests/Test/IntegrationCase.php",
-                    "tests/Test/IntegrationCaseFactory.php",
-                    "tests/Test/IntegrationCaseFactoryInterface.php",
-                    "tests/Test/InternalIntegrationCaseFactory.php",
-                    "tests/Test/IsIdenticalConstraint.php",
-                    "tests/Test/TokensWithObservedTransformers.php",
-                    "tests/TestCase.php"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Fabien Potencier",
-                    "email": "fabien@symfony.com"
-                },
-                {
-                    "name": "Dariusz Rumiński",
-                    "email": "dariusz.ruminski@gmail.com"
-                }
-            ],
-            "description": "A tool to automatically fix PHP code style",
-            "support": {
-                "issues": "https://github.com/FriendsOfPHP/PHP-CS-Fixer/issues",
-                "source": "https://github.com/FriendsOfPHP/PHP-CS-Fixer/tree/v2.19.3"
-            },
-            "funding": [
-                {
-                    "url": "https://github.com/keradus",
-                    "type": "github"
-                }
-            ],
-            "time": "2021-11-15T17:17:55+00:00"
-        },
-        {
-            "name": "nikic/php-parser",
-            "version": "v3.1.5",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/nikic/PHP-Parser.git",
-                "reference": "bb87e28e7d7b8d9a7fda231d37457c9210faf6ce"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/bb87e28e7d7b8d9a7fda231d37457c9210faf6ce",
-                "reference": "bb87e28e7d7b8d9a7fda231d37457c9210faf6ce",
-                "shasum": ""
-            },
-            "require": {
-                "ext-tokenizer": "*",
-                "php": ">=5.5"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "~4.0|~5.0"
-            },
-            "bin": [
-                "bin/php-parse"
-            ],
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "3.0-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "PhpParser\\": "lib/PhpParser"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Nikita Popov"
-                }
-            ],
-            "description": "A PHP parser written in PHP",
-            "keywords": [
-                "parser",
-                "php"
-            ],
-            "support": {
-                "issues": "https://github.com/nikic/PHP-Parser/issues",
-                "source": "https://github.com/nikic/PHP-Parser/tree/v3.1.5"
-            },
-            "time": "2018-02-28T20:30:58+00:00"
-        },
-        {
-            "name": "php-cs-fixer/diff",
-            "version": "v1.3.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/PHP-CS-Fixer/diff.git",
-                "reference": "dbd31aeb251639ac0b9e7e29405c1441907f5759"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/PHP-CS-Fixer/diff/zipball/dbd31aeb251639ac0b9e7e29405c1441907f5759",
-                "reference": "dbd31aeb251639ac0b9e7e29405c1441907f5759",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^5.6 || ^7.0 || ^8.0"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "^5.7.23 || ^6.4.3 || ^7.0",
-                "symfony/process": "^3.3"
-            },
-            "type": "library",
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de"
-                },
-                {
-                    "name": "Kore Nordmann",
-                    "email": "mail@kore-nordmann.de"
-                },
-                {
-                    "name": "SpacePossum"
-                }
-            ],
-            "description": "sebastian/diff v2 backport support for PHP5.6",
-            "homepage": "https://github.com/PHP-CS-Fixer",
-            "keywords": [
-                "diff"
-            ],
-            "support": {
-                "issues": "https://github.com/PHP-CS-Fixer/diff/issues",
-                "source": "https://github.com/PHP-CS-Fixer/diff/tree/v1.3.1"
-            },
-            "abandoned": true,
-            "time": "2020-10-14T08:39:05+00:00"
-        },
-        {
-            "name": "prestashop/autoindex",
-            "version": "v1.0.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/PrestaShopCorp/autoindex.git",
-                "reference": "92e10242f94a99163dece280f6bd7b7c2b79c158"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/PrestaShopCorp/autoindex/zipball/92e10242f94a99163dece280f6bd7b7c2b79c158",
-                "reference": "92e10242f94a99163dece280f6bd7b7c2b79c158",
-                "shasum": ""
-            },
-            "require": {
-                "nikic/php-parser": "^3.1",
-                "php": ">=5.6",
-                "symfony/console": "^3.4",
-                "symfony/finder": "^3.4"
-            },
-            "bin": [
-                "bin/autoindex"
-            ],
-            "type": "library",
-            "autoload": {
-                "psr-4": {
-                    "PrestaShop\\AutoIndex\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "AFL-3.0"
-            ],
-            "authors": [
-                {
-                    "name": "PrestaShop SA",
-                    "email": "contact@prestashop.com"
-                }
-            ],
-            "description": "Automatically add an 'index.php' in all the current or specified directories and all sub-directories.",
-            "homepage": "https://github.com/PrestaShopCorp/autoindex",
-            "support": {
-                "source": "https://github.com/PrestaShopCorp/autoindex/tree/v1.0.0"
-            },
-            "time": "2020-03-11T13:37:03+00:00"
-        },
-        {
-            "name": "prestashop/header-stamp",
-            "version": "v1.7",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/PrestaShopCorp/header-stamp.git",
-                "reference": "d77ce6d0a7f066670a4774be88f05e5f07b4b6fc"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/PrestaShopCorp/header-stamp/zipball/d77ce6d0a7f066670a4774be88f05e5f07b4b6fc",
-                "reference": "d77ce6d0a7f066670a4774be88f05e5f07b4b6fc",
-                "shasum": ""
-            },
-            "require": {
-                "nikic/php-parser": "^3.1",
-                "php": ">=5.6",
-                "symfony/console": "^3.4 || ~4.0 || ~5.0",
-                "symfony/finder": "^3.4 || ~4.0 || ~5.0"
-            },
-            "require-dev": {
-                "prestashop/php-dev-tools": "1.*"
-            },
-            "bin": [
-                "bin/header-stamp"
-            ],
-            "type": "library",
-            "autoload": {
-                "psr-4": {
-                    "PrestaShop\\HeaderStamp\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "AFL-3.0"
-            ],
-            "authors": [
-                {
-                    "name": "PrestaShop SA",
-                    "email": "contact@prestashop.com"
-                }
-            ],
-            "description": "Rewrite your file headers to add the license or to make them up-to-date",
-            "homepage": "https://github.com/PrestaShopCorp/header-stamp",
-            "support": {
-                "issues": "https://github.com/PrestaShopCorp/header-stamp/issues",
-                "source": "https://github.com/PrestaShopCorp/header-stamp/tree/v1.7"
-            },
-            "time": "2020-12-09T16:40:38+00:00"
-        },
-        {
-            "name": "prestashop/php-dev-tools",
-            "version": "v3.16.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/PrestaShop/php-dev-tools.git",
-                "reference": "785108c29ef6f580930372d88b8f551740fdee98"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/PrestaShop/php-dev-tools/zipball/785108c29ef6f580930372d88b8f551740fdee98",
-                "reference": "785108c29ef6f580930372d88b8f551740fdee98",
-                "shasum": ""
-            },
-            "require": {
-                "friendsofphp/php-cs-fixer": "^2.14",
-                "php": ">=5.6.0",
-                "prestashop/autoindex": "^1.0",
-                "prestashop/header-stamp": "^1.0",
-                "squizlabs/php_codesniffer": "^3.4",
-                "symfony/console": "~3.2 || ~4.0 || ~5.0",
-                "symfony/filesystem": "~3.2 || ~4.0 || ~5.0"
-            },
-            "conflict": {
-                "friendsofphp/php-cs-fixer": "2.18.3"
-            },
-            "bin": [
-                "bin/prestashop-coding-standards"
-            ],
-            "type": "library",
-            "autoload": {
-                "psr-4": {
-                    "PrestaShop\\CodingStandards\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "description": "PrestaShop coding standards",
-            "support": {
-                "issues": "https://github.com/PrestaShop/php-dev-tools/issues",
-                "source": "https://github.com/PrestaShop/php-dev-tools/tree/v3.16.1"
-            },
-            "time": "2021-10-18T07:48:21+00:00"
-        },
-        {
-            "name": "squizlabs/php_codesniffer",
-            "version": "3.10.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/PHPCSStandards/PHP_CodeSniffer.git",
-                "reference": "8f90f7a53ce271935282967f53d0894f8f1ff877"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/PHPCSStandards/PHP_CodeSniffer/zipball/8f90f7a53ce271935282967f53d0894f8f1ff877",
-                "reference": "8f90f7a53ce271935282967f53d0894f8f1ff877",
-                "shasum": ""
-            },
-            "require": {
-                "ext-simplexml": "*",
-                "ext-tokenizer": "*",
-                "ext-xmlwriter": "*",
-                "php": ">=5.4.0"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "^4.0 || ^5.0 || ^6.0 || ^7.0 || ^8.0 || ^9.3.4"
-            },
-            "bin": [
-                "bin/phpcbf",
-                "bin/phpcs"
-            ],
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "3.x-dev"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Greg Sherwood",
-                    "role": "Former lead"
-                },
-                {
-                    "name": "Juliette Reinders Folmer",
-                    "role": "Current lead"
-                },
-                {
-                    "name": "Contributors",
-                    "homepage": "https://github.com/PHPCSStandards/PHP_CodeSniffer/graphs/contributors"
-                }
-            ],
-            "description": "PHP_CodeSniffer tokenizes PHP, JavaScript and CSS files and detects violations of a defined set of coding standards.",
-            "homepage": "https://github.com/PHPCSStandards/PHP_CodeSniffer",
-            "keywords": [
-                "phpcs",
-                "standards",
-                "static analysis"
-            ],
-            "support": {
-                "issues": "https://github.com/PHPCSStandards/PHP_CodeSniffer/issues",
-                "security": "https://github.com/PHPCSStandards/PHP_CodeSniffer/security/policy",
-                "source": "https://github.com/PHPCSStandards/PHP_CodeSniffer",
-                "wiki": "https://github.com/PHPCSStandards/PHP_CodeSniffer/wiki"
-            },
-            "funding": [
-                {
-                    "url": "https://github.com/PHPCSStandards",
-                    "type": "github"
-                },
-                {
-                    "url": "https://github.com/jrfnl",
-                    "type": "github"
-                },
-                {
-                    "url": "https://opencollective.com/php_codesniffer",
-                    "type": "open_collective"
-                }
-            ],
-            "time": "2024-05-22T21:24:41+00:00"
-        },
-        {
-            "name": "symfony/console",
-            "version": "v3.4.47",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/console.git",
-                "reference": "a10b1da6fc93080c180bba7219b5ff5b7518fe81"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/console/zipball/a10b1da6fc93080c180bba7219b5ff5b7518fe81",
-                "reference": "a10b1da6fc93080c180bba7219b5ff5b7518fe81",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^5.5.9|>=7.0.8",
-                "symfony/debug": "~2.8|~3.0|~4.0",
-                "symfony/polyfill-mbstring": "~1.0"
-            },
-            "conflict": {
-                "symfony/dependency-injection": "<3.4",
-                "symfony/process": "<3.3"
-            },
-            "provide": {
-                "psr/log-implementation": "1.0"
-            },
-            "require-dev": {
-                "psr/log": "~1.0",
-                "symfony/config": "~3.3|~4.0",
-                "symfony/dependency-injection": "~3.4|~4.0",
-                "symfony/event-dispatcher": "~2.8|~3.0|~4.0",
-                "symfony/lock": "~3.4|~4.0",
-                "symfony/process": "~3.3|~4.0"
-            },
-            "suggest": {
-                "psr/log": "For using the console logger",
-                "symfony/event-dispatcher": "",
-                "symfony/lock": "",
-                "symfony/process": ""
-            },
-            "type": "library",
-            "autoload": {
-                "psr-4": {
-                    "Symfony\\Component\\Console\\": ""
-                },
-                "exclude-from-classmap": [
-                    "/Tests/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Fabien Potencier",
-                    "email": "fabien@symfony.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "description": "Symfony Console Component",
-            "homepage": "https://symfony.com",
-            "support": {
-                "source": "https://github.com/symfony/console/tree/v3.4.47"
-            },
-            "funding": [
-                {
-                    "url": "https://symfony.com/sponsor",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/fabpot",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                    "type": "tidelift"
-                }
-            ],
-            "time": "2020-10-24T10:57:07+00:00"
-        },
-        {
-            "name": "symfony/debug",
-            "version": "v3.4.47",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/debug.git",
-                "reference": "ab42889de57fdfcfcc0759ab102e2fd4ea72dcae"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/debug/zipball/ab42889de57fdfcfcc0759ab102e2fd4ea72dcae",
-                "reference": "ab42889de57fdfcfcc0759ab102e2fd4ea72dcae",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^5.5.9|>=7.0.8",
-                "psr/log": "~1.0"
-            },
-            "conflict": {
-                "symfony/http-kernel": ">=2.3,<2.3.24|~2.4.0|>=2.5,<2.5.9|>=2.6,<2.6.2"
-            },
-            "require-dev": {
-                "symfony/http-kernel": "~2.8|~3.0|~4.0"
-            },
-            "type": "library",
-            "autoload": {
-                "psr-4": {
-                    "Symfony\\Component\\Debug\\": ""
-                },
-                "exclude-from-classmap": [
-                    "/Tests/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Fabien Potencier",
-                    "email": "fabien@symfony.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "description": "Symfony Debug Component",
-            "homepage": "https://symfony.com",
-            "support": {
-                "source": "https://github.com/symfony/debug/tree/v3.4.47"
-            },
-            "funding": [
-                {
-                    "url": "https://symfony.com/sponsor",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/fabpot",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                    "type": "tidelift"
-                }
-            ],
-            "abandoned": "symfony/error-handler",
-            "time": "2020-10-24T10:57:07+00:00"
-        },
-        {
-            "name": "symfony/event-dispatcher",
-            "version": "v3.4.47",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/event-dispatcher.git",
-                "reference": "31fde73757b6bad247c54597beef974919ec6860"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/31fde73757b6bad247c54597beef974919ec6860",
-                "reference": "31fde73757b6bad247c54597beef974919ec6860",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^5.5.9|>=7.0.8"
-            },
-            "conflict": {
-                "symfony/dependency-injection": "<3.3"
-            },
-            "require-dev": {
-                "psr/log": "~1.0",
-                "symfony/config": "~2.8|~3.0|~4.0",
-                "symfony/debug": "~3.4|~4.4",
-                "symfony/dependency-injection": "~3.3|~4.0",
-                "symfony/expression-language": "~2.8|~3.0|~4.0",
-                "symfony/stopwatch": "~2.8|~3.0|~4.0"
-            },
-            "suggest": {
-                "symfony/dependency-injection": "",
-                "symfony/http-kernel": ""
-            },
-            "type": "library",
-            "autoload": {
-                "psr-4": {
-                    "Symfony\\Component\\EventDispatcher\\": ""
-                },
-                "exclude-from-classmap": [
-                    "/Tests/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Fabien Potencier",
-                    "email": "fabien@symfony.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "description": "Symfony EventDispatcher Component",
-            "homepage": "https://symfony.com",
-            "support": {
-                "source": "https://github.com/symfony/event-dispatcher/tree/v3.4.47"
-            },
-            "funding": [
-                {
-                    "url": "https://symfony.com/sponsor",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/fabpot",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                    "type": "tidelift"
-                }
-            ],
-            "time": "2020-10-24T10:57:07+00:00"
-        },
-        {
-            "name": "symfony/finder",
-            "version": "v3.4.47",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/finder.git",
-                "reference": "b6b6ad3db3edb1b4b1c1896b1975fb684994de6e"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/finder/zipball/b6b6ad3db3edb1b4b1c1896b1975fb684994de6e",
-                "reference": "b6b6ad3db3edb1b4b1c1896b1975fb684994de6e",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^5.5.9|>=7.0.8"
-            },
-            "type": "library",
-            "autoload": {
-                "psr-4": {
-                    "Symfony\\Component\\Finder\\": ""
-                },
-                "exclude-from-classmap": [
-                    "/Tests/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Fabien Potencier",
-                    "email": "fabien@symfony.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "description": "Symfony Finder Component",
-            "homepage": "https://symfony.com",
-            "support": {
-                "source": "https://github.com/symfony/finder/tree/v3.4.47"
-            },
-            "funding": [
-                {
-                    "url": "https://symfony.com/sponsor",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/fabpot",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                    "type": "tidelift"
-                }
-            ],
-            "time": "2020-11-16T17:02:08+00:00"
-        },
-        {
-            "name": "symfony/options-resolver",
-            "version": "v3.4.47",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/options-resolver.git",
-                "reference": "c7efc97a47b2ebaabc19d5b6c6b50f5c37c92744"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/options-resolver/zipball/c7efc97a47b2ebaabc19d5b6c6b50f5c37c92744",
-                "reference": "c7efc97a47b2ebaabc19d5b6c6b50f5c37c92744",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^5.5.9|>=7.0.8"
-            },
-            "type": "library",
-            "autoload": {
-                "psr-4": {
-                    "Symfony\\Component\\OptionsResolver\\": ""
-                },
-                "exclude-from-classmap": [
-                    "/Tests/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Fabien Potencier",
-                    "email": "fabien@symfony.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "description": "Symfony OptionsResolver Component",
-            "homepage": "https://symfony.com",
-            "keywords": [
-                "config",
-                "configuration",
-                "options"
-            ],
-            "support": {
-                "source": "https://github.com/symfony/options-resolver/tree/v3.4.47"
-            },
-            "funding": [
-                {
-                    "url": "https://symfony.com/sponsor",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/fabpot",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                    "type": "tidelift"
-                }
-            ],
-            "time": "2020-10-24T10:57:07+00:00"
-        },
-        {
-            "name": "symfony/polyfill-mbstring",
-            "version": "v1.19.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/polyfill-mbstring.git",
-                "reference": "b5f7b932ee6fa802fc792eabd77c4c88084517ce"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/b5f7b932ee6fa802fc792eabd77c4c88084517ce",
-                "reference": "b5f7b932ee6fa802fc792eabd77c4c88084517ce",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.3"
-            },
-            "suggest": {
-                "ext-mbstring": "For best performance"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-main": "1.19-dev"
-                },
-                "thanks": {
-                    "name": "symfony/polyfill",
-                    "url": "https://github.com/symfony/polyfill"
-                }
-            },
-            "autoload": {
-                "files": [
-                    "bootstrap.php"
-                ],
-                "psr-4": {
-                    "Symfony\\Polyfill\\Mbstring\\": ""
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Nicolas Grekas",
-                    "email": "p@tchwork.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "description": "Symfony polyfill for the Mbstring extension",
-            "homepage": "https://symfony.com",
-            "keywords": [
-                "compatibility",
-                "mbstring",
-                "polyfill",
-                "portable",
-                "shim"
-            ],
-            "support": {
-                "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.19.0"
+                "source": "https://github.com/symfony/polyfill-php72/tree/v1.19.0"
             },
             "funding": [
                 {
@@ -3534,130 +1530,9 @@
                 }
             ],
             "time": "2020-10-23T09:01:57+00:00"
-        },
-        {
-            "name": "symfony/process",
-            "version": "v3.4.47",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/process.git",
-                "reference": "b8648cf1d5af12a44a51d07ef9bf980921f15fca"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/process/zipball/b8648cf1d5af12a44a51d07ef9bf980921f15fca",
-                "reference": "b8648cf1d5af12a44a51d07ef9bf980921f15fca",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^5.5.9|>=7.0.8"
-            },
-            "type": "library",
-            "autoload": {
-                "psr-4": {
-                    "Symfony\\Component\\Process\\": ""
-                },
-                "exclude-from-classmap": [
-                    "/Tests/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Fabien Potencier",
-                    "email": "fabien@symfony.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "description": "Symfony Process Component",
-            "homepage": "https://symfony.com",
-            "support": {
-                "source": "https://github.com/symfony/process/tree/v3.4.47"
-            },
-            "funding": [
-                {
-                    "url": "https://symfony.com/sponsor",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/fabpot",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                    "type": "tidelift"
-                }
-            ],
-            "time": "2020-10-24T10:57:07+00:00"
-        },
-        {
-            "name": "symfony/stopwatch",
-            "version": "v3.4.47",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/stopwatch.git",
-                "reference": "298b81faad4ce60e94466226b2abbb8c9bca7462"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/stopwatch/zipball/298b81faad4ce60e94466226b2abbb8c9bca7462",
-                "reference": "298b81faad4ce60e94466226b2abbb8c9bca7462",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^5.5.9|>=7.0.8"
-            },
-            "type": "library",
-            "autoload": {
-                "psr-4": {
-                    "Symfony\\Component\\Stopwatch\\": ""
-                },
-                "exclude-from-classmap": [
-                    "/Tests/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Fabien Potencier",
-                    "email": "fabien@symfony.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "description": "Symfony Stopwatch Component",
-            "homepage": "https://symfony.com",
-            "support": {
-                "source": "https://github.com/symfony/stopwatch/tree/v3.4.47"
-            },
-            "funding": [
-                {
-                    "url": "https://symfony.com/sponsor",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/fabpot",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                    "type": "tidelift"
-                }
-            ],
-            "time": "2020-10-24T10:57:07+00:00"
         }
     ],
+    "packages-dev": [],
     "aliases": [],
     "minimum-stability": "stable",
     "stability-flags": [],
diff --git a/src/DependencyInjection/ContainerProvider.php b/src/DependencyInjection/ContainerProvider.php
deleted file mode 100644
index aa79ec3d3..000000000
--- a/src/DependencyInjection/ContainerProvider.php
+++ /dev/null
@@ -1,119 +0,0 @@
-<?php
-/**
- * Copyright since 2007 PrestaShop SA and Contributors
- * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License version 3.0
- * that is bundled with this package in the file LICENSE.md.
- * It is also available through the world-wide-web at this URL:
- * https://opensource.org/licenses/AFL-3.0
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@prestashop.com so we can send you a copy immediately.
- *
- * @author    PrestaShop SA and Contributors <contact@prestashop.com>
- * @copyright Since 2007 PrestaShop SA and Contributors
- * @license   https://opensource.org/licenses/AFL-3.0 Academic Free License version 3.0
- */
-
-namespace PrestaShop\Module\PsAccounts\DependencyInjection;
-
-use PrestaShop\Module\PsAccounts\Vendor\PrestaShop\ModuleLibCacheDirectoryProvider\Cache\CacheDirectoryProvider;
-use PrestaShop\Module\PsAccounts\Vendor\Symfony\Component\Config\ConfigCache;
-use PrestaShop\Module\PsAccounts\Vendor\Symfony\Component\Config\FileLocator;
-use PrestaShop\Module\PsAccounts\Vendor\Symfony\Component\DependencyInjection\ContainerBuilder;
-use PrestaShop\Module\PsAccounts\Vendor\Symfony\Component\DependencyInjection\ContainerInterface;
-use PrestaShop\Module\PsAccounts\Vendor\Symfony\Component\DependencyInjection\Dumper\PhpDumper;
-use PrestaShop\Module\PsAccounts\Vendor\Symfony\Component\DependencyInjection\Loader\YamlFileLoader;
-
-class ContainerProvider
-{
-    /**
-     * @var string Module Name
-     */
-    private $moduleName;
-
-    /**
-     * @var string Module Local Path
-     */
-    private $moduleLocalPath;
-
-    /**
-     * @var string
-     */
-    private $moduleEnv;
-
-    /**
-     * @var CacheDirectoryProvider
-     */
-    private $cacheDirectory;
-
-    /**
-     * @param string $moduleName
-     * @param string $moduleLocalPath
-     * @param string $moduleEnv
-     * @param CacheDirectoryProvider $cacheDirectory
-     */
-    public function __construct(
-        $moduleName,
-        $moduleLocalPath,
-        $moduleEnv,
-        CacheDirectoryProvider $cacheDirectory
-    ) {
-        $this->moduleName = $moduleName;
-        $this->moduleLocalPath = $moduleLocalPath;
-        $this->moduleEnv = $moduleEnv;
-        $this->cacheDirectory = $cacheDirectory;
-    }
-
-    /**
-     * @param string $containerName
-     *
-     * @return ContainerInterface
-     *
-     * @throws \Exception
-     */
-    public function get($containerName)
-    {
-        $containerClassName = ucfirst($this->moduleName)
-            . ucfirst($containerName)
-            . 'Container'
-        ;
-        $containerFilePath = $this->cacheDirectory->getPath() . '/' . $containerClassName . '.php';
-        $containerConfigCache = new ConfigCache($containerFilePath, _PS_MODE_DEV_);
-
-        if ($containerConfigCache->isFresh()) {
-            require_once $containerFilePath;
-
-            /** @var ContainerInterface $instance */
-            $instance = new $containerClassName();
-
-            return $instance;
-        }
-
-        $containerBuilder = new ContainerBuilder();
-        $containerBuilder->set(
-            $this->moduleName . '.cache.directory',
-            $this->cacheDirectory
-        );
-        $moduleConfigPath = $this->moduleLocalPath
-            . 'config/'
-            . $containerName
-        ;
-
-        $loader = new YamlFileLoader($containerBuilder, new FileLocator($moduleConfigPath));
-
-        $loader->load('services' . ($this->moduleEnv ? '_' . $this->moduleEnv : '') . '.yml');
-
-        $containerBuilder->compile();
-        $dumper = new PhpDumper($containerBuilder);
-        $containerConfigCache->write(
-            $dumper->dump(['class' => $containerClassName]),
-            $containerBuilder->getResources()
-        );
-
-        return $containerBuilder;
-    }
-}
diff --git a/src/DependencyInjection/ServiceContainer.php b/src/DependencyInjection/ServiceContainer.php
deleted file mode 100644
index 91ce3c817..000000000
--- a/src/DependencyInjection/ServiceContainer.php
+++ /dev/null
@@ -1,108 +0,0 @@
-<?php
-/**
- * Copyright since 2007 PrestaShop SA and Contributors
- * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License version 3.0
- * that is bundled with this package in the file LICENSE.md.
- * It is also available through the world-wide-web at this URL:
- * https://opensource.org/licenses/AFL-3.0
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@prestashop.com so we can send you a copy immediately.
- *
- * @author    PrestaShop SA and Contributors <contact@prestashop.com>
- * @copyright Since 2007 PrestaShop SA and Contributors
- * @license   https://opensource.org/licenses/AFL-3.0 Academic Free License version 3.0
- */
-
-namespace PrestaShop\Module\PsAccounts\DependencyInjection;
-
-use PrestaShop\Module\PsAccounts\Vendor\PrestaShop\ModuleLibCacheDirectoryProvider\Cache\CacheDirectoryProvider;
-use PrestaShop\Module\PsAccounts\Vendor\Symfony\Component\DependencyInjection\ContainerInterface;
-
-class ServiceContainer
-{
-    /**
-     * @var string Module Name
-     */
-    private $moduleName;
-
-    /**
-     * @var string Module Local Path
-     */
-    private $moduleLocalPath;
-
-    /**
-     * @var string
-     */
-    private $moduleEnv;
-
-    /**
-     * @var ContainerInterface
-     */
-    private $container;
-
-    /**
-     * @param string $moduleName
-     * @param string $moduleLocalPath
-     * @param string $moduleEnv
-     *
-     * @throws \Exception
-     */
-    public function __construct($moduleName, $moduleLocalPath, $moduleEnv)
-    {
-        $this->moduleName = $moduleName;
-        $this->moduleLocalPath = $moduleLocalPath;
-        $this->moduleEnv = $moduleEnv;
-
-        $this->initContainer();
-    }
-
-    /**
-     * @param string $serviceName
-     *
-     * @return object|null
-     *
-     * @throws \Exception
-     */
-    public function getService($serviceName)
-    {
-        return $this->getContainer()->get($serviceName);
-    }
-
-    /**
-     * @return ContainerInterface
-     *
-     * @throws \Exception
-     */
-    public function getContainer()
-    {
-        if (null === $this->container) {
-            $this->initContainer();
-        }
-
-        return $this->container;
-    }
-
-    /**
-     * Instantiate a new ContainerProvider
-     *
-     * @return void
-     *
-     * @throws \Exception
-     */
-    private function initContainer()
-    {
-        $cacheDirectory = new CacheDirectoryProvider(
-            _PS_VERSION_,
-            _PS_ROOT_DIR_,
-            _PS_MODE_DEV_
-        );
-        $containerProvider = new ContainerProvider($this->moduleName, $this->moduleLocalPath, $this->moduleEnv, $cacheDirectory);
-
-        $this->container = $containerProvider->get(defined('_PS_ADMIN_DIR_') || defined('PS_INSTALLATION_IN_PROGRESS') ? 'admin' : 'front');
-    }
-}

From 708004b56e1bffece4ee3795ac78565c63b2d1f0 Mon Sep 17 00:00:00 2001
From: hschoenenberger <herve.schoenenberger@prestashop.com>
Date: Tue, 5 Nov 2024 01:35:58 +0100
Subject: [PATCH 03/46] fix: phpstan, php-cs-fixer & feature tests

---
 .zip-contents                                 |   2 +-
 composer.json                                 |  19 +-
 config.php                                    |  30 +++
 config/command.yml                            |  68 ------
 config/common.yml                             | 221 ------------------
 config/config.php                             |  28 ---
 ps_accounts.php                               |   8 +-
 .../CommandHandler/DeleteUserShopHandler.php  |   6 +-
 .../CommandHandler/LinkShopHandler.php        |   6 +-
 .../CommandHandler/UnlinkShopHandler.php      |   6 +-
 .../CommandHandler/UpdateUserShopHandler.php  |   6 +-
 .../CommandHandler/UpgradeModuleHandler.php   |   6 +-
 .../UpgradeModuleMultiHandler.php             |   6 +-
 src/Account/LinkShop.php                      |   6 +-
 src/Account/Session/Firebase/OwnerSession.php |   6 +-
 src/Account/Session/Firebase/ShopSession.php  |   6 +-
 src/Account/Session/ShopSession.php           |   6 +-
 src/Adapter/Configuration.php                 |   6 +-
 src/Adapter/Link.php                          |   6 +-
 src/Api/Client/AccountsClient.php             |   6 +-
 src/Api/Client/ServicesBillingClient.php      |   6 +-
 src/Context/ShopContext.php                   |   6 +-
 src/Cqrs/CommandBus.php                       |   6 +-
 src/Factory/CircuitBreakerFactory.php         |   6 +-
 src/Installer/Installer.php                   |   6 +-
 src/Middleware/Oauth2Middleware.php           |   6 +-
 src/Presenter/PsAccountsPresenter.php         |   6 +-
 src/Provider/OAuth2/Oauth2Client.php          |   6 +-
 src/Provider/OAuth2/PrestaShopSession.php     |   4 +-
 src/Provider/OAuth2/ShopProvider.php          |   2 +-
 src/Provider/RsaKeysProvider.php              |   6 +-
 src/Provider/ShopProvider.php                 |   6 +-
 src/Repository/ConfigurationRepository.php    |   6 +-
 src/Repository/ShopTokenRepository.php        |   6 +-
 src/Repository/UserTokenRepository.php        |   6 +-
 src/Service/AnalyticsService.php              |   6 +-
 src/Service/PsAccountsService.php             |   6 +-
 src/Service/PsBillingService.php              |   6 +-
 src/Service/SentryService.php                 |   6 +-
 .../IServiceContainerService.php              |   2 +-
 .../ParameterNotFoundException.php            |   1 -
 src/ServiceContainer/ServiceContainer.php     |   8 +-
 .../ServiceNotFoundException.php              |   1 -
 .../UpgradeModuleHandlerTest.php              |   4 +
 44 files changed, 139 insertions(+), 439 deletions(-)
 create mode 100644 config.php
 delete mode 100644 config/command.yml
 delete mode 100644 config/common.yml
 delete mode 100644 config/config.php

diff --git a/.zip-contents b/.zip-contents
index 75aa225b8..c4d59caeb 100644
--- a/.zip-contents
+++ b/.zip-contents
@@ -6,7 +6,7 @@ translations
 upgrade
 vendor
 views
-CHANGELOG.md
+config.php
 config.xml
 LICENSE
 logo.png
diff --git a/composer.json b/composer.json
index db8310fcb..6b238159e 100644
--- a/composer.json
+++ b/composer.json
@@ -28,30 +28,13 @@
             "PrestaShop\\Module\\PsAccounts\\Vendor\\League\\OAuth2\\Client\\": "vendor/league/oauth2-client/src",
             "PrestaShop\\Module\\PsAccounts\\Vendor\\Lcobucci\\JWT\\": "vendor/lcobucci/jwt/src",
             "PrestaShop\\Module\\PsAccounts\\Vendor\\Monolog\\": "vendor/monolog/monolog/src/Monolog",
-            "PrestaShop\\Module\\PsAccounts\\Vendor\\PhpCsFixer\\": "vendor/friendsofphp/php-cs-fixer/src",
-            "PrestaShop\\Module\\PsAccounts\\Vendor\\PhpCsFixer\\Tests\\": "vendor/friendsofphp/php-cs-fixer/tests",
             "PrestaShop\\Module\\PsAccounts\\Vendor\\phpseclib\\": "vendor/phpseclib/phpseclib/phpseclib",
             "PrestaShop\\Module\\PsAccounts\\Vendor\\Psr\\Cache\\": "vendor/psr/cache/src",
             "PrestaShop\\Module\\PsAccounts\\Vendor\\Psr\\Container\\": "vendor/psr/container/src",
             "PrestaShop\\Module\\PsAccounts\\Vendor\\Psr\\Http\\Message\\": "vendor/psr/http-message/src",
             "PrestaShop\\Module\\PsAccounts\\Vendor\\Psr\\Log\\": "vendor/psr/log/Psr/Log",
             "PrestaShop\\Module\\PsAccounts\\Vendor\\Psr\\SimpleCache\\": "vendor/psr/simple-cache/src",
-            "PrestaShop\\Module\\PsAccounts\\Vendor\\Ramsey\\Uuid\\": "vendor/ramsey/uuid/src",
-            "PrestaShop\\Module\\PsAccounts\\Vendor\\Symfony\\Component\\Cache\\": "vendor/symfony/cache",
-            "PrestaShop\\Module\\PsAccounts\\Vendor\\Symfony\\Component\\Config\\": "vendor/symfony/config",
-            "PrestaShop\\Module\\PsAccounts\\Vendor\\Symfony\\Component\\Console\\": "vendor/symfony/console",
-            "PrestaShop\\Module\\PsAccounts\\Vendor\\Symfony\\Component\\Debug\\": "vendor/symfony/debug",
-            "PrestaShop\\Module\\PsAccounts\\Vendor\\Symfony\\Component\\DependencyInjection\\": "vendor/symfony/dependency-injection",
-            "PrestaShop\\Module\\PsAccounts\\Vendor\\Symfony\\Component\\EventDispatcher\\": "vendor/symfony/event-dispatcher",
-            "PrestaShop\\Module\\PsAccounts\\Vendor\\Symfony\\Component\\ExpressionLanguage\\": "vendor/symfony/expression-language",
-            "PrestaShop\\Module\\PsAccounts\\Vendor\\Symfony\\Component\\Filesystem\\": "vendor/symfony/filesystem",
-            "PrestaShop\\Module\\PsAccounts\\Vendor\\Symfony\\Component\\Finder\\": "vendor/symfony/finder",
-            "PrestaShop\\Module\\PsAccounts\\Vendor\\Symfony\\Component\\OptionsResolver\\": "vendor/symfony/options-resolver",
-            "PrestaShop\\Module\\PsAccounts\\Vendor\\Symfony\\Component\\Process\\": "vendor/symfony/process",
-            "PrestaShop\\Module\\PsAccounts\\Vendor\\Symfony\\Component\\Stopwatch\\": "vendor/symfony/stopwatch",
-            "PrestaShop\\Module\\PsAccounts\\Vendor\\Symfony\\Component\\Yaml\\": "vendor/symfony/yaml",
-            "PrestaShop\\Module\\PsAccounts\\Vendor\\PrestaShop\\ModuleLibServiceContainer\\": "vendor/prestashop/module-lib-service-container/src,",
-            "PrestaShop\\Module\\PsAccounts\\Vendor\\PrestaShop\\ModuleLibCacheDirectoryProvider\\": "vendor/prestashop/module-lib-cache-directory-provider/src"
+            "PrestaShop\\Module\\PsAccounts\\Vendor\\Ramsey\\Uuid\\": "vendor/ramsey/uuid/src"
         },
         "classmap": [
             "ps_accounts.php",
diff --git a/config.php b/config.php
new file mode 100644
index 000000000..41e5f8f97
--- /dev/null
+++ b/config.php
@@ -0,0 +1,30 @@
+<?php
+
+return [
+    'ps_accounts.environment' => 'development',
+    'ps_accounts.accounts_api_url' => 'https://accounts-api.prestashop.local/',
+    'ps_accounts.accounts_ui_url' => 'https://accounts.prestashop.local',
+    'ps_accounts.sso_api_url' => 'https://auth.prestashop.local/api/',
+    'ps_accounts.sso_account_url' => 'https://auth.prestashop.local/login',
+    'ps_accounts.sso_resend_verification_email_url' => 'https://auth.prestashop.local/account/send-verification-email',
+    'ps_accounts.billing_api_url' => 'https://billing-api.psessentials-integration.net',
+    'ps_accounts.indirect_channel_api_url' => 'https://indirect-channel-api-integration.prestashop.net',
+    'ps_accounts.sentry_credentials' => 'https://12e8e4574d50b54d878db8ee2c3f8380@o298402.ingest.us.sentry.io/5354585',
+    '#ps_accounts.segment_write_key' => 'UITzSdsFTgYsXaiJG09hsCiupUPwgJQB',
+    'ps_accounts.segment_write_key' => 'eYODaH20rT1lMRTTUtAa15BKBlV1XUXQ',
+    'ps_accounts.check_api_ssl_cert' => false,
+    'ps_accounts.verify_account_tokens' => false,
+    'ps_accounts.accounts_vue_cdn_url' => 'http://prestashop8.docker.localhost/upload/psaccountsVue.umd.min.js',
+    //ps_accounts.accounts_cdn_url' => 'http://prestashop8.docker.localhost/upload/psaccountsVue.js'
+    //ps_accounts.accounts_cdn_url' => 'https://unpkg.com/prestashop_accounts_vue_components@5.1.0-test-1/dist/psaccountsVue.js'
+    'ps_accounts.accounts_cdn_url' => 'http://localhost:5174/dist/psaccountsVue.js',
+
+    // a page to display "Update Your Module" message
+    'ps_accounts.svc_accounts_ui_url' => 'https://accounts.prestashop.local/',
+
+    // OAuth2 setup
+    'ps_accounts.oauth2_url' => 'https://oauth.prestashop.local',
+
+    'ps_accounts.testimonials_url' => 'https://assets.prestashop3.com/dst/accounts/assets/testimonials.json',
+    'ps_accounts.log_level' => 'DEBUG',
+];
diff --git a/config/command.yml b/config/command.yml
deleted file mode 100644
index 4bd679e10..000000000
--- a/config/command.yml
+++ /dev/null
@@ -1,68 +0,0 @@
-services:
-  PrestaShop\Module\PsAccounts\Account\CommandHandler\LinkShopHandler:
-    class: PrestaShop\Module\PsAccounts\Account\CommandHandler\LinkShopHandler
-    public: true
-    tags:
-      - { name: tactician.handler, command: 'PrestaShop\Module\PsAccounts\Domain\Shop\Command\LinkShopCommand' }
-    arguments:
-      - '@PrestaShop\Module\PsAccounts\Account\LinkShop'
-
-  PrestaShop\Module\PsAccounts\Account\CommandHandler\MigrateAndLinkV4ShopHandler:
-    class: PrestaShop\Module\PsAccounts\Account\CommandHandler\MigrateAndLinkV4ShopHandler
-    public: true
-    tags:
-      - { name: tactician.handler, command: 'PrestaShop\Module\PsAccounts\Domain\Shop\Command\MigrateAndLinkV4ShopCommand' }
-    arguments:
-      - '@PrestaShop\Module\PsAccounts\Api\Client\AccountsClient'
-      - '@PrestaShop\Module\PsAccounts\Context\ShopContext'
-      - '@PrestaShop\Module\PsAccounts\Account\Session\Firebase\ShopSession'
-
-  PrestaShop\Module\PsAccounts\Account\CommandHandler\DeleteUserShopHandler:
-    class: PrestaShop\Module\PsAccounts\Account\CommandHandler\DeleteUserShopHandler
-    public: true
-    tags:
-      - { name: tactician.handler, command: 'PrestaShop\Module\PsAccounts\Domain\Shop\Command\DeleteUserShopCommand' }
-    arguments:
-      - '@PrestaShop\Module\PsAccounts\Api\Client\AccountsClient'
-      - '@PrestaShop\Module\PsAccounts\Context\ShopContext'
-      - '@PrestaShop\Module\PsAccounts\Account\Session\Firebase\ShopSession'
-      - '@PrestaShop\Module\PsAccounts\Account\Session\Firebase\OwnerSession'
-
-  PrestaShop\Module\PsAccounts\Account\CommandHandler\UnlinkShopHandler:
-    class: PrestaShop\Module\PsAccounts\Account\CommandHandler\UnlinkShopHandler
-    public: true
-    tags:
-      - { name: tactician.handler, command: 'PrestaShop\Module\PsAccounts\Domain\Shop\Command\UnlinkShopCommand' }
-    arguments:
-      - '@PrestaShop\Module\PsAccounts\Account\LinkShop'
-      - '@PrestaShop\Module\PsAccounts\Service\AnalyticsService'
-      - '@PrestaShop\Module\PsAccounts\Provider\ShopProvider'
-
-  PrestaShop\Module\PsAccounts\Account\CommandHandler\UpdateUserShopHandler:
-    class: PrestaShop\Module\PsAccounts\Account\CommandHandler\UpdateUserShopHandler
-    public: true
-    tags:
-      - { name: tactician.handler, command: 'PrestaShop\Module\PsAccounts\Domain\Shop\Command\UpdateShopCommand' }
-    arguments:
-      - '@PrestaShop\Module\PsAccounts\Api\Client\AccountsClient'
-      - '@PrestaShop\Module\PsAccounts\Context\ShopContext'
-      - '@PrestaShop\Module\PsAccounts\Account\Session\Firebase\ShopSession'
-      - '@PrestaShop\Module\PsAccounts\Account\Session\Firebase\OwnerSession'
-
-  PrestaShop\Module\PsAccounts\Account\CommandHandler\UpgradeModuleHandler:
-    class: PrestaShop\Module\PsAccounts\Account\CommandHandler\UpgradeModuleHandler
-    public: true
-    arguments:
-      - '@PrestaShop\Module\PsAccounts\Api\Client\AccountsClient'
-      - '@PrestaShop\Module\PsAccounts\Account\LinkShop'
-      - '@PrestaShop\Module\PsAccounts\Account\Session\Firebase\ShopSession'
-      - '@PrestaShop\Module\PsAccounts\Context\ShopContext'
-      - '@PrestaShop\Module\PsAccounts\Repository\ConfigurationRepository'
-      - '@PrestaShop\Module\PsAccounts\Cqrs\CommandBus'
-
-  PrestaShop\Module\PsAccounts\Account\CommandHandler\UpgradeModuleMultiHandler:
-    class: PrestaShop\Module\PsAccounts\Account\CommandHandler\UpgradeModuleMultiHandler
-    public: true
-    arguments:
-      - '@PrestaShop\Module\PsAccounts\Cqrs\CommandBus'
-      - '@PrestaShop\Module\PsAccounts\Repository\ConfigurationRepository'
diff --git a/config/common.yml b/config/common.yml
deleted file mode 100644
index 0472de573..000000000
--- a/config/common.yml
+++ /dev/null
@@ -1,221 +0,0 @@
-imports:
-  - { resource: command.yml }
-
-services:
-#  ps_accounts.module:
-#    class: Ps_accounts
-#    public: true
-#    factory: ['Module', 'getInstanceByName']
-#    arguments:
-#      - 'ps_accounts'
-
-#  ps_accounts.context:
-#    class: Context
-#    public: true
-#    factory: [ 'Context', 'getContext' ]
-
-#  ps_accounts.logger:
-#    class: PrestaShop\Module\PsAccounts\Vendor\Monolog\Logger
-#    public: true
-#    factory: [ 'PrestaShop\Module\PsAccounts\Log\Logger', 'create' ]
-##    arguments:
-##      - '%ps_accounts.log_level%'
-
-#  PrestaShop\Module\PsAccounts\Provider\OAuth2\ShopProvider:
-#    class: PrestaShop\Module\PsAccounts\Provider\OAuth2\ShopProvider
-#    public: true
-#    factory: [ 'PrestaShop\Module\PsAccounts\Provider\OAuth2\ShopProvider', 'create' ]
-
-#  PrestaShop\Module\PsAccounts\Provider\OAuth2\PrestaShopSession:
-#    class: PrestaShop\Module\PsAccounts\Provider\OAuth2\PrestaShopSession
-#    public: true
-#    factory: [ 'PrestaShop\Module\PsAccounts\Factory\PrestaShopSessionFactory', 'create' ]
-
-#  PrestaShop\Module\PsAccounts\Provider\OAuth2\Oauth2Client:
-#    class: PrestaShop\Module\PsAccounts\Provider\OAuth2\Oauth2Client
-#    public: true
-#    arguments:
-#      - '@PrestaShop\Module\PsAccounts\Repository\ConfigurationRepository'
-
-#  PrestaShop\Module\PsAccounts\Context\ShopContext:
-#    class: PrestaShop\Module\PsAccounts\Context\ShopContext
-#    public: true
-#    arguments:
-#      - '@PrestaShop\Module\PsAccounts\Repository\ConfigurationRepository'
-#      - '@ps_accounts.context'
-
-#  PrestaShop\Module\PsAccounts\Adapter\Configuration:
-#    class: PrestaShop\Module\PsAccounts\Adapter\Configuration
-#    public: true
-#    arguments:
-#      - '@ps_accounts.context'
-
-#  PrestaShop\Module\PsAccounts\Adapter\Link:
-#    class: PrestaShop\Module\PsAccounts\Adapter\Link
-#    public: true
-#    arguments:
-#      - '@PrestaShop\Module\PsAccounts\Context\ShopContext'
-
-  #####################
-  # installer
-
-#  PrestaShop\Module\PsAccounts\Installer\Installer:
-#    class: PrestaShop\Module\PsAccounts\Installer\Installer
-#    public: true
-#    arguments:
-#      - '@PrestaShop\Module\PsAccounts\Context\ShopContext'
-#      - '@PrestaShop\Module\PsAccounts\Adapter\Link'
-
-  #####################
-  # services
-
-#  PrestaShop\Module\PsAccounts\Service\PsAccountsService:
-#    class: PrestaShop\Module\PsAccounts\Service\PsAccountsService
-#    public: true
-#    arguments:
-#      - '@ps_accounts.module'
-
-#  PrestaShop\Module\PsAccounts\Account\LinkShop:
-#    class: PrestaShop\Module\PsAccounts\Account\LinkShop
-#    public: true
-#    arguments:
-#      - '@PrestaShop\Module\PsAccounts\Repository\ConfigurationRepository'
-
-#  PrestaShop\Module\PsAccounts\Service\PsBillingService:
-#    class: PrestaShop\Module\PsAccounts\Service\PsBillingService
-#    public: true
-#    arguments:
-#      - '@PrestaShop\Module\PsAccounts\Api\Client\ServicesBillingClient'
-#      - '@PrestaShop\Module\PsAccounts\Repository\ShopTokenRepository'
-#      - '@PrestaShop\Module\PsAccounts\Repository\ConfigurationRepository'
-
-#  PrestaShop\Module\PsAccounts\Service\AnalyticsService:
-#    class: PrestaShop\Module\PsAccounts\Service\AnalyticsService
-#    public: true
-#    arguments:
-#      - '%ps_accounts.segment_write_key%'
-#      - '@ps_accounts.logger'
-
-  #####################
-  # providers
-
-#  PrestaShop\Module\PsAccounts\Provider\ShopProvider:
-#    class: PrestaShop\Module\PsAccounts\Provider\ShopProvider
-#    public: true
-#    arguments:
-#      - '@PrestaShop\Module\PsAccounts\Context\ShopContext'
-#      - '@PrestaShop\Module\PsAccounts\Adapter\Link'
-
-#  PrestaShop\Module\PsAccounts\Provider\RsaKeysProvider:
-#    class: PrestaShop\Module\PsAccounts\Provider\RsaKeysProvider
-#    public: true
-#    arguments:
-#      - '@PrestaShop\Module\PsAccounts\Repository\ConfigurationRepository'
-
-#  PrestaShop\Module\PsAccounts\Factory\CircuitBreakerFactory:
-#    class: PrestaShop\Module\PsAccounts\Factory\CircuitBreakerFactory
-#    public: true
-#    arguments:
-#      - '@PrestaShop\Module\PsAccounts\Adapter\Configuration'
-
-  #####################
-  # handlers
-
-#  PrestaShop\Module\PsAccounts\Service\SentryService:
-#    class: PrestaShop\Module\PsAccounts\Service\SentryService
-#    public: true
-#    arguments:
-#      - '%ps_accounts.sentry_credentials%'
-#      - '%ps_accounts.environment%'
-#      - '@PrestaShop\Module\PsAccounts\Account\LinkShop'
-#      - '@ps_accounts.context'
-
-  ###############
-  # api clients
-
-#  PrestaShop\Module\PsAccounts\Api\Client\AccountsClient:
-#    class: PrestaShop\Module\PsAccounts\Api\Client\AccountsClient
-#    public: true
-#    arguments:
-#      - '%ps_accounts.accounts_api_url%'
-#      - null
-#      - 10
-
-#  PrestaShop\Module\PsAccounts\Api\Client\ServicesBillingClient:
-#    class: PrestaShop\Module\PsAccounts\Api\Client\ServicesBillingClient
-#    public: true
-#    arguments:
-#      - '%ps_accounts.billing_api_url%'
-#      - '@PrestaShop\Module\PsAccounts\Service\PsAccountsService'
-#      - '@PrestaShop\Module\PsAccounts\Provider\ShopProvider'
-
-  #####################
-  # repositories
-
-#  PrestaShop\Module\PsAccounts\Account\Session\ShopSession:
-#    class: PrestaShop\Module\PsAccounts\Account\Session\ShopSession
-#    public: true
-#    arguments:
-#      - '@PrestaShop\Module\PsAccounts\Repository\ConfigurationRepository'
-#      - '@PrestaShop\Module\PsAccounts\Provider\OAuth2\ShopProvider'
-#      - '@PrestaShop\Module\PsAccounts\Account\LinkShop'
-#      - '@PrestaShop\Module\PsAccounts\Cqrs\CommandBus'
-
-#  PrestaShop\Module\PsAccounts\Account\Session\Firebase\ShopSession:
-#    class: PrestaShop\Module\PsAccounts\Account\Session\Firebase\ShopSession
-#    public: true
-#    arguments:
-#      - '@PrestaShop\Module\PsAccounts\Repository\ConfigurationRepository'
-#      - '@PrestaShop\Module\PsAccounts\Account\Session\ShopSession'
-
-#  PrestaShop\Module\PsAccounts\Account\Session\Firebase\OwnerSession:
-#    class: PrestaShop\Module\PsAccounts\Account\Session\Firebase\OwnerSession
-#    public: true
-#    arguments:
-#      - '@PrestaShop\Module\PsAccounts\Repository\ConfigurationRepository'
-#      - '@PrestaShop\Module\PsAccounts\Account\Session\ShopSession'
-
-#  PrestaShop\Module\PsAccounts\Repository\ConfigurationRepository:
-#    class: PrestaShop\Module\PsAccounts\Repository\ConfigurationRepository
-#    public: true
-#    arguments:
-#      - '@PrestaShop\Module\PsAccounts\Adapter\Configuration'
-
-#  PrestaShop\Module\PsAccounts\Repository\ShopTokenRepository:
-#    class: PrestaShop\Module\PsAccounts\Repository\ShopTokenRepository
-#    public: true
-#    arguments:
-#      - '@PrestaShop\Module\PsAccounts\Account\Session\Firebase\ShopSession'
-#
-#  PrestaShop\Module\PsAccounts\Repository\UserTokenRepository:
-#    class: PrestaShop\Module\PsAccounts\Repository\UserTokenRepository
-#    public: true
-#    arguments:
-#      - '@PrestaShop\Module\PsAccounts\Account\Session\Firebase\OwnerSession'
-
-  #####################
-  # presenters
-
-#  PrestaShop\Module\PsAccounts\Presenter\PsAccountsPresenter:
-#    class: PrestaShop\Module\PsAccounts\Presenter\PsAccountsPresenter
-#    public: true
-#    arguments:
-#      - '@ps_accounts.module'
-
-  #####################
-  # CQRS
-
-#  PrestaShop\Module\PsAccounts\Cqrs\CommandBus:
-#    class: PrestaShop\Module\PsAccounts\Cqrs\CommandBus
-#    public: true
-#    arguments:
-#      - '@ps_accounts.module'
-
-  #####################
-  # Middleware
-
-#  PrestaShop\Module\PsAccounts\Middleware\Oauth2Middleware:
-#    class: PrestaShop\Module\PsAccounts\Middleware\Oauth2Middleware
-#    public: true
-#    arguments:
-#      - '@ps_accounts.module'
diff --git a/config/config.php b/config/config.php
deleted file mode 100644
index 2a1ba4889..000000000
--- a/config/config.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-return [
-  'ps_accounts.environment' => 'development',
-  'ps_accounts.accounts_api_url' => 'https://accounts-api.prestashop.local/',
-  'ps_accounts.accounts_ui_url' => 'https://accounts.prestashop.local',
-  'ps_accounts.sso_api_url' => 'https://auth.prestashop.local/api/',
-  'ps_accounts.sso_account_url' => 'https://auth.prestashop.local/login',
-  'ps_accounts.sso_resend_verification_email_url' => 'https://auth.prestashop.local/account/send-verification-email',
-  'ps_accounts.billing_api_url' => 'https://billing-api.psessentials-integration.net',
-  'ps_accounts.indirect_channel_api_url' => 'https://indirect-channel-api-integration.prestashop.net',
-  'ps_accounts.sentry_credentials' => 'https://12e8e4574d50b54d878db8ee2c3f8380@o298402.ingest.us.sentry.io/5354585',
-  '#ps_accounts.segment_write_key' => 'UITzSdsFTgYsXaiJG09hsCiupUPwgJQB',
-  'ps_accounts.segment_write_key' => 'eYODaH20rT1lMRTTUtAa15BKBlV1XUXQ',
-  'ps_accounts.check_api_ssl_cert' => false,
-  'ps_accounts.verify_account_tokens' => false,
-  'ps_accounts.accounts_vue_cdn_url' => 'http://prestashop8.docker.localhost/upload/psaccountsVue.umd.min.js',
-  #ps_accounts.accounts_cdn_url' => 'http://prestashop8.docker.localhost/upload/psaccountsVue.js'
-  #ps_accounts.accounts_cdn_url' => 'https://unpkg.com/prestashop_accounts_vue_components@5.1.0-test-1/dist/psaccountsVue.js'
-  'ps_accounts.accounts_cdn_url' => 'http://localhost:5174/dist/psaccountsVue.js',
-
-  # a page to display "Update Your Module" message
-  'ps_accounts.svc_accounts_ui_url' => 'https://accounts.prestashop.local/',
-
-  # OAuth2 setup
-  'ps_accounts.oauth2_url' => 'https://oauth.prestashop.local',
-
-  'ps_accounts.testimonials_url' => 'https://assets.prestashop3.com/dst/accounts/assets/testimonials.json'
-];
diff --git a/ps_accounts.php b/ps_accounts.php
index c842d48e5..6c7087db4 100644
--- a/ps_accounts.php
+++ b/ps_accounts.php
@@ -113,10 +113,10 @@ class Ps_accounts extends Module
 //        'actionAdminControllerInitBefore',
     ];
 
-    /**
-     * @var \PrestaShop\Module\PsAccounts\DependencyInjection\ServiceContainer
-     */
-    private $serviceContainer;
+//    /**
+//     * @var \PrestaShop\Module\PsAccounts\DependencyInjection\ServiceContainer
+//     */
+//    private $serviceContainer;
 
     /**
      * Ps_accounts constructor.
diff --git a/src/Account/CommandHandler/DeleteUserShopHandler.php b/src/Account/CommandHandler/DeleteUserShopHandler.php
index 9777e5cf5..c4ffcefe4 100644
--- a/src/Account/CommandHandler/DeleteUserShopHandler.php
+++ b/src/Account/CommandHandler/DeleteUserShopHandler.php
@@ -93,11 +93,11 @@ public function handle(DeleteUserShopCommand $command)
     /**
      * @param ServiceContainer $serviceContainer
      *
-     * @return static
+     * @return self
      */
-    static function getInstance(ServiceContainer $serviceContainer)
+    public static function getInstance(ServiceContainer $serviceContainer)
     {
-        return new static(
+        return new self(
             $serviceContainer->get(AccountsClient::class),
             $serviceContainer->get(ShopContext::class),
             $serviceContainer->get(ShopSession::class),
diff --git a/src/Account/CommandHandler/LinkShopHandler.php b/src/Account/CommandHandler/LinkShopHandler.php
index cd4ee304f..0d93036b5 100644
--- a/src/Account/CommandHandler/LinkShopHandler.php
+++ b/src/Account/CommandHandler/LinkShopHandler.php
@@ -60,11 +60,11 @@ public function handle(LinkShopCommand $command)
     /**
      * @param ServiceContainer $serviceContainer
      *
-     * @return static
+     * @return self
      */
-    static function getInstance(ServiceContainer $serviceContainer)
+    public static function getInstance(ServiceContainer $serviceContainer)
     {
-        return new static(
+        return new self(
             $serviceContainer->get(LinkShop::class)
         );
     }
diff --git a/src/Account/CommandHandler/UnlinkShopHandler.php b/src/Account/CommandHandler/UnlinkShopHandler.php
index 9e3b8e325..d035a3312 100644
--- a/src/Account/CommandHandler/UnlinkShopHandler.php
+++ b/src/Account/CommandHandler/UnlinkShopHandler.php
@@ -105,11 +105,11 @@ public function handle(UnlinkShopCommand $command)
     /**
      * @param ServiceContainer $serviceContainer
      *
-     * @return static
+     * @return self
      */
-    static function getInstance(ServiceContainer $serviceContainer)
+    public static function getInstance(ServiceContainer $serviceContainer)
     {
-        return new static(
+        return new self(
             $serviceContainer->get(LinkShop::class),
             $serviceContainer->get(AnalyticsService::class),
             $serviceContainer->get(ShopProvider::class)
diff --git a/src/Account/CommandHandler/UpdateUserShopHandler.php b/src/Account/CommandHandler/UpdateUserShopHandler.php
index a4e2987d5..920952d1c 100644
--- a/src/Account/CommandHandler/UpdateUserShopHandler.php
+++ b/src/Account/CommandHandler/UpdateUserShopHandler.php
@@ -94,11 +94,11 @@ public function handle(UpdateUserShopCommand $command)
     /**
      * @param ServiceContainer $serviceContainer
      *
-     * @return static
+     * @return self
      */
-    static function getInstance(ServiceContainer $serviceContainer)
+    public static function getInstance(ServiceContainer $serviceContainer)
     {
-        return new static(
+        return new self(
             $serviceContainer->get(AccountsClient::class),
             $serviceContainer->get(ShopContext::class),
             $serviceContainer->get(ShopSession::class),
diff --git a/src/Account/CommandHandler/UpgradeModuleHandler.php b/src/Account/CommandHandler/UpgradeModuleHandler.php
index 76de124a5..374069b02 100644
--- a/src/Account/CommandHandler/UpgradeModuleHandler.php
+++ b/src/Account/CommandHandler/UpgradeModuleHandler.php
@@ -170,11 +170,11 @@ private function lastChanceToRefreshShopToken()
     /**
      * @param ServiceContainer $serviceContainer
      *
-     * @return static
+     * @return self
      */
-    static function getInstance(ServiceContainer $serviceContainer)
+    public static function getInstance(ServiceContainer $serviceContainer)
     {
-        return new static(
+        return new self(
             $serviceContainer->get(AccountsClient::class),
             $serviceContainer->get(LinkShop::class),
             $serviceContainer->get(ShopSession::class),
diff --git a/src/Account/CommandHandler/UpgradeModuleMultiHandler.php b/src/Account/CommandHandler/UpgradeModuleMultiHandler.php
index 7609a6ac5..a028bf1b5 100644
--- a/src/Account/CommandHandler/UpgradeModuleMultiHandler.php
+++ b/src/Account/CommandHandler/UpgradeModuleMultiHandler.php
@@ -99,11 +99,11 @@ private function getShops($multishop)
     /**
      * @param ServiceContainer $serviceContainer
      *
-     * @return static
+     * @return self
      */
-    static function getInstance(ServiceContainer $serviceContainer)
+    public static function getInstance(ServiceContainer $serviceContainer)
     {
-        return new static(
+        return new self(
             $serviceContainer->get(CommandBus::class),
             $serviceContainer->get(ConfigurationRepository::class)
         );
diff --git a/src/Account/LinkShop.php b/src/Account/LinkShop.php
index 77fadabab..ee1c92aea 100644
--- a/src/Account/LinkShop.php
+++ b/src/Account/LinkShop.php
@@ -195,11 +195,11 @@ public function setUnlinkedOnError($errorMsg)
     /**
      * @param ServiceContainer $serviceContainer
      *
-     * @return static
+     * @return self
      */
-    static function getInstance(ServiceContainer $serviceContainer)
+    public static function getInstance(ServiceContainer $serviceContainer)
     {
-        return new static(
+        return new self(
             $serviceContainer->get(ConfigurationRepository::class)
         );
     }
diff --git a/src/Account/Session/Firebase/OwnerSession.php b/src/Account/Session/Firebase/OwnerSession.php
index f8114e070..790ac9d94 100644
--- a/src/Account/Session/Firebase/OwnerSession.php
+++ b/src/Account/Session/Firebase/OwnerSession.php
@@ -79,11 +79,11 @@ public function setToken($token, $refreshToken = null)
     /**
      * @param ServiceContainer $serviceContainer
      *
-     * @return static
+     * @return self
      */
-    static function getInstance(ServiceContainer $serviceContainer)
+    public static function getInstance(ServiceContainer $serviceContainer)
     {
-        return new static(
+        return new self(
             $serviceContainer->get(ConfigurationRepository::class),
             $serviceContainer->get(\PrestaShop\Module\PsAccounts\Account\Session\ShopSession::class)
         );
diff --git a/src/Account/Session/Firebase/ShopSession.php b/src/Account/Session/Firebase/ShopSession.php
index d2dc7bc55..d52e879a3 100644
--- a/src/Account/Session/Firebase/ShopSession.php
+++ b/src/Account/Session/Firebase/ShopSession.php
@@ -79,11 +79,11 @@ public function setToken($token, $refreshToken = null)
     /**
      * @param ServiceContainer $serviceContainer
      *
-     * @return static
+     * @return self
      */
-    static function getInstance(ServiceContainer $serviceContainer)
+    public static function getInstance(ServiceContainer $serviceContainer)
     {
-        return new static(
+        return new self(
             $serviceContainer->get(ConfigurationRepository::class),
             $serviceContainer->get(\PrestaShop\Module\PsAccounts\Account\Session\ShopSession::class)
         );
diff --git a/src/Account/Session/ShopSession.php b/src/Account/Session/ShopSession.php
index 1ed441dfd..eff61dad0 100644
--- a/src/Account/Session/ShopSession.php
+++ b/src/Account/Session/ShopSession.php
@@ -209,11 +209,11 @@ private function getShopUuid()
     /**
      * @param ServiceContainer $serviceContainer
      *
-     * @return static
+     * @return self
      */
-    static function getInstance(ServiceContainer $serviceContainer)
+    public static function getInstance(ServiceContainer $serviceContainer)
     {
-        return new static(
+        return new self(
             $serviceContainer->get(ConfigurationRepository::class),
             $serviceContainer->get(ShopProvider::class),
             $serviceContainer->get(LinkShop::class),
diff --git a/src/Adapter/Configuration.php b/src/Adapter/Configuration.php
index 610a7f198..5ce973a01 100644
--- a/src/Adapter/Configuration.php
+++ b/src/Adapter/Configuration.php
@@ -236,11 +236,11 @@ public function isMultishopActive()
     /**
      * @param ServiceContainer $serviceContainer
      *
-     * @return static
+     * @return self
      */
-    static function getInstance(ServiceContainer $serviceContainer)
+    public static function getInstance(ServiceContainer $serviceContainer)
     {
-        return new static(
+        return new self(
             $serviceContainer->get('ps_accounts.context')
         );
     }
diff --git a/src/Adapter/Link.php b/src/Adapter/Link.php
index 03bde44b2..eacf2641e 100644
--- a/src/Adapter/Link.php
+++ b/src/Adapter/Link.php
@@ -125,11 +125,11 @@ public function getAdminLinkWithCustomDomain($sslDomain, $domain, $controller, $
     /**
      * @param ServiceContainer $serviceContainer
      *
-     * @return static
+     * @return self
      */
-    static function getInstance(ServiceContainer $serviceContainer)
+    public static function getInstance(ServiceContainer $serviceContainer)
     {
-        return new static(
+        return new self(
             $serviceContainer->get(ShopContext::class)
         );
     }
diff --git a/src/Api/Client/AccountsClient.php b/src/Api/Client/AccountsClient.php
index b8a579797..8a6e5a830 100644
--- a/src/Api/Client/AccountsClient.php
+++ b/src/Api/Client/AccountsClient.php
@@ -247,11 +247,11 @@ public function healthCheck()
     /**
      * @param ServiceContainer $serviceContainer
      *
-     * @return static
+     * @return self
      */
-    static function getInstance(ServiceContainer $serviceContainer)
+    public static function getInstance(ServiceContainer $serviceContainer)
     {
-        return new static(
+        return new self(
             $serviceContainer->getParameter('ps_accounts.accounts_api_url'),
             null,
             10
diff --git a/src/Api/Client/ServicesBillingClient.php b/src/Api/Client/ServicesBillingClient.php
index 365bca263..ebd96b168 100644
--- a/src/Api/Client/ServicesBillingClient.php
+++ b/src/Api/Client/ServicesBillingClient.php
@@ -136,11 +136,11 @@ public function createBillingSubscriptions($shopUuidV4, $module, $bodyHttp)
     /**
      * @param ServiceContainer $serviceContainer
      *
-     * @return static
+     * @return self
      */
-    static function getInstance(ServiceContainer $serviceContainer)
+    public static function getInstance(ServiceContainer $serviceContainer)
     {
-        return new static(
+        return new self(
             $serviceContainer->getParameter('ps_accounts.billing_api_url'),
             $serviceContainer->get(PsAccountsService::class),
             $serviceContainer->get(ShopProvider::class)
diff --git a/src/Context/ShopContext.php b/src/Context/ShopContext.php
index 3a3e36d70..943a42672 100644
--- a/src/Context/ShopContext.php
+++ b/src/Context/ShopContext.php
@@ -193,11 +193,11 @@ public function execInShopContext($shopId, $closure)
     /**
      * @param ServiceContainer $serviceContainer
      *
-     * @return static
+     * @return self
      */
-    static function getInstance(ServiceContainer $serviceContainer)
+    public static function getInstance(ServiceContainer $serviceContainer)
     {
-        return new static(
+        return new self(
             $serviceContainer->get(ConfigurationRepository::class),
             $serviceContainer->get('ps_accounts.context')
         );
diff --git a/src/Cqrs/CommandBus.php b/src/Cqrs/CommandBus.php
index 1752ff6be..f10acbde0 100755
--- a/src/Cqrs/CommandBus.php
+++ b/src/Cqrs/CommandBus.php
@@ -41,11 +41,11 @@ public function resolveHandlerClass($className)
     /**
      * @param ServiceContainer $serviceContainer
      *
-     * @return static
+     * @return self
      */
-    static function getInstance(ServiceContainer $serviceContainer)
+    public static function getInstance(ServiceContainer $serviceContainer)
     {
-        return new static(
+        return new self(
             $serviceContainer->get('ps_accounts.module')
         );
     }
diff --git a/src/Factory/CircuitBreakerFactory.php b/src/Factory/CircuitBreakerFactory.php
index aeb15a5d3..ffb2634ba 100644
--- a/src/Factory/CircuitBreakerFactory.php
+++ b/src/Factory/CircuitBreakerFactory.php
@@ -138,11 +138,11 @@ protected function className($className)
     /**
      * @param ServiceContainer $serviceContainer
      *
-     * @return static
+     * @return self
      */
-    static function getInstance(ServiceContainer $serviceContainer)
+    public static function getInstance(ServiceContainer $serviceContainer)
     {
-        return new static(
+        return new self(
             $serviceContainer->get(Configuration::class)
         );
     }
diff --git a/src/Installer/Installer.php b/src/Installer/Installer.php
index 6f78c2339..43492352c 100644
--- a/src/Installer/Installer.php
+++ b/src/Installer/Installer.php
@@ -178,11 +178,11 @@ public function isEnabled($module)
     /**
      * @param ServiceContainer $serviceContainer
      *
-     * @return static
+     * @return self
      */
-    static function getInstance(ServiceContainer $serviceContainer)
+    public static function getInstance(ServiceContainer $serviceContainer)
     {
-        return new static(
+        return new self(
             $serviceContainer->get(ShopContext::class),
             $serviceContainer->get(Link::class)
         );
diff --git a/src/Middleware/Oauth2Middleware.php b/src/Middleware/Oauth2Middleware.php
index ea9dbfc79..08be1cf97 100644
--- a/src/Middleware/Oauth2Middleware.php
+++ b/src/Middleware/Oauth2Middleware.php
@@ -127,11 +127,11 @@ protected function onLogoutCallback()
     /**
      * @param ServiceContainer $serviceContainer
      *
-     * @return static
+     * @return self
      */
-    static function getInstance(ServiceContainer $serviceContainer)
+    public static function getInstance(ServiceContainer $serviceContainer)
     {
-        return new static(
+        return new self(
             $serviceContainer->get('ps_accounts.module')
         );
     }
diff --git a/src/Presenter/PsAccountsPresenter.php b/src/Presenter/PsAccountsPresenter.php
index b5ef2b5cb..27bbf4c0f 100644
--- a/src/Presenter/PsAccountsPresenter.php
+++ b/src/Presenter/PsAccountsPresenter.php
@@ -174,11 +174,11 @@ public function present($psxName = 'ps_accounts')
     /**
      * @param ServiceContainer $serviceContainer
      *
-     * @return static
+     * @return self
      */
-    static function getInstance(ServiceContainer $serviceContainer)
+    public static function getInstance(ServiceContainer $serviceContainer)
     {
-        return new static(
+        return new self(
             $serviceContainer->get('ps_accounts.module')
         );
     }
diff --git a/src/Provider/OAuth2/Oauth2Client.php b/src/Provider/OAuth2/Oauth2Client.php
index c33b89076..294edae2c 100644
--- a/src/Provider/OAuth2/Oauth2Client.php
+++ b/src/Provider/OAuth2/Oauth2Client.php
@@ -85,11 +85,11 @@ public function getClientSecret()
     /**
      * @param ServiceContainer $serviceContainer
      *
-     * @return static
+     * @return self
      */
-    static function getInstance(ServiceContainer $serviceContainer)
+    public static function getInstance(ServiceContainer $serviceContainer)
     {
-        return new static(
+        return new self(
             $serviceContainer->get(ConfigurationRepository::class)
         );
     }
diff --git a/src/Provider/OAuth2/PrestaShopSession.php b/src/Provider/OAuth2/PrestaShopSession.php
index 8ace75537..083692f88 100644
--- a/src/Provider/OAuth2/PrestaShopSession.php
+++ b/src/Provider/OAuth2/PrestaShopSession.php
@@ -139,9 +139,9 @@ private function getTokenProvider()
     /**
      * @param ServiceContainer $serviceContainer
      *
-     * @return static
+     * @return self
      */
-    static function getInstance(ServiceContainer $serviceContainer)
+    public static function getInstance(ServiceContainer $serviceContainer)
     {
         return \PrestaShop\Module\PsAccounts\Factory\PrestaShopSessionFactory::create();
     }
diff --git a/src/Provider/OAuth2/ShopProvider.php b/src/Provider/OAuth2/ShopProvider.php
index ad14f000b..01529f77b 100644
--- a/src/Provider/OAuth2/ShopProvider.php
+++ b/src/Provider/OAuth2/ShopProvider.php
@@ -176,7 +176,7 @@ private function syncOauth2ClientProps()
      *
      * @return PrestaShop
      */
-    static function getInstance(ServiceContainer $serviceContainer)
+    public static function getInstance(ServiceContainer $serviceContainer)
     {
         return \PrestaShop\Module\PsAccounts\Provider\OAuth2\ShopProvider::create();
     }
diff --git a/src/Provider/RsaKeysProvider.php b/src/Provider/RsaKeysProvider.php
index 043c1ef9c..e8aa32367 100644
--- a/src/Provider/RsaKeysProvider.php
+++ b/src/Provider/RsaKeysProvider.php
@@ -197,11 +197,11 @@ public function cleanupKeys()
     /**
      * @param ServiceContainer $serviceContainer
      *
-     * @return static
+     * @return self
      */
-    static function getInstance(ServiceContainer $serviceContainer)
+    public static function getInstance(ServiceContainer $serviceContainer)
     {
-        return new static(
+        return new self(
             $serviceContainer->get(ConfigurationRepository::class)
         );
     }
diff --git a/src/Provider/ShopProvider.php b/src/Provider/ShopProvider.php
index 3b369b1d5..282f64852 100644
--- a/src/Provider/ShopProvider.php
+++ b/src/Provider/ShopProvider.php
@@ -270,11 +270,11 @@ private function getShopUrl($shopData)
     /**
      * @param ServiceContainer $serviceContainer
      *
-     * @return static
+     * @return self
      */
-    static function getInstance(ServiceContainer $serviceContainer)
+    public static function getInstance(ServiceContainer $serviceContainer)
     {
-        return new static(
+        return new self(
             $serviceContainer->get(ShopContext::class),
             $serviceContainer->get(Link::class)
         );
diff --git a/src/Repository/ConfigurationRepository.php b/src/Repository/ConfigurationRepository.php
index c6e446a82..051543f73 100644
--- a/src/Repository/ConfigurationRepository.php
+++ b/src/Repository/ConfigurationRepository.php
@@ -468,11 +468,11 @@ protected function migrateToSingleShop()
     /**
      * @param ServiceContainer $serviceContainer
      *
-     * @return static
+     * @return self
      */
-    static function getInstance(ServiceContainer $serviceContainer)
+    public static function getInstance(ServiceContainer $serviceContainer)
     {
-        return new static(
+        return new self(
             $serviceContainer->get(Configuration::class)
         );
     }
diff --git a/src/Repository/ShopTokenRepository.php b/src/Repository/ShopTokenRepository.php
index a13dc7392..5bbf36897 100644
--- a/src/Repository/ShopTokenRepository.php
+++ b/src/Repository/ShopTokenRepository.php
@@ -39,11 +39,11 @@ class ShopTokenRepository extends TokenRepository implements IServiceContainerSe
     /**
      * @param ServiceContainer $serviceContainer
      *
-     * @return static
+     * @return self
      */
-    static function getInstance(ServiceContainer $serviceContainer)
+    public static function getInstance(ServiceContainer $serviceContainer)
     {
-        return new static(
+        return new self(
             $serviceContainer->get(ShopSession::class)
         );
     }
diff --git a/src/Repository/UserTokenRepository.php b/src/Repository/UserTokenRepository.php
index dbc250367..570771033 100644
--- a/src/Repository/UserTokenRepository.php
+++ b/src/Repository/UserTokenRepository.php
@@ -57,11 +57,11 @@ public function getTokenEmailVerified()
     /**
      * @param ServiceContainer $serviceContainer
      *
-     * @return static
+     * @return self
      */
-    static function getInstance(ServiceContainer $serviceContainer)
+    public static function getInstance(ServiceContainer $serviceContainer)
     {
-        return new static(
+        return new self(
             $serviceContainer->get(OwnerSession::class)
         );
     }
diff --git a/src/Service/AnalyticsService.php b/src/Service/AnalyticsService.php
index dd6365b6e..69b1c58cb 100644
--- a/src/Service/AnalyticsService.php
+++ b/src/Service/AnalyticsService.php
@@ -321,11 +321,11 @@ private function initAnonymousId()
     /**
      * @param ServiceContainer $serviceContainer
      *
-     * @return static
+     * @return self
      */
-    static function getInstance(ServiceContainer $serviceContainer)
+    public static function getInstance(ServiceContainer $serviceContainer)
     {
-        return new static(
+        return new self(
             $serviceContainer->getParameter('ps_accounts.segment_write_key'),
             $serviceContainer->get('ps_accounts.logger')
         );
diff --git a/src/Service/PsAccountsService.php b/src/Service/PsAccountsService.php
index 10db897e0..461c36e98 100644
--- a/src/Service/PsAccountsService.php
+++ b/src/Service/PsAccountsService.php
@@ -344,11 +344,11 @@ public function getEmployeeAccount()
     /**
      * @param ServiceContainer $serviceContainer
      *
-     * @return static
+     * @return self
      */
-    static function getInstance(ServiceContainer $serviceContainer)
+    public static function getInstance(ServiceContainer $serviceContainer)
     {
-        return new static(
+        return new self(
             $serviceContainer->get('ps_accounts.module')
         );
     }
diff --git a/src/Service/PsBillingService.php b/src/Service/PsBillingService.php
index e93cf1739..798739de9 100644
--- a/src/Service/PsBillingService.php
+++ b/src/Service/PsBillingService.php
@@ -153,11 +153,11 @@ public function subscribeToFreePlan($module, $planName, $shopId = false, $custom
     /**
      * @param ServiceContainer $serviceContainer
      *
-     * @return static
+     * @return self
      */
-    static function getInstance(ServiceContainer $serviceContainer)
+    public static function getInstance(ServiceContainer $serviceContainer)
     {
-        return new static(
+        return new self(
             $serviceContainer->get(ServicesBillingClient::class),
             $serviceContainer->get(ShopTokenRepository::class),
             $serviceContainer->get(ConfigurationRepository::class)
diff --git a/src/Service/SentryService.php b/src/Service/SentryService.php
index d06f4ccfd..539733b22 100644
--- a/src/Service/SentryService.php
+++ b/src/Service/SentryService.php
@@ -185,11 +185,11 @@ private function isContextInFrontOffice(Context $context = null)
     /**
      * @param ServiceContainer $serviceContainer
      *
-     * @return static
+     * @return self
      */
-    static function getInstance(ServiceContainer $serviceContainer)
+    public static function getInstance(ServiceContainer $serviceContainer)
     {
-        return new static(
+        return new self(
             $serviceContainer->getParameter('ps_accounts.sentry_credentials'),
             $serviceContainer->getParameter('ps_accounts.environment'),
             $serviceContainer->get(LinkShop::class),
diff --git a/src/ServiceContainer/IServiceContainerService.php b/src/ServiceContainer/IServiceContainerService.php
index 674eca8bc..c88dddf74 100644
--- a/src/ServiceContainer/IServiceContainerService.php
+++ b/src/ServiceContainer/IServiceContainerService.php
@@ -9,5 +9,5 @@ interface IServiceContainerService
      *
      * @return mixed
      */
-    static function getInstance(ServiceContainer $serviceContainer);
+    public static function getInstance(ServiceContainer $serviceContainer);
 }
diff --git a/src/ServiceContainer/ParameterNotFoundException.php b/src/ServiceContainer/ParameterNotFoundException.php
index 312241e09..6ac3aad74 100644
--- a/src/ServiceContainer/ParameterNotFoundException.php
+++ b/src/ServiceContainer/ParameterNotFoundException.php
@@ -4,5 +4,4 @@
 
 class ParameterNotFoundException extends \Exception
 {
-
 }
diff --git a/src/ServiceContainer/ServiceContainer.php b/src/ServiceContainer/ServiceContainer.php
index 95ed52715..12f6f7b99 100644
--- a/src/ServiceContainer/ServiceContainer.php
+++ b/src/ServiceContainer/ServiceContainer.php
@@ -12,7 +12,7 @@ class ServiceContainer
     /**
      * @var array
      */
-    protected $services  = [];
+    protected $services = [];
 
     /**
      * @var array|\Closure[]
@@ -31,7 +31,7 @@ class ServiceContainer
 
     public function __construct()
     {
-        $this->config = require __DIR__ . '/../../config/' . $this->configName . '.php';
+        $this->config = require __DIR__ . '/../../' . $this->configName . '.php';
 
         $this->providers = [
             'ps_accounts.context' => function () {
@@ -42,7 +42,7 @@ public function __construct()
             },
             'ps_accounts.module' => function () {
                 return \Module::getInstanceByName('ps_accounts');
-            }
+            },
         ];
     }
 
@@ -54,6 +54,7 @@ public static function getInstance()
         if (null === self::$instance) {
             self::$instance = new ServiceContainer();
         }
+
         return self::$instance;
     }
 
@@ -72,6 +73,7 @@ public function get($name)
         if (array_key_exists($name, $this->providers)) {
             return $this->providers[$name]();
         }
+
         return $this->provideInstanceFromClassname($name);
     }
 
diff --git a/src/ServiceContainer/ServiceNotFoundException.php b/src/ServiceContainer/ServiceNotFoundException.php
index 51682ec69..ad9969db9 100644
--- a/src/ServiceContainer/ServiceNotFoundException.php
+++ b/src/ServiceContainer/ServiceNotFoundException.php
@@ -4,5 +4,4 @@
 
 class ServiceNotFoundException extends \Exception
 {
-
 }
diff --git a/tests/Feature/Account/CommandHandler/UpgradeModuleHandlerTest.php b/tests/Feature/Account/CommandHandler/UpgradeModuleHandlerTest.php
index 632bf4357..357780c6a 100644
--- a/tests/Feature/Account/CommandHandler/UpgradeModuleHandlerTest.php
+++ b/tests/Feature/Account/CommandHandler/UpgradeModuleHandlerTest.php
@@ -127,6 +127,10 @@ protected function loginIntoBackoffice()
     {
         $jar = $this->cookieJar;
 
+        $resLoginPage = $this->displayLoginPage($jar);
+
+        $this->module->getLogger()->info(print_r($resLoginPage->getBody(), true));
+
         $this->assertResponseOk(
             $this->displayLoginPage($jar)
         );

From 8a6c7e0d17dea43cda8e5e18e8f492234734ca6a Mon Sep 17 00:00:00 2001
From: hschoenenberger <herve.schoenenberger@prestashop.com>
Date: Tue, 5 Nov 2024 08:47:07 +0100
Subject: [PATCH 04/46] fix: phpstan, php-cs-fixer & feature tests

---
 config/config.yml.dist                    | 3 ---
 src/ServiceContainer/ServiceContainer.php | 2 +-
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/config/config.yml.dist b/config/config.yml.dist
index 5ec883625..549942790 100644
--- a/config/config.yml.dist
+++ b/config/config.yml.dist
@@ -1,6 +1,3 @@
-imports:
-  - { resource: common.yml }
-
 parameters:
   # In case you need to override with environment variables, you can follow this example :
   # env(PS_ACCOUNTS_SENTRY_CREDENTIALS): 'https://4c7f6c8dd5aa405b8401a35f5cf26ada@o298402.ingest.sentry.io/5354585'
diff --git a/src/ServiceContainer/ServiceContainer.php b/src/ServiceContainer/ServiceContainer.php
index 12f6f7b99..34d840e8b 100644
--- a/src/ServiceContainer/ServiceContainer.php
+++ b/src/ServiceContainer/ServiceContainer.php
@@ -31,7 +31,7 @@ class ServiceContainer
 
     public function __construct()
     {
-        $this->config = require __DIR__ . '/../../' . $this->configName . '.php';
+        $this->config = require_once __DIR__ . '/../../' . $this->configName . '.php';
 
         $this->providers = [
             'ps_accounts.context' => function () {

From fcc505c904f8af2dc2b27bb70e249db56c1a7435 Mon Sep 17 00:00:00 2001
From: hschoenenberger <herve.schoenenberger@prestashop.com>
Date: Tue, 5 Nov 2024 08:53:00 +0100
Subject: [PATCH 05/46] fix: phpstan, php-cs-fixer & feature tests

---
 Makefile      |  2 +-
 composer.json |  2 +-
 config.php    | 18 ++++++++++++++++++
 3 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index dfb57f881..18ee7c4b3 100644
--- a/Makefile
+++ b/Makefile
@@ -296,7 +296,7 @@ autoindex: tests/vendor
 
 header-stamp: COMPOSER_FILE := composer56.json
 header-stamp: tests/vendor
-	${PHP} ./vendor/bin/header-stamp --target="${WORKDIR}" --license="assets/afl.txt" --exclude=".github,node_modules,vendor,vendor,tests,_dev"
+	${PHP} ./tests/vendor/bin/header-stamp --target="${WORKDIR}" --license="assets/afl.txt" --exclude=".github,node_modules,vendor,vendor,tests,_dev"
 
 ##########################################################
 COMPOSER_OPTIONS ?= --prefer-dist -o --no-dev --quiet
diff --git a/composer.json b/composer.json
index 6b238159e..999c0e481 100644
--- a/composer.json
+++ b/composer.json
@@ -59,4 +59,4 @@
         ]
     },
     "author": "PrestaShop"
-}
+}
\ No newline at end of file
diff --git a/config.php b/config.php
index 41e5f8f97..498dc7f82 100644
--- a/config.php
+++ b/config.php
@@ -1,4 +1,22 @@
 <?php
+/**
+ * Copyright since 2007 PrestaShop SA and Contributors
+ * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License version 3.0
+ * that is bundled with this package in the file LICENSE.md.
+ * It is also available through the world-wide-web at this URL:
+ * https://opensource.org/licenses/AFL-3.0
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@prestashop.com so we can send you a copy immediately.
+ *
+ * @author    PrestaShop SA and Contributors <contact@prestashop.com>
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license   https://opensource.org/licenses/AFL-3.0 Academic Free License version 3.0
+ */
 
 return [
     'ps_accounts.environment' => 'development',

From f2ad306898523800c202aa87a83191f625aebb71 Mon Sep 17 00:00:00 2001
From: hschoenenberger <herve.schoenenberger@prestashop.com>
Date: Tue, 5 Nov 2024 09:22:01 +0100
Subject: [PATCH 06/46] fix: phpstan, php-cs-fixer & feature tests

---
 .github/workflows/accounts-qc-php.yml         | 94 ++++++++++---------
 Makefile                                      | 22 ++++-
 .../InconsistentAssociationStateException.php | 19 ++++
 .../AdminController/IsAnonymousAllowed.php    | 19 ++++
 src/Polyfill/Traits/Controller/AjaxRender.php | 19 ++++
 .../IServiceContainerService.php              | 19 ++++
 .../ParameterNotFoundException.php            | 19 ++++
 src/ServiceContainer/ServiceContainer.php     | 19 ++++
 .../ServiceNotFoundException.php              | 19 ++++
 9 files changed, 201 insertions(+), 48 deletions(-)

diff --git a/.github/workflows/accounts-qc-php.yml b/.github/workflows/accounts-qc-php.yml
index 5de3b4a33..ec94ead81 100755
--- a/.github/workflows/accounts-qc-php.yml
+++ b/.github/workflows/accounts-qc-php.yml
@@ -36,24 +36,24 @@ jobs:
       - name: Run PHP-CS-Fixer
         uses: prestashopcorp/github-action-php-cs-fixer@master
 
-  phpstan:
-    name: PHPStan for Prestashop ${{ matrix.presta-versions }}
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        presta-versions:
-          - "1.7.7.8-7.1"
-          - "1.6.1.24-7.1"
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-
-      - name: Scoped dependencies
-        run: make php-scoper
-
-      - name: PHPStan
-        run: |
-          make phpstan-${{ matrix.presta-versions }}
+#  phpstan:
+#    name: PHPStan for Prestashop ${{ matrix.presta-versions }}
+#    runs-on: ubuntu-latest
+#    strategy:
+#      matrix:
+#        presta-versions:
+#          - "1.7.7.8-7.1"
+#          - "1.6.1.24-7.1"
+#    steps:
+#      - name: Checkout
+#        uses: actions/checkout@v3
+#
+#      - name: Scoped dependencies
+#        run: make php-scoper
+#
+#      - name: PHPStan
+#        run: |
+#          make phpstan-${{ matrix.presta-versions }}
 
   phpunit:
     name: PHPUNIT for Prestashop ${{ matrix.presta-versions }}
@@ -90,33 +90,39 @@ jobs:
         run: |
           make phpunit-display-logs
 
-#      - name: PHPStan
-#        run: |
-#          make phpstan
-
-  header-stamp:
-    name: Check license headers
-    runs-on: ubuntu-20.04
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-
-      - name: Cache vendor folder
-        uses: actions/cache@v3
-        with:
-          path: vendor
-          key: php-${{ hashFiles('composer.lock') }}
-
-      - name: Cache composer folder
-        uses: actions/cache@v3
-        with:
-          path: ~/.composer/cache
-          key: php-composer-cache
-
-      - run: composer install
+      - name: PHPStan
+        if: matrix.presta-versions == '1.6.1.24-7.1' || matrix.presta-versions == '1.7.7.8-7.1'
+        run: |
+          make phpstan
 
-      - name: Run Header Stamp in Dry Run mode
-        run: php vendor/bin/header-stamp --license=vendor/prestashop/header-stamp/assets/afl.txt --exclude=.github,node_modules,vendor,vendor,tests,_dev --dry-run
+      - name: header-stamp
+        if: matrix.presta-versions == '1.6.1.24-5.6-fpm-stretch'
+        run: |
+          make header-stamp-test
+
+#  header-stamp:
+#    name: Check license headers
+#    runs-on: ubuntu-20.04
+#    steps:
+#      - name: Checkout
+#        uses: actions/checkout@v3
+#
+#      - name: Cache vendor folder
+#        uses: actions/cache@v3
+#        with:
+#          path: vendor
+#          key: php-${{ hashFiles('composer.lock') }}
+#
+#      - name: Cache composer folder
+#        uses: actions/cache@v3
+#        with:
+#          path: ~/.composer/cache
+#          key: php-composer-cache
+#
+#      - run: composer install
+#
+#      - name: Run Header Stamp in Dry Run mode
+#        run: php vendor/bin/header-stamp --license=vendor/prestashop/header-stamp/assets/afl.txt --exclude=.github,node_modules,vendor,vendor,tests,_dev --dry-run
 
   notify-earth:
     if: ${{ github.event.action == 'labeled' && github.event.label.name == 'ready to review' }}
diff --git a/Makefile b/Makefile
index 18ee7c4b3..e505edb3c 100644
--- a/Makefile
+++ b/Makefile
@@ -181,6 +181,24 @@ phpstan:
 	  --memory-limit=-1 \
 	  --configuration=./phpstan/phpstan.neon
 
+##############
+# HEADER-STAMP
+
+header-stamp-test:
+	@docker exec -w ${CONTAINER_INSTALL_DIR} \
+	phpunit ./tests/vendor/bin/header-stamp \
+	--target="${WORKDIR}" \
+	--license=./tests/vendor/prestashop/header-stamp/assets/afl.txt \
+	--exclude=.github,node_modules,vendor,vendor,tests,_dev \
+	--dry-run
+
+header-stamp:
+	@docker exec -w ${CONTAINER_INSTALL_DIR} \
+	phpunit ./tests/vendor/bin/header-stamp \
+	--target="${WORKDIR}" \
+	--license=./tests/vendor/prestashop/header-stamp/assets/afl.txt \
+	--exclude=.github,node_modules,vendor,vendor,tests,_dev
+
 #phpstan16: NEON_FILE := phpstan-PS-1.6.neon
 #phpstan16: phpstan
 
@@ -294,10 +312,6 @@ autoindex: COMPOSER_FILE := composer56.json
 autoindex: tests/vendor
 	${PHP} ./tests/vendor/bin/autoindex prestashop:add:index "${WORKDIR}"
 
-header-stamp: COMPOSER_FILE := composer56.json
-header-stamp: tests/vendor
-	${PHP} ./tests/vendor/bin/header-stamp --target="${WORKDIR}" --license="assets/afl.txt" --exclude=".github,node_modules,vendor,vendor,tests,_dev"
-
 ##########################################################
 COMPOSER_OPTIONS ?= --prefer-dist -o --no-dev --quiet
 
diff --git a/src/Account/Exception/InconsistentAssociationStateException.php b/src/Account/Exception/InconsistentAssociationStateException.php
index 2e6d73e5f..ff61591f9 100644
--- a/src/Account/Exception/InconsistentAssociationStateException.php
+++ b/src/Account/Exception/InconsistentAssociationStateException.php
@@ -1,4 +1,23 @@
 <?php
+/**
+ * Copyright since 2007 PrestaShop SA and Contributors
+ * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License version 3.0
+ * that is bundled with this package in the file LICENSE.md.
+ * It is also available through the world-wide-web at this URL:
+ * https://opensource.org/licenses/AFL-3.0
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@prestashop.com so we can send you a copy immediately.
+ *
+ * @author    PrestaShop SA and Contributors <contact@prestashop.com>
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license   https://opensource.org/licenses/AFL-3.0 Academic Free License version 3.0
+ */
+
 
 namespace PrestaShop\Module\PsAccounts\Account\Exception;
 
diff --git a/src/Polyfill/Traits/AdminController/IsAnonymousAllowed.php b/src/Polyfill/Traits/AdminController/IsAnonymousAllowed.php
index d1bc4962f..be71f279e 100644
--- a/src/Polyfill/Traits/AdminController/IsAnonymousAllowed.php
+++ b/src/Polyfill/Traits/AdminController/IsAnonymousAllowed.php
@@ -1,4 +1,23 @@
 <?php
+/**
+ * Copyright since 2007 PrestaShop SA and Contributors
+ * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License version 3.0
+ * that is bundled with this package in the file LICENSE.md.
+ * It is also available through the world-wide-web at this URL:
+ * https://opensource.org/licenses/AFL-3.0
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@prestashop.com so we can send you a copy immediately.
+ *
+ * @author    PrestaShop SA and Contributors <contact@prestashop.com>
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license   https://opensource.org/licenses/AFL-3.0 Academic Free License version 3.0
+ */
+
 
 namespace PrestaShop\Module\PsAccounts\Polyfill\Traits\AdminController;
 
diff --git a/src/Polyfill/Traits/Controller/AjaxRender.php b/src/Polyfill/Traits/Controller/AjaxRender.php
index 72fee5b2b..adabd595d 100644
--- a/src/Polyfill/Traits/Controller/AjaxRender.php
+++ b/src/Polyfill/Traits/Controller/AjaxRender.php
@@ -1,4 +1,23 @@
 <?php
+/**
+ * Copyright since 2007 PrestaShop SA and Contributors
+ * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License version 3.0
+ * that is bundled with this package in the file LICENSE.md.
+ * It is also available through the world-wide-web at this URL:
+ * https://opensource.org/licenses/AFL-3.0
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@prestashop.com so we can send you a copy immediately.
+ *
+ * @author    PrestaShop SA and Contributors <contact@prestashop.com>
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license   https://opensource.org/licenses/AFL-3.0 Academic Free License version 3.0
+ */
+
 
 namespace PrestaShop\Module\PsAccounts\Polyfill\Traits\Controller;
 
diff --git a/src/ServiceContainer/IServiceContainerService.php b/src/ServiceContainer/IServiceContainerService.php
index c88dddf74..e6a03a23c 100644
--- a/src/ServiceContainer/IServiceContainerService.php
+++ b/src/ServiceContainer/IServiceContainerService.php
@@ -1,4 +1,23 @@
 <?php
+/**
+ * Copyright since 2007 PrestaShop SA and Contributors
+ * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License version 3.0
+ * that is bundled with this package in the file LICENSE.md.
+ * It is also available through the world-wide-web at this URL:
+ * https://opensource.org/licenses/AFL-3.0
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@prestashop.com so we can send you a copy immediately.
+ *
+ * @author    PrestaShop SA and Contributors <contact@prestashop.com>
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license   https://opensource.org/licenses/AFL-3.0 Academic Free License version 3.0
+ */
+
 
 namespace PrestaShop\Module\PsAccounts\ServiceContainer;
 
diff --git a/src/ServiceContainer/ParameterNotFoundException.php b/src/ServiceContainer/ParameterNotFoundException.php
index 6ac3aad74..46ab8ac9a 100644
--- a/src/ServiceContainer/ParameterNotFoundException.php
+++ b/src/ServiceContainer/ParameterNotFoundException.php
@@ -1,4 +1,23 @@
 <?php
+/**
+ * Copyright since 2007 PrestaShop SA and Contributors
+ * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License version 3.0
+ * that is bundled with this package in the file LICENSE.md.
+ * It is also available through the world-wide-web at this URL:
+ * https://opensource.org/licenses/AFL-3.0
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@prestashop.com so we can send you a copy immediately.
+ *
+ * @author    PrestaShop SA and Contributors <contact@prestashop.com>
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license   https://opensource.org/licenses/AFL-3.0 Academic Free License version 3.0
+ */
+
 
 namespace PrestaShop\Module\PsAccounts\ServiceContainer;
 
diff --git a/src/ServiceContainer/ServiceContainer.php b/src/ServiceContainer/ServiceContainer.php
index 34d840e8b..3335bd015 100644
--- a/src/ServiceContainer/ServiceContainer.php
+++ b/src/ServiceContainer/ServiceContainer.php
@@ -1,4 +1,23 @@
 <?php
+/**
+ * Copyright since 2007 PrestaShop SA and Contributors
+ * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License version 3.0
+ * that is bundled with this package in the file LICENSE.md.
+ * It is also available through the world-wide-web at this URL:
+ * https://opensource.org/licenses/AFL-3.0
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@prestashop.com so we can send you a copy immediately.
+ *
+ * @author    PrestaShop SA and Contributors <contact@prestashop.com>
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license   https://opensource.org/licenses/AFL-3.0 Academic Free License version 3.0
+ */
+
 
 namespace PrestaShop\Module\PsAccounts\ServiceContainer;
 
diff --git a/src/ServiceContainer/ServiceNotFoundException.php b/src/ServiceContainer/ServiceNotFoundException.php
index ad9969db9..0dc7d2872 100644
--- a/src/ServiceContainer/ServiceNotFoundException.php
+++ b/src/ServiceContainer/ServiceNotFoundException.php
@@ -1,4 +1,23 @@
 <?php
+/**
+ * Copyright since 2007 PrestaShop SA and Contributors
+ * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License version 3.0
+ * that is bundled with this package in the file LICENSE.md.
+ * It is also available through the world-wide-web at this URL:
+ * https://opensource.org/licenses/AFL-3.0
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@prestashop.com so we can send you a copy immediately.
+ *
+ * @author    PrestaShop SA and Contributors <contact@prestashop.com>
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license   https://opensource.org/licenses/AFL-3.0 Academic Free License version 3.0
+ */
+
 
 namespace PrestaShop\Module\PsAccounts\ServiceContainer;
 

From 4dee0aee4206bee953435802c6f7e6b96b866999 Mon Sep 17 00:00:00 2001
From: hschoenenberger <herve.schoenenberger@prestashop.com>
Date: Tue, 5 Nov 2024 09:25:10 +0100
Subject: [PATCH 07/46] fix: php-cs-fixer

---
 .github/workflows/accounts-qc-php.yml         | 45 +------------------
 .../InconsistentAssociationStateException.php |  1 -
 .../AdminController/IsAnonymousAllowed.php    |  1 -
 src/Polyfill/Traits/Controller/AjaxRender.php |  1 -
 .../IServiceContainerService.php              |  1 -
 .../ParameterNotFoundException.php            |  1 -
 src/ServiceContainer/ServiceContainer.php     |  1 -
 .../ServiceNotFoundException.php              |  1 -
 8 files changed, 1 insertion(+), 51 deletions(-)

diff --git a/.github/workflows/accounts-qc-php.yml b/.github/workflows/accounts-qc-php.yml
index ec94ead81..c5e40137b 100755
--- a/.github/workflows/accounts-qc-php.yml
+++ b/.github/workflows/accounts-qc-php.yml
@@ -36,27 +36,8 @@ jobs:
       - name: Run PHP-CS-Fixer
         uses: prestashopcorp/github-action-php-cs-fixer@master
 
-#  phpstan:
-#    name: PHPStan for Prestashop ${{ matrix.presta-versions }}
-#    runs-on: ubuntu-latest
-#    strategy:
-#      matrix:
-#        presta-versions:
-#          - "1.7.7.8-7.1"
-#          - "1.6.1.24-7.1"
-#    steps:
-#      - name: Checkout
-#        uses: actions/checkout@v3
-#
-#      - name: Scoped dependencies
-#        run: make php-scoper
-#
-#      - name: PHPStan
-#        run: |
-#          make phpstan-${{ matrix.presta-versions }}
-
   phpunit:
-    name: PHPUNIT for Prestashop ${{ matrix.presta-versions }}
+    name: Testsuite for Prestashop ${{ matrix.presta-versions }}
     runs-on: ubuntu-latest
     strategy:
       matrix:
@@ -100,30 +81,6 @@ jobs:
         run: |
           make header-stamp-test
 
-#  header-stamp:
-#    name: Check license headers
-#    runs-on: ubuntu-20.04
-#    steps:
-#      - name: Checkout
-#        uses: actions/checkout@v3
-#
-#      - name: Cache vendor folder
-#        uses: actions/cache@v3
-#        with:
-#          path: vendor
-#          key: php-${{ hashFiles('composer.lock') }}
-#
-#      - name: Cache composer folder
-#        uses: actions/cache@v3
-#        with:
-#          path: ~/.composer/cache
-#          key: php-composer-cache
-#
-#      - run: composer install
-#
-#      - name: Run Header Stamp in Dry Run mode
-#        run: php vendor/bin/header-stamp --license=vendor/prestashop/header-stamp/assets/afl.txt --exclude=.github,node_modules,vendor,vendor,tests,_dev --dry-run
-
   notify-earth:
     if: ${{ github.event.action == 'labeled' && github.event.label.name == 'ready to review' }}
     runs-on: ubuntu-latest
diff --git a/src/Account/Exception/InconsistentAssociationStateException.php b/src/Account/Exception/InconsistentAssociationStateException.php
index ff61591f9..0b8380fa0 100644
--- a/src/Account/Exception/InconsistentAssociationStateException.php
+++ b/src/Account/Exception/InconsistentAssociationStateException.php
@@ -18,7 +18,6 @@
  * @license   https://opensource.org/licenses/AFL-3.0 Academic Free License version 3.0
  */
 
-
 namespace PrestaShop\Module\PsAccounts\Account\Exception;
 
 class InconsistentAssociationStateException extends \Exception
diff --git a/src/Polyfill/Traits/AdminController/IsAnonymousAllowed.php b/src/Polyfill/Traits/AdminController/IsAnonymousAllowed.php
index be71f279e..f01e49fe1 100644
--- a/src/Polyfill/Traits/AdminController/IsAnonymousAllowed.php
+++ b/src/Polyfill/Traits/AdminController/IsAnonymousAllowed.php
@@ -18,7 +18,6 @@
  * @license   https://opensource.org/licenses/AFL-3.0 Academic Free License version 3.0
  */
 
-
 namespace PrestaShop\Module\PsAccounts\Polyfill\Traits\AdminController;
 
 if (defined('_PS_VERSION_')
diff --git a/src/Polyfill/Traits/Controller/AjaxRender.php b/src/Polyfill/Traits/Controller/AjaxRender.php
index adabd595d..8cc1c508e 100644
--- a/src/Polyfill/Traits/Controller/AjaxRender.php
+++ b/src/Polyfill/Traits/Controller/AjaxRender.php
@@ -18,7 +18,6 @@
  * @license   https://opensource.org/licenses/AFL-3.0 Academic Free License version 3.0
  */
 
-
 namespace PrestaShop\Module\PsAccounts\Polyfill\Traits\Controller;
 
 use PrestaShopException;
diff --git a/src/ServiceContainer/IServiceContainerService.php b/src/ServiceContainer/IServiceContainerService.php
index e6a03a23c..ec2b1fc35 100644
--- a/src/ServiceContainer/IServiceContainerService.php
+++ b/src/ServiceContainer/IServiceContainerService.php
@@ -18,7 +18,6 @@
  * @license   https://opensource.org/licenses/AFL-3.0 Academic Free License version 3.0
  */
 
-
 namespace PrestaShop\Module\PsAccounts\ServiceContainer;
 
 interface IServiceContainerService
diff --git a/src/ServiceContainer/ParameterNotFoundException.php b/src/ServiceContainer/ParameterNotFoundException.php
index 46ab8ac9a..8503d4fde 100644
--- a/src/ServiceContainer/ParameterNotFoundException.php
+++ b/src/ServiceContainer/ParameterNotFoundException.php
@@ -18,7 +18,6 @@
  * @license   https://opensource.org/licenses/AFL-3.0 Academic Free License version 3.0
  */
 
-
 namespace PrestaShop\Module\PsAccounts\ServiceContainer;
 
 class ParameterNotFoundException extends \Exception
diff --git a/src/ServiceContainer/ServiceContainer.php b/src/ServiceContainer/ServiceContainer.php
index 3335bd015..17ac0cea6 100644
--- a/src/ServiceContainer/ServiceContainer.php
+++ b/src/ServiceContainer/ServiceContainer.php
@@ -18,7 +18,6 @@
  * @license   https://opensource.org/licenses/AFL-3.0 Academic Free License version 3.0
  */
 
-
 namespace PrestaShop\Module\PsAccounts\ServiceContainer;
 
 class ServiceContainer
diff --git a/src/ServiceContainer/ServiceNotFoundException.php b/src/ServiceContainer/ServiceNotFoundException.php
index 0dc7d2872..00bf8e61a 100644
--- a/src/ServiceContainer/ServiceNotFoundException.php
+++ b/src/ServiceContainer/ServiceNotFoundException.php
@@ -18,7 +18,6 @@
  * @license   https://opensource.org/licenses/AFL-3.0 Academic Free License version 3.0
  */
 
-
 namespace PrestaShop\Module\PsAccounts\ServiceContainer;
 
 class ServiceNotFoundException extends \Exception

From a894c77dd709387ca99e5e83bc7855649cefbf64 Mon Sep 17 00:00:00 2001
From: hschoenenberger <herve.schoenenberger@prestashop.com>
Date: Tue, 5 Nov 2024 10:40:12 +0100
Subject: [PATCH 08/46] fix: cleanup

---
 .zip-contents                  |  4 ++-
 .zip-excludes                  |  1 +
 Makefile                       | 17 ++++++------
 config.bulle.php               | 44 ++++++++++++++++++++++++++++++
 config.dist.php                | 48 ++++++++++++++++++++++++++++++++
 config.php => config.local.php |  0
 config.preprod.php             | 50 ++++++++++++++++++++++++++++++++++
 config.prod.php                | 40 +++++++++++++++++++++++++++
 config/admin/services.yml      |  2 --
 config/config.yml.dist         | 35 ------------------------
 config/front/services.yml      |  2 --
 scripts/bundle-module.sh       |  4 +--
 12 files changed, 197 insertions(+), 50 deletions(-)
 create mode 100644 config.bulle.php
 create mode 100644 config.dist.php
 rename config.php => config.local.php (100%)
 create mode 100644 config.preprod.php
 create mode 100644 config.prod.php
 delete mode 100644 config/admin/services.yml
 delete mode 100644 config/config.yml.dist
 delete mode 100644 config/front/services.yml

diff --git a/.zip-contents b/.zip-contents
index c4d59caeb..4078b43d5 100644
--- a/.zip-contents
+++ b/.zip-contents
@@ -1,4 +1,3 @@
-config
 controllers
 sql
 src
@@ -7,6 +6,9 @@ upgrade
 vendor
 views
 config.php
+config.local.php
+config.prod.php
+config.preprod.php
 config.xml
 LICENSE
 logo.png
diff --git a/.zip-excludes b/.zip-excludes
index 837d650d4..f6cbd7edc 100644
--- a/.zip-excludes
+++ b/.zip-excludes
@@ -5,6 +5,7 @@
 *.idea/*
 *tests/*
 *config/config.yml.*
+*config.*.php
 *.bak/*
 *.md/*
 *composer.*
diff --git a/Makefile b/Makefile
index e505edb3c..5c191e0b5 100644
--- a/Makefile
+++ b/Makefile
@@ -57,9 +57,10 @@ platform-stop:
 
 platform-restart: platform-stop platform-start
 
-platform-module-config:
+.PHONY: config.php
+config.php:
 	@docker exec -w ${CONTAINER_INSTALL_DIR} phpunit \
-		sh -c "if [ ! -f ./config/config.yml ]; then cp ./config/config.yml.dist ./config/config.yml; fi"
+		sh -c "if [ ! -f ./config.php ]; then cp ./config.dist.php ./config.php; fi"
 
 platform-module-version:
 	@docker exec -w ${CONTAINER_INSTALL_DIR} phpunit \
@@ -70,7 +71,7 @@ platform-phpstan-config:
 	@docker exec -w ${CONTAINER_INSTALL_DIR}/tests phpunit \
 		sh -c "if [ -f ./phpstan/${NEON_FILE} ]; then cp ./phpstan/${NEON_FILE} ./phpstan/phpstan.neon; fi"
 
-platform-module-install: tests/vendor platform-phpstan-config platform-module-config platform-module-version
+platform-module-install: tests/vendor platform-phpstan-config config.php platform-module-version
 	-@docker exec phpunit sh -c "if [ -f ./bin/console ]; then php -d memory_limit=-1 ./bin/console prestashop:module install ps_accounts; fi"
 	-@docker exec phpunit sh -c "if [ ! -f ./bin/console ]; then php -d memory_limit=-1 ./modules/ps_accounts/tests/install-module.php; fi"
 
@@ -189,7 +190,7 @@ header-stamp-test:
 	phpunit ./tests/vendor/bin/header-stamp \
 	--target="${WORKDIR}" \
 	--license=./tests/vendor/prestashop/header-stamp/assets/afl.txt \
-	--exclude=.github,node_modules,vendor,vendor,tests,_dev \
+	--exclude=.github,node_modules,vendor,dist,tests,_dev \
 	--dry-run
 
 header-stamp:
@@ -197,7 +198,7 @@ header-stamp:
 	phpunit ./tests/vendor/bin/header-stamp \
 	--target="${WORKDIR}" \
 	--license=./tests/vendor/prestashop/header-stamp/assets/afl.txt \
-	--exclude=.github,node_modules,vendor,vendor,tests,_dev
+	--exclude=.github,node_modules,vendor,dist,tests,_dev
 
 #phpstan16: NEON_FILE := phpstan-PS-1.6.neon
 #phpstan16: phpstan
@@ -273,13 +274,13 @@ BUNDLE_ZIP ?= # ex: ps_accounts_flavor.zip
 BUNDLE_VERSION ?= $(shell grep "<version>" config.xml | sed 's/^.*\([0-9]\+\.[0-9]\+\.[0-9]\+\).*/\1/')
 BUNDLE_JS ?= views/js/app.${BUNDLE_VERSION}.js
 
-bundle: php-scoper config/config.yml build-front
+bundle: php-scoper build-front
 	@./scripts/bundle-module.sh "${BUNDLE_ZIP}" "${BUNDLE_ENV}"
 
-bundle-prod: php-scoper config/config.yml.prod build-front
+bundle-prod: php-scoper config.php.prod build-front
 	@./scripts/bundle-module.sh "ps_accounts.zip" "prod"
 
-bundle-preprod: php-scoper config/config.yml.preprod build-front
+bundle-preprod: php-scoper config.php.preprod build-front
 	@./scripts/bundle-module.sh "ps_accounts_preprod.zip" "preprod"
 
 define build_front
diff --git a/config.bulle.php b/config.bulle.php
new file mode 100644
index 000000000..11a8dc3c0
--- /dev/null
+++ b/config.bulle.php
@@ -0,0 +1,44 @@
+<?php
+/**
+ * Copyright since 2007 PrestaShop SA and Contributors
+ * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License version 3.0
+ * that is bundled with this package in the file LICENSE.md.
+ * It is also available through the world-wide-web at this URL:
+ * https://opensource.org/licenses/AFL-3.0
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@prestashop.com so we can send you a copy immediately.
+ *
+ * @author    PrestaShop SA and Contributors <contact@prestashop.com>
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license   https://opensource.org/licenses/AFL-3.0 Academic Free License version 3.0
+ */
+
+return [
+    'ps_accounts.environment' => 'integration',
+    'ps_accounts.accounts_api_url' => 'https://accounts-api-prestabulle2.distribution-integration.prestashop.net/',
+    'ps_accounts.accounts_ui_url' => 'https://accounts-prestabulle2.distribution-integration.prestashop.net',
+    'ps_accounts.sso_account_url' => 'https://prestashop-newsso-staging.appspot.com/login',
+    'ps_accounts.sso_resend_verification_email_url' => 'https://prestashop-newsso-staging.appspot.com/account/send-verification-email',
+    'ps_accounts.billing_api_url' => 'https://billing-api.distribution-preprod.prestashop.net/',
+    'ps_accounts.indirect_channel_api_url' => 'https://indirect-channel-api-preprod.prestashop.net',
+    'ps_accounts.sentry_credentials' => 'https://a065bd1f092f8c849e6076fe0640d049@o298402.ingest.us.sentry.io/5354585',
+    'ps_accounts.segment_write_key' => 'eYODaH20rT1lMRTTUtAa15BKBlV1XUXQ',
+    'ps_accounts.accounts_vue_cdn_url' => 'https://unpkg.com/prestashop_accounts_vue_components@3/dist/psaccountsVue.umd.min.js',
+    'ps_accounts.accounts_cdn_url' => 'https://unpkg.com/prestashop_accounts_vue_components@5',
+    'ps_accounts.svc_accounts_ui_url' => 'https://accounts.psessentials-integration.net',
+    'ps_accounts.oauth2_url' => 'https://oauth-integration.prestashop.com',
+    //ps_accounts.oauth2_url_authorize' => 'https://oauth-integration.prestashop.com/oauth2/auth'
+    //ps_accounts.oauth2_url_access_token' => 'https://oauth-integration.prestashop.com/oauth2/token'
+    //ps_accounts.oauth2_url_resource_owner_details' => 'https://oauth-integration.prestashop.com/userinfo'
+    //ps_accounts.oauth2_url_session_logout' => 'https://oauth-integration.prestashop.com/oauth2/sessions/logout'
+
+    'ps_accounts.testimonials_url' => 'https://assets.prestashop3.com/dst/accounts/assets/testimonials.json',
+
+    'ps_accounts.check_api_ssl_cert' => true,
+    'ps_accounts.verify_account_tokens' => true,
+];
diff --git a/config.dist.php b/config.dist.php
new file mode 100644
index 000000000..8362eaa15
--- /dev/null
+++ b/config.dist.php
@@ -0,0 +1,48 @@
+<?php
+/**
+ * Copyright since 2007 PrestaShop SA and Contributors
+ * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License version 3.0
+ * that is bundled with this package in the file LICENSE.md.
+ * It is also available through the world-wide-web at this URL:
+ * https://opensource.org/licenses/AFL-3.0
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@prestashop.com so we can send you a copy immediately.
+ *
+ * @author    PrestaShop SA and Contributors <contact@prestashop.com>
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license   https://opensource.org/licenses/AFL-3.0 Academic Free License version 3.0
+ */
+
+return [
+    'ps_accounts.accounts_api_url' => 'https://accounts-api.prestashop.localhost/',
+    'ps_accounts.accounts_ui_url' => 'https://accounts.prestashop.localhost',
+    'ps_accounts.sso_api_url' => 'https://auth-preprod.prestashop.com/api/v1/',
+    'ps_accounts.sso_account_url' => 'https://authv2-preprod.prestashop.com/login',
+    'ps_accounts.sso_resend_verification_email_url' => 'https://auth-preprod.prestashop.com/account/send-verification-email',
+    'ps_accounts.billing_api_url' => 'https://billing-api.psessentials-integration.net',
+    'ps_accounts.sentry_credentials' => 'https://4c7f6c8dd5aa405b8401a35f5cf26ada@o298402.ingest.sentry.io/5354585',
+    'ps_accounts.segment_write_key' => 'UITzSdsFTgYsXaiJG09hsCiupUPwgJQB',
+    'ps_accounts.check_api_ssl_cert' => false,
+    'ps_accounts.verify_account_tokens' => false,
+    'ps_accounts.accounts_vue_cdn_url' => 'https://unpkg.com/prestashop_accounts_vue_components@3/dist/psaccountsVue.umd.min.js',
+    'ps_accounts.accounts_cdn_url' => 'https://unpkg.com/prestashop_accounts_vue_components@4/dist/psaccountsVue.umd.min.js',
+    'ps_accounts.environment' => 'development',
+
+    // a page to display "Update Your Module" message
+    'ps_accounts.svc_accounts_ui_url' => 'https://accounts.psessentials-integration.net',
+
+    // OAuth2 configuration url
+    'ps_accounts.oauth2_url' => 'https://oauth.prestashop.localhost',
+
+    // Login page testimonials url
+    'ps_accounts.testimonials_url' => 'https://assets.prestashop3.com/dst/accounts/assets/testimonials.json',
+
+    // optional log level (defaults to ERROR)
+    //ps_accounts.log_level' => !php/const PrestaShop\Module\PsAccounts\Log\Logger::ERROR
+    'ps_accounts.log_level' => 'ERROR',
+];
diff --git a/config.php b/config.local.php
similarity index 100%
rename from config.php
rename to config.local.php
diff --git a/config.preprod.php b/config.preprod.php
new file mode 100644
index 000000000..ba9079d08
--- /dev/null
+++ b/config.preprod.php
@@ -0,0 +1,50 @@
+<?php
+/**
+ * Copyright since 2007 PrestaShop SA and Contributors
+ * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License version 3.0
+ * that is bundled with this package in the file LICENSE.md.
+ * It is also available through the world-wide-web at this URL:
+ * https://opensource.org/licenses/AFL-3.0
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@prestashop.com so we can send you a copy immediately.
+ *
+ * @author    PrestaShop SA and Contributors <contact@prestashop.com>
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license   https://opensource.org/licenses/AFL-3.0 Academic Free License version 3.0
+ */
+
+return [
+    'ps_accounts.segment_write_key' => 'eYODaH20rT1lMRTTUtAa15BKBlV1XUXQ',
+    'ps_accounts.accounts_api_url' => 'https://accounts-api.distribution-preprod.prestashop.net/',
+    'ps_accounts.accounts_ui_url' => 'https://accounts.distribution-preprod.prestashop.net',
+    'ps_accounts.billing_api_url' => 'https://billing-api.distribution-preprod.prestashop.net/',
+    'ps_accounts.sso_api_url' => 'https://auth-preprod.prestashop.com/api/v1/',
+    'ps_accounts.sso_account_url' => 'https://authv2-preprod.prestashop.com/login',
+    'ps_accounts.indirect_channel_api_url' => 'https://indirect-channel-api-preprod.prestashop.net',
+    'ps_accounts.segment_api_key' => 'yO1sKx3Xe9upW4bRDoRXEB0TZEXQm2y3',
+    'ps_accounts.sso_resend_verification_email_url' => 'https://auth-preprod.prestashop.com/account/send-verification-email',
+    'ps_accounts.sentry_credentials' => 'https://a065bd1f092f8c849e6076fe0640d049@o298402.ingest.us.sentry.io/5354585',
+    'ps_accounts.accounts_vue_cdn_url' => 'https://unpkg.com/prestashop_accounts_vue_components/dist/psaccountsVue.js',
+    'ps_accounts.accounts_cdn_url' => 'https://unpkg.com/prestashop_accounts_vue_components/dist/psaccountsVue.js',
+
+    'ps_accounts.environment' => 'preprod',
+
+    // whether to check ssl certificate when calling external api
+    'ps_accounts.check_api_ssl_cert' => true,
+    // whether to verify tokens while storing link account
+    'ps_accounts.verify_account_tokens' => true,
+
+    // a page to display "Update Your Module" message
+    'ps_accounts.svc_accounts_ui_url' => 'https://accounts.psessentials-integration.net',
+
+    'ps_accounts.oauth2_url' => 'https://oauth-preprod.prestashop.com',
+
+    'ps_accounts.testimonials_url' => 'https://assets.prestashop3.com/dst/accounts/assets/testimonials.json',
+
+    'ps_accounts.log_level' => 'ERROR',
+];
diff --git a/config.prod.php b/config.prod.php
new file mode 100644
index 000000000..3d12e757f
--- /dev/null
+++ b/config.prod.php
@@ -0,0 +1,40 @@
+<?php
+/**
+ * Copyright since 2007 PrestaShop SA and Contributors
+ * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License version 3.0
+ * that is bundled with this package in the file LICENSE.md.
+ * It is also available through the world-wide-web at this URL:
+ * https://opensource.org/licenses/AFL-3.0
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@prestashop.com so we can send you a copy immediately.
+ *
+ * @author    PrestaShop SA and Contributors <contact@prestashop.com>
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license   https://opensource.org/licenses/AFL-3.0 Academic Free License version 3.0
+ */
+
+return [
+    'ps_accounts.environment' => 'production',
+    'ps_accounts.accounts_api_url' => 'https://accounts-api.distribution.prestashop.net/',
+    'ps_accounts.accounts_ui_url' => 'https://accounts.distribution.prestashop.net',
+    'ps_accounts.sso_api_url' => 'https://auth.prestashop.com/api/v1/',
+    'ps_accounts.sso_account_url' => 'https://auth.prestashop.com/login',
+    'ps_accounts.sso_resend_verification_email_url' => 'https://auth.prestashop.com/account/send-verification-email',
+    'ps_accounts.billing_api_url' => 'https://billing-api.distribution.prestashop.net/',
+    'ps_accounts.indirect_channel_api_url' => 'https://indirect-channel-api.prestashop.net',
+    'ps_accounts.sentry_credentials' => 'https://cd2a5f089edb6d6efe742c0cbe004106@o298402.ingest.us.sentry.io/5354585',
+    'ps_accounts.segment_write_key' => 'pEJGnRxw47CU01efFjMyl1S7YcxshLxl',
+    'ps_accounts.check_api_ssl_cert' => true,
+    'ps_accounts.verify_account_tokens' => true,
+    'ps_accounts.accounts_vue_cdn_url' => 'https://unpkg.com/prestashop_accounts_vue_components@3/dist/psaccountsVue.umd.min.js',
+    'ps_accounts.accounts_cdn_url' => 'https://unpkg.com/prestashop_accounts_vue_components@5',
+    'ps_accounts.svc_accounts_ui_url' => 'https://accounts.psessentials.net',
+    'ps_accounts.oauth2_url' => 'https://oauth.prestashop.com',
+
+    'ps_accounts.testimonials_url' => 'https://assets.prestashop3.com/dst/accounts/assets/testimonials.json',
+];
diff --git a/config/admin/services.yml b/config/admin/services.yml
deleted file mode 100644
index 2cdfaacf2..000000000
--- a/config/admin/services.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-imports:
-  - { resource: ../config.yml }
diff --git a/config/config.yml.dist b/config/config.yml.dist
deleted file mode 100644
index 549942790..000000000
--- a/config/config.yml.dist
+++ /dev/null
@@ -1,35 +0,0 @@
-parameters:
-  # In case you need to override with environment variables, you can follow this example :
-  # env(PS_ACCOUNTS_SENTRY_CREDENTIALS): 'https://4c7f6c8dd5aa405b8401a35f5cf26ada@o298402.ingest.sentry.io/5354585'
-  # sentry.credentials: '%env(string:PS_ACCOUNTS_SENTRY_CREDENTIALS)%'
-  #
-  # In order to manage multiple config files you can use PS_ACCOUNTS_ENV=[myenv] environment variable
-  # to load a specific services_[myenv].yml
-
-  ps_accounts.accounts_api_url: 'https://accounts-api.prestashop.localhost/'
-  ps_accounts.accounts_ui_url: 'https://accounts.prestashop.localhost'
-  ps_accounts.sso_api_url: 'https://auth-preprod.prestashop.com/api/v1/'
-  ps_accounts.sso_account_url: 'https://authv2-preprod.prestashop.com/login'
-  ps_accounts.sso_resend_verification_email_url: 'https://auth-preprod.prestashop.com/account/send-verification-email'
-  ps_accounts.billing_api_url: 'https://billing-api.psessentials-integration.net'
-  ps_accounts.sentry_credentials: 'https://4c7f6c8dd5aa405b8401a35f5cf26ada@o298402.ingest.sentry.io/5354585'
-  ps_accounts.segment_write_key: 'UITzSdsFTgYsXaiJG09hsCiupUPwgJQB'
-  ps_accounts.check_api_ssl_cert: false
-  ps_accounts.verify_account_tokens: false
-  ps_accounts.accounts_vue_cdn_url: 'https://unpkg.com/prestashop_accounts_vue_components@3/dist/psaccountsVue.umd.min.js'
-  ps_accounts.accounts_cdn_url: 'https://unpkg.com/prestashop_accounts_vue_components@4/dist/psaccountsVue.umd.min.js'
-  ps_accounts.environment: 'development'
-
-  # a page to display "Update Your Module" message
-  ps_accounts.svc_accounts_ui_url: 'https://accounts.psessentials-integration.net'
-
-  # OAuth2 configuration url
-  ps_accounts.oauth2_url: 'https://oauth.prestashop.localhost'
-
-  # Login page testimonials url
-  ps_accounts.testimonials_url: 'https://assets.prestashop3.com/dst/accounts/assets/testimonials.json'
-
-  # optional log level (defaults to ERROR)
-  #ps_accounts.log_level: !php/const PrestaShop\Module\PsAccounts\Log\Logger::ERROR
-  ps_accounts.log_level: ERROR
-
diff --git a/config/front/services.yml b/config/front/services.yml
deleted file mode 100644
index 2cdfaacf2..000000000
--- a/config/front/services.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-imports:
-  - { resource: ../config.yml }
diff --git a/scripts/bundle-module.sh b/scripts/bundle-module.sh
index 12a904187..b5d005187 100755
--- a/scripts/bundle-module.sh
+++ b/scripts/bundle-module.sh
@@ -30,10 +30,10 @@ cd $dist || exit;
 
 # switch request configuration env
 if [ "$environment" ]; then
-  configFileEnv="./${module}/config/config.yml.${environment}"
+  configFileEnv="./${module}/config.${environment}.php"
   if [ -f "$configFileEnv" ]; then
     echo "using provided environment [${environment}]"
-    cp "$configFileEnv" "./${module}/config/config.yml"
+    cp "$configFileEnv" "./${module}/config.php"
   else
     echo "file not found [${configFileEnv}]"
   fi

From 1290d3b0cc9c1c7eb17d964c759c9c5dd7eb7205 Mon Sep 17 00:00:00 2001
From: hschoenenberger <herve.schoenenberger@prestashop.com>
Date: Tue, 5 Nov 2024 16:38:40 +0100
Subject: [PATCH 09/46] refactor: create provider files

---
 config.local.php                              |   2 +-
 .../CommandHandler/DeleteUserShopHandler.php  |  19 +--
 .../CommandHandler/LinkShopHandler.php        |  16 +-
 .../MigrateAndLinkV4ShopHandler.php           |  75 ---------
 .../CommandHandler/UnlinkShopHandler.php      |  18 +--
 .../CommandHandler/UpdateUserShopHandler.php  |  19 +--
 .../CommandHandler/UpgradeModuleHandler.php   |  21 +--
 .../UpgradeModuleMultiHandler.php             |  17 +-
 src/Account/LinkShop.php                      |  16 +-
 src/Account/Session/Firebase/OwnerSession.php |  17 +-
 src/Account/Session/Firebase/ShopSession.php  |  17 +-
 src/Account/Session/ShopSession.php           |  19 +--
 src/Adapter/Configuration.php                 |  17 +-
 src/Adapter/Link.php                          |  16 +-
 src/Api/Client/AccountsClient.php             |  18 +--
 src/Api/Client/ServicesBillingClient.php      |  18 +--
 src/Context/ShopContext.php                   |  17 +-
 src/Cqrs/CommandBus.php                       |  17 +-
 src/Factory/CircuitBreakerFactory.php         |  16 +-
 src/Installer/Installer.php                   |  17 +-
 src/Middleware/Oauth2Middleware.php           |  16 +-
 src/Presenter/PsAccountsPresenter.php         |  16 +-
 src/Provider/OAuth2/Oauth2Client.php          |  16 +-
 src/Provider/OAuth2/PrestaShopSession.php     |  14 +-
 src/Provider/OAuth2/ShopProvider.php          |  14 +-
 src/Provider/RsaKeysProvider.php              |  16 +-
 src/Provider/ShopProvider.php                 |  17 +-
 src/Repository/ConfigurationRepository.php    |  16 +-
 src/Repository/ShopTokenRepository.php        |  16 +-
 src/Repository/UserTokenRepository.php        |  16 +-
 src/Service/AnalyticsService.php              |  17 +-
 src/Service/PsAccountsService.php             |  16 +-
 src/Service/PsBillingService.php              |  18 +--
 src/Service/SentryService.php                 |  19 +--
 .../IServiceContainerService.php              |   4 +-
 .../Contract/IServiceProvider.php             |  33 ++++
 .../ParameterNotFoundException.php            |   2 +-
 .../Exception/ProviderNotFoundException.php   |  25 +++
 .../ServiceNotFoundException.php              |   2 +-
 .../Provider/ApiClientProvider.php            |  54 +++++++
 .../Provider/CommandProvider.php              |  90 +++++++++++
 .../Provider/DefaultProvider.php              | 150 ++++++++++++++++++
 .../Provider/OAuth2Provider.php               |  58 +++++++
 .../Provider/RepositoryProvider.php           |  58 +++++++
 .../Provider/SessionProvider.php              |  63 ++++++++
 src/ServiceContainer/ServiceContainer.php     | 123 +++++++++++---
 46 files changed, 669 insertions(+), 612 deletions(-)
 delete mode 100644 src/Account/CommandHandler/MigrateAndLinkV4ShopHandler.php
 rename src/ServiceContainer/{ => Contract}/IServiceContainerService.php (88%)
 create mode 100644 src/ServiceContainer/Contract/IServiceProvider.php
 rename src/ServiceContainer/{ => Exception}/ParameterNotFoundException.php (92%)
 create mode 100644 src/ServiceContainer/Exception/ProviderNotFoundException.php
 rename src/ServiceContainer/{ => Exception}/ServiceNotFoundException.php (92%)
 create mode 100644 src/ServiceContainer/Provider/ApiClientProvider.php
 create mode 100644 src/ServiceContainer/Provider/CommandProvider.php
 create mode 100644 src/ServiceContainer/Provider/DefaultProvider.php
 create mode 100644 src/ServiceContainer/Provider/OAuth2Provider.php
 create mode 100644 src/ServiceContainer/Provider/RepositoryProvider.php
 create mode 100644 src/ServiceContainer/Provider/SessionProvider.php

diff --git a/config.local.php b/config.local.php
index 498dc7f82..c986fa2de 100644
--- a/config.local.php
+++ b/config.local.php
@@ -44,5 +44,5 @@
     'ps_accounts.oauth2_url' => 'https://oauth.prestashop.local',
 
     'ps_accounts.testimonials_url' => 'https://assets.prestashop3.com/dst/accounts/assets/testimonials.json',
-    'ps_accounts.log_level' => 'DEBUG',
+    'ps_accounts.log_level' => 'ERROR',
 ];
diff --git a/src/Account/CommandHandler/DeleteUserShopHandler.php b/src/Account/CommandHandler/DeleteUserShopHandler.php
index c4ffcefe4..d13c6c6eb 100644
--- a/src/Account/CommandHandler/DeleteUserShopHandler.php
+++ b/src/Account/CommandHandler/DeleteUserShopHandler.php
@@ -26,10 +26,8 @@
 use PrestaShop\Module\PsAccounts\Api\Client\AccountsClient;
 use PrestaShop\Module\PsAccounts\Context\ShopContext;
 use PrestaShop\Module\PsAccounts\Exception\RefreshTokenException;
-use PrestaShop\Module\PsAccounts\ServiceContainer\IServiceContainerService;
-use PrestaShop\Module\PsAccounts\ServiceContainer\ServiceContainer;
 
-class DeleteUserShopHandler implements IServiceContainerService
+class DeleteUserShopHandler
 {
     /**
      * @var AccountsClient
@@ -89,19 +87,4 @@ public function handle(DeleteUserShopCommand $command)
             );
         });
     }
-
-    /**
-     * @param ServiceContainer $serviceContainer
-     *
-     * @return self
-     */
-    public static function getInstance(ServiceContainer $serviceContainer)
-    {
-        return new self(
-            $serviceContainer->get(AccountsClient::class),
-            $serviceContainer->get(ShopContext::class),
-            $serviceContainer->get(ShopSession::class),
-            $serviceContainer->get(OwnerSession::class)
-        );
-    }
 }
diff --git a/src/Account/CommandHandler/LinkShopHandler.php b/src/Account/CommandHandler/LinkShopHandler.php
index 0d93036b5..2b8b429a9 100644
--- a/src/Account/CommandHandler/LinkShopHandler.php
+++ b/src/Account/CommandHandler/LinkShopHandler.php
@@ -24,11 +24,9 @@
 use PrestaShop\Module\PsAccounts\Account\Command\LinkShopCommand;
 use PrestaShop\Module\PsAccounts\Account\LinkShop;
 use PrestaShop\Module\PsAccounts\Hook\ActionShopAccountLinkAfter;
-use PrestaShop\Module\PsAccounts\ServiceContainer\IServiceContainerService;
-use PrestaShop\Module\PsAccounts\ServiceContainer\ServiceContainer;
 use PrestaShopException;
 
-class LinkShopHandler implements IServiceContainerService
+class LinkShopHandler
 {
     /**
      * @var LinkShop
@@ -56,16 +54,4 @@ public function handle(LinkShopCommand $command)
             'shopId' => $command->payload->shopId,
         ]);
     }
-
-    /**
-     * @param ServiceContainer $serviceContainer
-     *
-     * @return self
-     */
-    public static function getInstance(ServiceContainer $serviceContainer)
-    {
-        return new self(
-            $serviceContainer->get(LinkShop::class)
-        );
-    }
 }
diff --git a/src/Account/CommandHandler/MigrateAndLinkV4ShopHandler.php b/src/Account/CommandHandler/MigrateAndLinkV4ShopHandler.php
deleted file mode 100644
index 806bd59c7..000000000
--- a/src/Account/CommandHandler/MigrateAndLinkV4ShopHandler.php
+++ /dev/null
@@ -1,75 +0,0 @@
-<?php
-/**
- * Copyright since 2007 PrestaShop SA and Contributors
- * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License version 3.0
- * that is bundled with this package in the file LICENSE.md.
- * It is also available through the world-wide-web at this URL:
- * https://opensource.org/licenses/AFL-3.0
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@prestashop.com so we can send you a copy immediately.
- *
- * @author    PrestaShop SA and Contributors <contact@prestashop.com>
- * @copyright Since 2007 PrestaShop SA and Contributors
- * @license   https://opensource.org/licenses/AFL-3.0 Academic Free License version 3.0
- */
-
-namespace PrestaShop\Module\PsAccounts\Account\CommandHandler;
-
-use PrestaShop\Module\PsAccounts\Account\Command\MigrateAndLinkV4ShopCommand;
-use PrestaShop\Module\PsAccounts\Account\Session\Firebase\ShopSession;
-use PrestaShop\Module\PsAccounts\Api\Client\AccountsClient;
-use PrestaShop\Module\PsAccounts\Context\ShopContext;
-use PrestaShop\Module\PsAccounts\Exception\RefreshTokenException;
-
-class MigrateAndLinkV4ShopHandler
-{
-    /**
-     * @var AccountsClient
-     */
-    private $accountClient;
-
-    /**
-     * @var ShopContext
-     */
-    private $shopContext;
-
-    /**
-     * @var ShopSession
-     */
-    private $shopSession;
-
-    public function __construct(
-        AccountsClient $accountClient,
-        ShopContext $shopContext,
-        ShopSession $shopSession
-    ) {
-        $this->accountClient = $accountClient;
-        $this->shopContext = $shopContext;
-        $this->shopSession = $shopSession;
-    }
-
-    /**
-     * @param MigrateAndLinkV4ShopCommand $command
-     *
-     * @return array
-     *
-     * @throws RefreshTokenException
-     */
-    public function handle(MigrateAndLinkV4ShopCommand $command)
-    {
-        return $this->shopContext->execInShopContext((int) $command->shopId, function () use ($command) {
-            $shopToken = $this->shopSession->getValidToken();
-
-            return $this->accountClient->reonboardShop(
-                $shopToken->getUuid(),
-                $shopToken->getJwt(),
-                $command->payload
-            );
-        });
-    }
-}
diff --git a/src/Account/CommandHandler/UnlinkShopHandler.php b/src/Account/CommandHandler/UnlinkShopHandler.php
index d035a3312..a70a9d23e 100644
--- a/src/Account/CommandHandler/UnlinkShopHandler.php
+++ b/src/Account/CommandHandler/UnlinkShopHandler.php
@@ -26,10 +26,8 @@
 use PrestaShop\Module\PsAccounts\Hook\ActionShopAccountUnlinkAfter;
 use PrestaShop\Module\PsAccounts\Provider\ShopProvider;
 use PrestaShop\Module\PsAccounts\Service\AnalyticsService;
-use PrestaShop\Module\PsAccounts\ServiceContainer\IServiceContainerService;
-use PrestaShop\Module\PsAccounts\ServiceContainer\ServiceContainer;
 
-class UnlinkShopHandler implements IServiceContainerService
+class UnlinkShopHandler
 {
     /**
      * @var LinkShop
@@ -101,18 +99,4 @@ public function handle(UnlinkShopCommand $command)
 
         Hook::exec(ActionShopAccountUnlinkAfter::getName(), $hookData);
     }
-
-    /**
-     * @param ServiceContainer $serviceContainer
-     *
-     * @return self
-     */
-    public static function getInstance(ServiceContainer $serviceContainer)
-    {
-        return new self(
-            $serviceContainer->get(LinkShop::class),
-            $serviceContainer->get(AnalyticsService::class),
-            $serviceContainer->get(ShopProvider::class)
-        );
-    }
 }
diff --git a/src/Account/CommandHandler/UpdateUserShopHandler.php b/src/Account/CommandHandler/UpdateUserShopHandler.php
index 920952d1c..01051ecf3 100644
--- a/src/Account/CommandHandler/UpdateUserShopHandler.php
+++ b/src/Account/CommandHandler/UpdateUserShopHandler.php
@@ -26,10 +26,8 @@
 use PrestaShop\Module\PsAccounts\Api\Client\AccountsClient;
 use PrestaShop\Module\PsAccounts\Context\ShopContext;
 use PrestaShop\Module\PsAccounts\Exception\RefreshTokenException;
-use PrestaShop\Module\PsAccounts\ServiceContainer\IServiceContainerService;
-use PrestaShop\Module\PsAccounts\ServiceContainer\ServiceContainer;
 
-class UpdateUserShopHandler implements IServiceContainerService
+class UpdateUserShopHandler
 {
     /**
      * @var AccountsClient
@@ -90,19 +88,4 @@ public function handle(UpdateUserShopCommand $command)
             );
         });
     }
-
-    /**
-     * @param ServiceContainer $serviceContainer
-     *
-     * @return self
-     */
-    public static function getInstance(ServiceContainer $serviceContainer)
-    {
-        return new self(
-            $serviceContainer->get(AccountsClient::class),
-            $serviceContainer->get(ShopContext::class),
-            $serviceContainer->get(ShopSession::class),
-            $serviceContainer->get(OwnerSession::class)
-        );
-    }
 }
diff --git a/src/Account/CommandHandler/UpgradeModuleHandler.php b/src/Account/CommandHandler/UpgradeModuleHandler.php
index 374069b02..e41d6539a 100644
--- a/src/Account/CommandHandler/UpgradeModuleHandler.php
+++ b/src/Account/CommandHandler/UpgradeModuleHandler.php
@@ -31,10 +31,8 @@
 use PrestaShop\Module\PsAccounts\Exception\RefreshTokenException;
 use PrestaShop\Module\PsAccounts\Log\Logger;
 use PrestaShop\Module\PsAccounts\Repository\ConfigurationRepository;
-use PrestaShop\Module\PsAccounts\ServiceContainer\IServiceContainerService;
-use PrestaShop\Module\PsAccounts\ServiceContainer\ServiceContainer;
 
-class UpgradeModuleHandler implements IServiceContainerService
+class UpgradeModuleHandler
 {
     /**
      * @var LinkShop
@@ -166,21 +164,4 @@ private function lastChanceToRefreshShopToken()
             $tokens['refresh_token']
         );
     }
-
-    /**
-     * @param ServiceContainer $serviceContainer
-     *
-     * @return self
-     */
-    public static function getInstance(ServiceContainer $serviceContainer)
-    {
-        return new self(
-            $serviceContainer->get(AccountsClient::class),
-            $serviceContainer->get(LinkShop::class),
-            $serviceContainer->get(ShopSession::class),
-            $serviceContainer->get(ShopContext::class),
-            $serviceContainer->get(ConfigurationRepository::class),
-            $serviceContainer->get(CommandBus::class)
-        );
-    }
 }
diff --git a/src/Account/CommandHandler/UpgradeModuleMultiHandler.php b/src/Account/CommandHandler/UpgradeModuleMultiHandler.php
index a028bf1b5..aa59f8025 100644
--- a/src/Account/CommandHandler/UpgradeModuleMultiHandler.php
+++ b/src/Account/CommandHandler/UpgradeModuleMultiHandler.php
@@ -27,11 +27,9 @@
 use PrestaShop\Module\PsAccounts\Exception\DtoException;
 use PrestaShop\Module\PsAccounts\Exception\RefreshTokenException;
 use PrestaShop\Module\PsAccounts\Repository\ConfigurationRepository;
-use PrestaShop\Module\PsAccounts\ServiceContainer\IServiceContainerService;
-use PrestaShop\Module\PsAccounts\ServiceContainer\ServiceContainer;
 use PrestaShopDatabaseException;
 
-class UpgradeModuleMultiHandler implements IServiceContainerService
+class UpgradeModuleMultiHandler
 {
     /**
      * @var ConfigurationRepository
@@ -95,17 +93,4 @@ private function getShops($multishop)
 
         return $shops;
     }
-
-    /**
-     * @param ServiceContainer $serviceContainer
-     *
-     * @return self
-     */
-    public static function getInstance(ServiceContainer $serviceContainer)
-    {
-        return new self(
-            $serviceContainer->get(CommandBus::class),
-            $serviceContainer->get(ConfigurationRepository::class)
-        );
-    }
 }
diff --git a/src/Account/LinkShop.php b/src/Account/LinkShop.php
index ee1c92aea..962e351b8 100644
--- a/src/Account/LinkShop.php
+++ b/src/Account/LinkShop.php
@@ -21,10 +21,8 @@
 namespace PrestaShop\Module\PsAccounts\Account;
 
 use PrestaShop\Module\PsAccounts\Repository\ConfigurationRepository;
-use PrestaShop\Module\PsAccounts\ServiceContainer\IServiceContainerService;
-use PrestaShop\Module\PsAccounts\ServiceContainer\ServiceContainer;
 
-class LinkShop implements IServiceContainerService
+class LinkShop
 {
     /**
      * @var ConfigurationRepository
@@ -191,16 +189,4 @@ public function setUnlinkedOnError($errorMsg)
     {
         $this->configuration->updateUnlinkedOnError($errorMsg);
     }
-
-    /**
-     * @param ServiceContainer $serviceContainer
-     *
-     * @return self
-     */
-    public static function getInstance(ServiceContainer $serviceContainer)
-    {
-        return new self(
-            $serviceContainer->get(ConfigurationRepository::class)
-        );
-    }
 }
diff --git a/src/Account/Session/Firebase/OwnerSession.php b/src/Account/Session/Firebase/OwnerSession.php
index 790ac9d94..603257ec3 100644
--- a/src/Account/Session/Firebase/OwnerSession.php
+++ b/src/Account/Session/Firebase/OwnerSession.php
@@ -23,10 +23,8 @@
 use PrestaShop\Module\PsAccounts\Account\Session\SessionInterface;
 use PrestaShop\Module\PsAccounts\Account\Token\Token;
 use PrestaShop\Module\PsAccounts\Repository\ConfigurationRepository;
-use PrestaShop\Module\PsAccounts\ServiceContainer\IServiceContainerService;
-use PrestaShop\Module\PsAccounts\ServiceContainer\ServiceContainer;
 
-class OwnerSession extends FirebaseSession implements SessionInterface, IServiceContainerService
+class OwnerSession extends FirebaseSession implements SessionInterface
 {
     /**
      * @var ConfigurationRepository
@@ -75,17 +73,4 @@ public function setToken($token, $refreshToken = null)
     {
         $this->configurationRepository->updateUserFirebaseIdAndRefreshToken($token, $refreshToken);
     }
-
-    /**
-     * @param ServiceContainer $serviceContainer
-     *
-     * @return self
-     */
-    public static function getInstance(ServiceContainer $serviceContainer)
-    {
-        return new self(
-            $serviceContainer->get(ConfigurationRepository::class),
-            $serviceContainer->get(\PrestaShop\Module\PsAccounts\Account\Session\ShopSession::class)
-        );
-    }
 }
diff --git a/src/Account/Session/Firebase/ShopSession.php b/src/Account/Session/Firebase/ShopSession.php
index d52e879a3..ad0d50515 100644
--- a/src/Account/Session/Firebase/ShopSession.php
+++ b/src/Account/Session/Firebase/ShopSession.php
@@ -23,10 +23,8 @@
 use PrestaShop\Module\PsAccounts\Account\Session\SessionInterface;
 use PrestaShop\Module\PsAccounts\Account\Token\Token;
 use PrestaShop\Module\PsAccounts\Repository\ConfigurationRepository;
-use PrestaShop\Module\PsAccounts\ServiceContainer\IServiceContainerService;
-use PrestaShop\Module\PsAccounts\ServiceContainer\ServiceContainer;
 
-class ShopSession extends FirebaseSession implements SessionInterface, IServiceContainerService
+class ShopSession extends FirebaseSession implements SessionInterface
 {
     /**
      * @var ConfigurationRepository
@@ -75,17 +73,4 @@ public function setToken($token, $refreshToken = null)
     {
         $this->configurationRepository->updateFirebaseIdAndRefreshTokens($token, $refreshToken);
     }
-
-    /**
-     * @param ServiceContainer $serviceContainer
-     *
-     * @return self
-     */
-    public static function getInstance(ServiceContainer $serviceContainer)
-    {
-        return new self(
-            $serviceContainer->get(ConfigurationRepository::class),
-            $serviceContainer->get(\PrestaShop\Module\PsAccounts\Account\Session\ShopSession::class)
-        );
-    }
 }
diff --git a/src/Account/Session/ShopSession.php b/src/Account/Session/ShopSession.php
index eff61dad0..fb94ad396 100644
--- a/src/Account/Session/ShopSession.php
+++ b/src/Account/Session/ShopSession.php
@@ -30,14 +30,12 @@
 use PrestaShop\Module\PsAccounts\Log\Logger;
 use PrestaShop\Module\PsAccounts\Provider\OAuth2\ShopProvider;
 use PrestaShop\Module\PsAccounts\Repository\ConfigurationRepository;
-use PrestaShop\Module\PsAccounts\ServiceContainer\IServiceContainerService;
-use PrestaShop\Module\PsAccounts\ServiceContainer\ServiceContainer;
 use PrestaShop\Module\PsAccounts\Vendor\League\OAuth2\Client\Grant\ClientCredentials;
 use PrestaShop\Module\PsAccounts\Vendor\League\OAuth2\Client\Provider\Exception\IdentityProviderException;
 use PrestaShop\Module\PsAccounts\Vendor\League\OAuth2\Client\Token\AccessToken;
 use PrestaShop\Module\PsAccounts\Vendor\League\OAuth2\Client\Token\AccessTokenInterface;
 
-class ShopSession extends Session implements SessionInterface, IServiceContainerService
+class ShopSession extends Session implements SessionInterface
 {
     /**
      * @var CommandBus
@@ -205,19 +203,4 @@ private function getShopUuid()
     {
         return $this->linkShop->getShopUuid();
     }
-
-    /**
-     * @param ServiceContainer $serviceContainer
-     *
-     * @return self
-     */
-    public static function getInstance(ServiceContainer $serviceContainer)
-    {
-        return new self(
-            $serviceContainer->get(ConfigurationRepository::class),
-            $serviceContainer->get(ShopProvider::class),
-            $serviceContainer->get(LinkShop::class),
-            $serviceContainer->get(CommandBus::class)
-        );
-    }
 }
diff --git a/src/Adapter/Configuration.php b/src/Adapter/Configuration.php
index 5ce973a01..6bd455add 100644
--- a/src/Adapter/Configuration.php
+++ b/src/Adapter/Configuration.php
@@ -20,10 +20,7 @@
 
 namespace PrestaShop\Module\PsAccounts\Adapter;
 
-use PrestaShop\Module\PsAccounts\ServiceContainer\IServiceContainerService;
-use PrestaShop\Module\PsAccounts\ServiceContainer\ServiceContainer;
-
-class Configuration implements IServiceContainerService
+class Configuration
 {
     /**
      * @var int
@@ -232,16 +229,4 @@ public function isMultishopActive()
         return \Db::getInstance()->getValue('SELECT value FROM `' . _DB_PREFIX_ . 'configuration` WHERE `name` = "PS_MULTISHOP_FEATURE_ACTIVE"')
             && (\Db::getInstance()->getValue('SELECT COUNT(*) FROM ' . _DB_PREFIX_ . 'shop') > 1);
     }
-
-    /**
-     * @param ServiceContainer $serviceContainer
-     *
-     * @return self
-     */
-    public static function getInstance(ServiceContainer $serviceContainer)
-    {
-        return new self(
-            $serviceContainer->get('ps_accounts.context')
-        );
-    }
 }
diff --git a/src/Adapter/Link.php b/src/Adapter/Link.php
index eacf2641e..89f516f10 100644
--- a/src/Adapter/Link.php
+++ b/src/Adapter/Link.php
@@ -21,13 +21,11 @@
 namespace PrestaShop\Module\PsAccounts\Adapter;
 
 use PrestaShop\Module\PsAccounts\Context\ShopContext;
-use PrestaShop\Module\PsAccounts\ServiceContainer\IServiceContainerService;
-use PrestaShop\Module\PsAccounts\ServiceContainer\ServiceContainer;
 
 /**
  * Link adapter
  */
-class Link implements IServiceContainerService
+class Link
 {
     /**
      * @var ShopContext
@@ -121,16 +119,4 @@ public function getAdminLinkWithCustomDomain($sslDomain, $domain, $controller, $
 
         return $boBaseUrl;
     }
-
-    /**
-     * @param ServiceContainer $serviceContainer
-     *
-     * @return self
-     */
-    public static function getInstance(ServiceContainer $serviceContainer)
-    {
-        return new self(
-            $serviceContainer->get(ShopContext::class)
-        );
-    }
 }
diff --git a/src/Api/Client/AccountsClient.php b/src/Api/Client/AccountsClient.php
index 8a6e5a830..3dd35116b 100644
--- a/src/Api/Client/AccountsClient.php
+++ b/src/Api/Client/AccountsClient.php
@@ -24,11 +24,9 @@
 use PrestaShop\Module\PsAccounts\Account\Dto\UpgradeModule;
 use PrestaShop\Module\PsAccounts\Http\Client\Guzzle\GuzzleClient;
 use PrestaShop\Module\PsAccounts\Http\Client\Guzzle\GuzzleClientFactory;
-use PrestaShop\Module\PsAccounts\ServiceContainer\IServiceContainerService;
-use PrestaShop\Module\PsAccounts\ServiceContainer\ServiceContainer;
 use PrestaShop\Module\PsAccounts\Vendor\Ramsey\Uuid\Uuid;
 
-class AccountsClient implements IServiceContainerService
+class AccountsClient
 {
     /**
      * @var string
@@ -243,18 +241,4 @@ public function healthCheck()
 
         return $this->getClient()->get();
     }
-
-    /**
-     * @param ServiceContainer $serviceContainer
-     *
-     * @return self
-     */
-    public static function getInstance(ServiceContainer $serviceContainer)
-    {
-        return new self(
-            $serviceContainer->getParameter('ps_accounts.accounts_api_url'),
-            null,
-            10
-        );
-    }
 }
diff --git a/src/Api/Client/ServicesBillingClient.php b/src/Api/Client/ServicesBillingClient.php
index ebd96b168..28da29e3c 100644
--- a/src/Api/Client/ServicesBillingClient.php
+++ b/src/Api/Client/ServicesBillingClient.php
@@ -24,13 +24,11 @@
 use PrestaShop\Module\PsAccounts\Http\Client\Guzzle\GuzzleClientFactory;
 use PrestaShop\Module\PsAccounts\Provider\ShopProvider;
 use PrestaShop\Module\PsAccounts\Service\PsAccountsService;
-use PrestaShop\Module\PsAccounts\ServiceContainer\IServiceContainerService;
-use PrestaShop\Module\PsAccounts\ServiceContainer\ServiceContainer;
 
 /**
  * Handle call api Services
  */
-class ServicesBillingClient implements IServiceContainerService
+class ServicesBillingClient
 {
     /**
      * @var GuzzleClient
@@ -132,18 +130,4 @@ public function createBillingSubscriptions($shopUuidV4, $module, $bodyHttp)
             'body' => $bodyHttp,
         ]);
     }
-
-    /**
-     * @param ServiceContainer $serviceContainer
-     *
-     * @return self
-     */
-    public static function getInstance(ServiceContainer $serviceContainer)
-    {
-        return new self(
-            $serviceContainer->getParameter('ps_accounts.billing_api_url'),
-            $serviceContainer->get(PsAccountsService::class),
-            $serviceContainer->get(ShopProvider::class)
-        );
-    }
 }
diff --git a/src/Context/ShopContext.php b/src/Context/ShopContext.php
index 943a42672..6b1e8c382 100644
--- a/src/Context/ShopContext.php
+++ b/src/Context/ShopContext.php
@@ -22,13 +22,11 @@
 
 use Context;
 use PrestaShop\Module\PsAccounts\Repository\ConfigurationRepository;
-use PrestaShop\Module\PsAccounts\ServiceContainer\IServiceContainerService;
-use PrestaShop\Module\PsAccounts\ServiceContainer\ServiceContainer;
 
 /**
  * Get the shop context
  */
-class ShopContext implements IServiceContainerService
+class ShopContext
 {
     /**
      * @var ConfigurationRepository
@@ -189,17 +187,4 @@ public function execInShopContext($shopId, $closure)
         }
         throw $e;
     }
-
-    /**
-     * @param ServiceContainer $serviceContainer
-     *
-     * @return self
-     */
-    public static function getInstance(ServiceContainer $serviceContainer)
-    {
-        return new self(
-            $serviceContainer->get(ConfigurationRepository::class),
-            $serviceContainer->get('ps_accounts.context')
-        );
-    }
 }
diff --git a/src/Cqrs/CommandBus.php b/src/Cqrs/CommandBus.php
index f10acbde0..ef392d3e8 100755
--- a/src/Cqrs/CommandBus.php
+++ b/src/Cqrs/CommandBus.php
@@ -20,10 +20,7 @@
 
 namespace PrestaShop\Module\PsAccounts\Cqrs;
 
-use PrestaShop\Module\PsAccounts\ServiceContainer\IServiceContainerService;
-use PrestaShop\Module\PsAccounts\ServiceContainer\ServiceContainer;
-
-class CommandBus extends Bus implements IServiceContainerService
+class CommandBus extends Bus
 {
     /**
      * @param string $className
@@ -37,16 +34,4 @@ public function resolveHandlerClass($className)
             '${2}Handler\\\\${4}Handler',
             $className, 1);
     }
-
-    /**
-     * @param ServiceContainer $serviceContainer
-     *
-     * @return self
-     */
-    public static function getInstance(ServiceContainer $serviceContainer)
-    {
-        return new self(
-            $serviceContainer->get('ps_accounts.module')
-        );
-    }
 }
diff --git a/src/Factory/CircuitBreakerFactory.php b/src/Factory/CircuitBreakerFactory.php
index ffb2634ba..42924ffba 100644
--- a/src/Factory/CircuitBreakerFactory.php
+++ b/src/Factory/CircuitBreakerFactory.php
@@ -24,10 +24,8 @@
 use PrestaShop\Module\PsAccounts\Api\Client\AccountsClient;
 use PrestaShop\Module\PsAccounts\Http\Client\CircuitBreaker\CircuitBreaker;
 use PrestaShop\Module\PsAccounts\Http\Client\CircuitBreaker\PersistentCircuitBreaker;
-use PrestaShop\Module\PsAccounts\ServiceContainer\IServiceContainerService;
-use PrestaShop\Module\PsAccounts\ServiceContainer\ServiceContainer;
 
-class CircuitBreakerFactory implements IServiceContainerService
+class CircuitBreakerFactory
 {
     /**
      * @var array
@@ -134,16 +132,4 @@ protected function className($className)
     {
         return strtoupper(preg_replace(['/^.*\\\\/', '/([^A-Z])([A-Z])/'], ['', '$1_$2'], $className));
     }
-
-    /**
-     * @param ServiceContainer $serviceContainer
-     *
-     * @return self
-     */
-    public static function getInstance(ServiceContainer $serviceContainer)
-    {
-        return new self(
-            $serviceContainer->get(Configuration::class)
-        );
-    }
 }
diff --git a/src/Installer/Installer.php b/src/Installer/Installer.php
index 43492352c..ff754926b 100644
--- a/src/Installer/Installer.php
+++ b/src/Installer/Installer.php
@@ -24,8 +24,6 @@
 use PrestaShop\Module\PsAccounts\Adapter\Link;
 use PrestaShop\Module\PsAccounts\Context\ShopContext;
 use PrestaShop\Module\PsAccounts\Service\SentryService;
-use PrestaShop\Module\PsAccounts\ServiceContainer\IServiceContainerService;
-use PrestaShop\Module\PsAccounts\ServiceContainer\ServiceContainer;
 use PrestaShop\PrestaShop\Adapter\SymfonyContainer;
 use PrestaShop\PrestaShop\Core\Addon\Module\ModuleManagerBuilder;
 use Tools;
@@ -35,7 +33,7 @@
  *
  * Install ps_accounts module
  */
-class Installer implements IServiceContainerService
+class Installer
 {
     /**
      * @var ShopContext
@@ -174,17 +172,4 @@ public function isEnabled($module)
 
         return $moduleManager->isEnabled($module);
     }
-
-    /**
-     * @param ServiceContainer $serviceContainer
-     *
-     * @return self
-     */
-    public static function getInstance(ServiceContainer $serviceContainer)
-    {
-        return new self(
-            $serviceContainer->get(ShopContext::class),
-            $serviceContainer->get(Link::class)
-        );
-    }
 }
diff --git a/src/Middleware/Oauth2Middleware.php b/src/Middleware/Oauth2Middleware.php
index 08be1cf97..d6294e052 100644
--- a/src/Middleware/Oauth2Middleware.php
+++ b/src/Middleware/Oauth2Middleware.php
@@ -25,12 +25,10 @@
 use PrestaShop\Module\PsAccounts\Provider\OAuth2\PrestaShopSession;
 use PrestaShop\Module\PsAccounts\Provider\OAuth2\ShopProvider;
 use PrestaShop\Module\PsAccounts\Service\PsAccountsService;
-use PrestaShop\Module\PsAccounts\ServiceContainer\IServiceContainerService;
-use PrestaShop\Module\PsAccounts\ServiceContainer\ServiceContainer;
 use PrestaShop\Module\PsAccounts\Vendor\League\OAuth2\Client\Provider\Exception\IdentityProviderException;
 use Ps_accounts;
 
-class Oauth2Middleware implements IServiceContainerService
+class Oauth2Middleware
 {
     use PrestaShopLogoutTrait;
 
@@ -123,16 +121,4 @@ protected function onLogoutCallback()
             \Tools::redirectLink($this->getProvider()->getRedirectUri());
         }
     }
-
-    /**
-     * @param ServiceContainer $serviceContainer
-     *
-     * @return self
-     */
-    public static function getInstance(ServiceContainer $serviceContainer)
-    {
-        return new self(
-            $serviceContainer->get('ps_accounts.module')
-        );
-    }
 }
diff --git a/src/Presenter/PsAccountsPresenter.php b/src/Presenter/PsAccountsPresenter.php
index 27bbf4c0f..d2b54ccbe 100644
--- a/src/Presenter/PsAccountsPresenter.php
+++ b/src/Presenter/PsAccountsPresenter.php
@@ -26,14 +26,12 @@
 use PrestaShop\Module\PsAccounts\Repository\ConfigurationRepository;
 use PrestaShop\Module\PsAccounts\Service\PsAccountsService;
 use PrestaShop\Module\PsAccounts\Service\SentryService;
-use PrestaShop\Module\PsAccounts\ServiceContainer\IServiceContainerService;
-use PrestaShop\Module\PsAccounts\ServiceContainer\ServiceContainer;
 use PrestaShopException;
 
 /**
  * Construct the psaccounts module.
  */
-class PsAccountsPresenter implements PresenterInterface, IServiceContainerService
+class PsAccountsPresenter implements PresenterInterface
 {
     /**
      * @var ShopProvider
@@ -170,16 +168,4 @@ public function present($psxName = 'ps_accounts')
 
         return [];
     }
-
-    /**
-     * @param ServiceContainer $serviceContainer
-     *
-     * @return self
-     */
-    public static function getInstance(ServiceContainer $serviceContainer)
-    {
-        return new self(
-            $serviceContainer->get('ps_accounts.module')
-        );
-    }
 }
diff --git a/src/Provider/OAuth2/Oauth2Client.php b/src/Provider/OAuth2/Oauth2Client.php
index 294edae2c..8b0f07623 100644
--- a/src/Provider/OAuth2/Oauth2Client.php
+++ b/src/Provider/OAuth2/Oauth2Client.php
@@ -21,10 +21,8 @@
 namespace PrestaShop\Module\PsAccounts\Provider\OAuth2;
 
 use PrestaShop\Module\PsAccounts\Repository\ConfigurationRepository;
-use PrestaShop\Module\PsAccounts\ServiceContainer\IServiceContainerService;
-use PrestaShop\Module\PsAccounts\ServiceContainer\ServiceContainer;
 
-class Oauth2Client implements IServiceContainerService
+class Oauth2Client
 {
     /**
      * @var ConfigurationRepository
@@ -81,16 +79,4 @@ public function getClientSecret()
     {
         return $this->cfRepos->getOauth2ClientSecret();
     }
-
-    /**
-     * @param ServiceContainer $serviceContainer
-     *
-     * @return self
-     */
-    public static function getInstance(ServiceContainer $serviceContainer)
-    {
-        return new self(
-            $serviceContainer->get(ConfigurationRepository::class)
-        );
-    }
 }
diff --git a/src/Provider/OAuth2/PrestaShopSession.php b/src/Provider/OAuth2/PrestaShopSession.php
index 083692f88..3b5c88476 100644
--- a/src/Provider/OAuth2/PrestaShopSession.php
+++ b/src/Provider/OAuth2/PrestaShopSession.php
@@ -20,14 +20,12 @@
 
 namespace PrestaShop\Module\PsAccounts\Provider\OAuth2;
 
-use PrestaShop\Module\PsAccounts\ServiceContainer\IServiceContainerService;
-use PrestaShop\Module\PsAccounts\ServiceContainer\ServiceContainer;
 use PrestaShop\Module\PsAccounts\Vendor\League\OAuth2\Client\Provider\Exception\IdentityProviderException;
 use PrestaShop\Module\PsAccounts\Vendor\League\OAuth2\Client\Token\AccessToken;
 use PrestaShop\OAuth2\Client\Provider\PrestaShopUser;
 use Symfony\Component\HttpFoundation\Session\SessionInterface;
 
-class PrestaShopSession implements IServiceContainerService
+class PrestaShopSession
 {
     const TOKEN_NAME = 'accessToken';
 
@@ -135,14 +133,4 @@ private function getTokenProvider()
 
         return $this->session->get(self::TOKEN_NAME);
     }
-
-    /**
-     * @param ServiceContainer $serviceContainer
-     *
-     * @return self
-     */
-    public static function getInstance(ServiceContainer $serviceContainer)
-    {
-        return \PrestaShop\Module\PsAccounts\Factory\PrestaShopSessionFactory::create();
-    }
 }
diff --git a/src/Provider/OAuth2/ShopProvider.php b/src/Provider/OAuth2/ShopProvider.php
index 01529f77b..a05e3c194 100644
--- a/src/Provider/OAuth2/ShopProvider.php
+++ b/src/Provider/OAuth2/ShopProvider.php
@@ -21,12 +21,10 @@
 namespace PrestaShop\Module\PsAccounts\Provider\OAuth2;
 
 use PrestaShop\Module\PsAccounts\Adapter\Link;
-use PrestaShop\Module\PsAccounts\ServiceContainer\IServiceContainerService;
-use PrestaShop\Module\PsAccounts\ServiceContainer\ServiceContainer;
 use PrestaShop\Module\PsAccounts\Vendor\League\OAuth2\Client\Provider\AbstractProvider;
 use PrestaShop\OAuth2\Client\Provider\PrestaShop;
 
-class ShopProvider extends PrestaShop implements IServiceContainerService
+class ShopProvider extends PrestaShop
 {
     const QUERY_LOGOUT_CALLBACK_PARAM = 'oauth2Callback';
 
@@ -170,14 +168,4 @@ private function syncOauth2ClientProps()
         $this->clientId = $this->getOauth2Client()->getClientId();
         $this->clientSecret = $this->getOauth2Client()->getClientSecret();
     }
-
-    /**
-     * @param ServiceContainer $serviceContainer
-     *
-     * @return PrestaShop
-     */
-    public static function getInstance(ServiceContainer $serviceContainer)
-    {
-        return \PrestaShop\Module\PsAccounts\Provider\OAuth2\ShopProvider::create();
-    }
 }
diff --git a/src/Provider/RsaKeysProvider.php b/src/Provider/RsaKeysProvider.php
index e8aa32367..d2ef123f8 100644
--- a/src/Provider/RsaKeysProvider.php
+++ b/src/Provider/RsaKeysProvider.php
@@ -22,14 +22,12 @@
 
 use PrestaShop\Module\PsAccounts\Exception\SshKeysNotFoundException;
 use PrestaShop\Module\PsAccounts\Repository\ConfigurationRepository;
-use PrestaShop\Module\PsAccounts\ServiceContainer\IServiceContainerService;
-use PrestaShop\Module\PsAccounts\ServiceContainer\ServiceContainer;
 use PrestaShop\Module\PsAccounts\Vendor\phpseclib\Crypt\RSA;
 
 /**
  * Manage RSA
  */
-class RsaKeysProvider implements IServiceContainerService
+class RsaKeysProvider
 {
     /**
      * @var RSA
@@ -193,16 +191,4 @@ public function cleanupKeys()
         $this->configuration->updateAccountsRsaPrivateKey('');
         $this->configuration->updateAccountsRsaPublicKey('');
     }
-
-    /**
-     * @param ServiceContainer $serviceContainer
-     *
-     * @return self
-     */
-    public static function getInstance(ServiceContainer $serviceContainer)
-    {
-        return new self(
-            $serviceContainer->get(ConfigurationRepository::class)
-        );
-    }
 }
diff --git a/src/Provider/ShopProvider.php b/src/Provider/ShopProvider.php
index 282f64852..5baf221f6 100644
--- a/src/Provider/ShopProvider.php
+++ b/src/Provider/ShopProvider.php
@@ -25,10 +25,8 @@
 use PrestaShop\Module\PsAccounts\Account\Session\Firebase\OwnerSession;
 use PrestaShop\Module\PsAccounts\Adapter\Link;
 use PrestaShop\Module\PsAccounts\Context\ShopContext;
-use PrestaShop\Module\PsAccounts\ServiceContainer\IServiceContainerService;
-use PrestaShop\Module\PsAccounts\ServiceContainer\ServiceContainer;
 
-class ShopProvider implements IServiceContainerService
+class ShopProvider
 {
     /**
      * @var ShopContext
@@ -266,17 +264,4 @@ private function getShopUrl($shopData)
             ($shopData['domain_ssl'] ?: $shopData['domain']) .
             $shopData['uri'];
     }
-
-    /**
-     * @param ServiceContainer $serviceContainer
-     *
-     * @return self
-     */
-    public static function getInstance(ServiceContainer $serviceContainer)
-    {
-        return new self(
-            $serviceContainer->get(ShopContext::class),
-            $serviceContainer->get(Link::class)
-        );
-    }
 }
diff --git a/src/Repository/ConfigurationRepository.php b/src/Repository/ConfigurationRepository.php
index 051543f73..d808e5169 100644
--- a/src/Repository/ConfigurationRepository.php
+++ b/src/Repository/ConfigurationRepository.php
@@ -23,10 +23,8 @@
 use PrestaShop\Module\PsAccounts\Adapter\Configuration;
 use PrestaShop\Module\PsAccounts\Adapter\ConfigurationKeys;
 use PrestaShop\Module\PsAccounts\Log\Logger;
-use PrestaShop\Module\PsAccounts\ServiceContainer\IServiceContainerService;
-use PrestaShop\Module\PsAccounts\ServiceContainer\ServiceContainer;
 
-class ConfigurationRepository implements IServiceContainerService
+class ConfigurationRepository
 {
     /**
      * @var Configuration
@@ -464,16 +462,4 @@ protected function migrateToSingleShop()
             ' AND id_shop = ' . (int) $shop->id . ';'
         );
     }
-
-    /**
-     * @param ServiceContainer $serviceContainer
-     *
-     * @return self
-     */
-    public static function getInstance(ServiceContainer $serviceContainer)
-    {
-        return new self(
-            $serviceContainer->get(Configuration::class)
-        );
-    }
 }
diff --git a/src/Repository/ShopTokenRepository.php b/src/Repository/ShopTokenRepository.php
index 5bbf36897..653f6a195 100644
--- a/src/Repository/ShopTokenRepository.php
+++ b/src/Repository/ShopTokenRepository.php
@@ -21,30 +21,16 @@
 namespace PrestaShop\Module\PsAccounts\Repository;
 
 use PrestaShop\Module\PsAccounts\Account\Session\Firebase\ShopSession;
-use PrestaShop\Module\PsAccounts\ServiceContainer\IServiceContainerService;
-use PrestaShop\Module\PsAccounts\ServiceContainer\ServiceContainer;
 
 /**
  * Class ShopTokenRepository
  *
  * @deprecated
  */
-class ShopTokenRepository extends TokenRepository implements IServiceContainerService
+class ShopTokenRepository extends TokenRepository
 {
     /**
      * @var ShopSession
      */
     protected $session;
-
-    /**
-     * @param ServiceContainer $serviceContainer
-     *
-     * @return self
-     */
-    public static function getInstance(ServiceContainer $serviceContainer)
-    {
-        return new self(
-            $serviceContainer->get(ShopSession::class)
-        );
-    }
 }
diff --git a/src/Repository/UserTokenRepository.php b/src/Repository/UserTokenRepository.php
index 570771033..5905d7c55 100644
--- a/src/Repository/UserTokenRepository.php
+++ b/src/Repository/UserTokenRepository.php
@@ -21,15 +21,13 @@
 namespace PrestaShop\Module\PsAccounts\Repository;
 
 use PrestaShop\Module\PsAccounts\Account\Session\Firebase\OwnerSession;
-use PrestaShop\Module\PsAccounts\ServiceContainer\IServiceContainerService;
-use PrestaShop\Module\PsAccounts\ServiceContainer\ServiceContainer;
 
 /**
  * Class UserTokenRepository
  *
  * @deprecated
  */
-class UserTokenRepository extends TokenRepository implements IServiceContainerService
+class UserTokenRepository extends TokenRepository
 {
     /**
      * @var OwnerSession
@@ -53,16 +51,4 @@ public function getTokenEmailVerified()
     {
         return $this->session->isEmailVerified();
     }
-
-    /**
-     * @param ServiceContainer $serviceContainer
-     *
-     * @return self
-     */
-    public static function getInstance(ServiceContainer $serviceContainer)
-    {
-        return new self(
-            $serviceContainer->get(OwnerSession::class)
-        );
-    }
 }
diff --git a/src/Service/AnalyticsService.php b/src/Service/AnalyticsService.php
index 69b1c58cb..9006852a9 100644
--- a/src/Service/AnalyticsService.php
+++ b/src/Service/AnalyticsService.php
@@ -20,13 +20,11 @@
 
 namespace PrestaShop\Module\PsAccounts\Service;
 
-use PrestaShop\Module\PsAccounts\ServiceContainer\IServiceContainerService;
-use PrestaShop\Module\PsAccounts\ServiceContainer\ServiceContainer;
 use PrestaShop\Module\PsAccounts\Vendor\Monolog\Logger;
 use PrestaShop\Module\PsAccounts\Vendor\Ramsey\Uuid\Uuid;
 use Segment;
 
-class AnalyticsService implements IServiceContainerService
+class AnalyticsService
 {
     const COOKIE_ANONYMOUS_ID = 'ajs_anonymous_id';
 
@@ -317,17 +315,4 @@ private function initAnonymousId()
             }
         }
     }
-
-    /**
-     * @param ServiceContainer $serviceContainer
-     *
-     * @return self
-     */
-    public static function getInstance(ServiceContainer $serviceContainer)
-    {
-        return new self(
-            $serviceContainer->getParameter('ps_accounts.segment_write_key'),
-            $serviceContainer->get('ps_accounts.logger')
-        );
-    }
 }
diff --git a/src/Service/PsAccountsService.php b/src/Service/PsAccountsService.php
index 461c36e98..99ce5cc85 100644
--- a/src/Service/PsAccountsService.php
+++ b/src/Service/PsAccountsService.php
@@ -32,13 +32,11 @@
 use PrestaShop\Module\PsAccounts\Provider\ShopProvider;
 use PrestaShop\Module\PsAccounts\Repository\ConfigurationRepository;
 use PrestaShop\Module\PsAccounts\Repository\EmployeeAccountRepository;
-use PrestaShop\Module\PsAccounts\ServiceContainer\IServiceContainerService;
-use PrestaShop\Module\PsAccounts\ServiceContainer\ServiceContainer;
 
 /**
  * Class PsAccountsService
  */
-class PsAccountsService implements IServiceContainerService
+class PsAccountsService
 {
     /**
      * @var Link
@@ -340,16 +338,4 @@ public function getEmployeeAccount()
             return null;
         }
     }
-
-    /**
-     * @param ServiceContainer $serviceContainer
-     *
-     * @return self
-     */
-    public static function getInstance(ServiceContainer $serviceContainer)
-    {
-        return new self(
-            $serviceContainer->get('ps_accounts.module')
-        );
-    }
 }
diff --git a/src/Service/PsBillingService.php b/src/Service/PsBillingService.php
index 798739de9..1d238088d 100644
--- a/src/Service/PsBillingService.php
+++ b/src/Service/PsBillingService.php
@@ -25,15 +25,13 @@
 use PrestaShop\Module\PsAccounts\Exception\BillingException;
 use PrestaShop\Module\PsAccounts\Repository\ConfigurationRepository;
 use PrestaShop\Module\PsAccounts\Repository\ShopTokenRepository;
-use PrestaShop\Module\PsAccounts\ServiceContainer\IServiceContainerService;
-use PrestaShop\Module\PsAccounts\ServiceContainer\ServiceContainer;
 
 /**
  * @deprecated
  *
  * Construct the psbilling service
  */
-class PsBillingService implements IServiceContainerService
+class PsBillingService
 {
     /**
      * @var ConfigurationRepository
@@ -149,18 +147,4 @@ public function subscribeToFreePlan($module, $planName, $shopId = false, $custom
 
         throw new \Exception('Shop account unknown.', 10);
     }
-
-    /**
-     * @param ServiceContainer $serviceContainer
-     *
-     * @return self
-     */
-    public static function getInstance(ServiceContainer $serviceContainer)
-    {
-        return new self(
-            $serviceContainer->get(ServicesBillingClient::class),
-            $serviceContainer->get(ShopTokenRepository::class),
-            $serviceContainer->get(ConfigurationRepository::class)
-        );
-    }
 }
diff --git a/src/Service/SentryService.php b/src/Service/SentryService.php
index 539733b22..ee979d640 100644
--- a/src/Service/SentryService.php
+++ b/src/Service/SentryService.php
@@ -24,15 +24,13 @@
 use Module;
 use PrestaShop\Module\PsAccounts\Account\LinkShop;
 use PrestaShop\Module\PsAccounts\Service\Sentry\ModuleFilteredRavenClient;
-use PrestaShop\Module\PsAccounts\ServiceContainer\IServiceContainerService;
-use PrestaShop\Module\PsAccounts\ServiceContainer\ServiceContainer;
 use Ps_accounts;
 use Raven_Client;
 
 /**
  * FIXME: outdated sentry client due to PHP 5.6 support
  */
-class SentryService implements IServiceContainerService
+class SentryService
 {
     /**
      * @var Raven_Client
@@ -181,19 +179,4 @@ private function isContextInFrontOffice(Context $context = null)
 
         return in_array($controller->controller_type, ['front', 'modulefront']);
     }
-
-    /**
-     * @param ServiceContainer $serviceContainer
-     *
-     * @return self
-     */
-    public static function getInstance(ServiceContainer $serviceContainer)
-    {
-        return new self(
-            $serviceContainer->getParameter('ps_accounts.sentry_credentials'),
-            $serviceContainer->getParameter('ps_accounts.environment'),
-            $serviceContainer->get(LinkShop::class),
-            $serviceContainer->get('ps_accounts.context')
-        );
-    }
 }
diff --git a/src/ServiceContainer/IServiceContainerService.php b/src/ServiceContainer/Contract/IServiceContainerService.php
similarity index 88%
rename from src/ServiceContainer/IServiceContainerService.php
rename to src/ServiceContainer/Contract/IServiceContainerService.php
index ec2b1fc35..8884b4dde 100644
--- a/src/ServiceContainer/IServiceContainerService.php
+++ b/src/ServiceContainer/Contract/IServiceContainerService.php
@@ -18,7 +18,9 @@
  * @license   https://opensource.org/licenses/AFL-3.0 Academic Free License version 3.0
  */
 
-namespace PrestaShop\Module\PsAccounts\ServiceContainer;
+namespace PrestaShop\Module\PsAccounts\ServiceContainer\Contract;
+
+use PrestaShop\Module\PsAccounts\ServiceContainer\ServiceContainer;
 
 interface IServiceContainerService
 {
diff --git a/src/ServiceContainer/Contract/IServiceProvider.php b/src/ServiceContainer/Contract/IServiceProvider.php
new file mode 100644
index 000000000..cbe4e8af2
--- /dev/null
+++ b/src/ServiceContainer/Contract/IServiceProvider.php
@@ -0,0 +1,33 @@
+<?php
+/**
+ * Copyright since 2007 PrestaShop SA and Contributors
+ * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License version 3.0
+ * that is bundled with this package in the file LICENSE.md.
+ * It is also available through the world-wide-web at this URL:
+ * https://opensource.org/licenses/AFL-3.0
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@prestashop.com so we can send you a copy immediately.
+ *
+ * @author    PrestaShop SA and Contributors <contact@prestashop.com>
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license   https://opensource.org/licenses/AFL-3.0 Academic Free License version 3.0
+ */
+
+namespace PrestaShop\Module\PsAccounts\ServiceContainer\Contract;
+
+use PrestaShop\Module\PsAccounts\ServiceContainer\ServiceContainer;
+
+interface IServiceProvider
+{
+    /**
+     * @param ServiceContainer $container
+     *
+     * @return void
+     */
+    public function provide(ServiceContainer $container);
+}
diff --git a/src/ServiceContainer/ParameterNotFoundException.php b/src/ServiceContainer/Exception/ParameterNotFoundException.php
similarity index 92%
rename from src/ServiceContainer/ParameterNotFoundException.php
rename to src/ServiceContainer/Exception/ParameterNotFoundException.php
index 8503d4fde..72d6ff7b5 100644
--- a/src/ServiceContainer/ParameterNotFoundException.php
+++ b/src/ServiceContainer/Exception/ParameterNotFoundException.php
@@ -18,7 +18,7 @@
  * @license   https://opensource.org/licenses/AFL-3.0 Academic Free License version 3.0
  */
 
-namespace PrestaShop\Module\PsAccounts\ServiceContainer;
+namespace PrestaShop\Module\PsAccounts\ServiceContainer\Exception;
 
 class ParameterNotFoundException extends \Exception
 {
diff --git a/src/ServiceContainer/Exception/ProviderNotFoundException.php b/src/ServiceContainer/Exception/ProviderNotFoundException.php
new file mode 100644
index 000000000..b3e653e9e
--- /dev/null
+++ b/src/ServiceContainer/Exception/ProviderNotFoundException.php
@@ -0,0 +1,25 @@
+<?php
+/**
+ * Copyright since 2007 PrestaShop SA and Contributors
+ * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License version 3.0
+ * that is bundled with this package in the file LICENSE.md.
+ * It is also available through the world-wide-web at this URL:
+ * https://opensource.org/licenses/AFL-3.0
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@prestashop.com so we can send you a copy immediately.
+ *
+ * @author    PrestaShop SA and Contributors <contact@prestashop.com>
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license   https://opensource.org/licenses/AFL-3.0 Academic Free License version 3.0
+ */
+
+namespace PrestaShop\Module\PsAccounts\ServiceContainer\Exception;
+
+class ProviderNotFoundException extends \Exception
+{
+}
diff --git a/src/ServiceContainer/ServiceNotFoundException.php b/src/ServiceContainer/Exception/ServiceNotFoundException.php
similarity index 92%
rename from src/ServiceContainer/ServiceNotFoundException.php
rename to src/ServiceContainer/Exception/ServiceNotFoundException.php
index 00bf8e61a..12c3c145d 100644
--- a/src/ServiceContainer/ServiceNotFoundException.php
+++ b/src/ServiceContainer/Exception/ServiceNotFoundException.php
@@ -18,7 +18,7 @@
  * @license   https://opensource.org/licenses/AFL-3.0 Academic Free License version 3.0
  */
 
-namespace PrestaShop\Module\PsAccounts\ServiceContainer;
+namespace PrestaShop\Module\PsAccounts\ServiceContainer\Exception;
 
 class ServiceNotFoundException extends \Exception
 {
diff --git a/src/ServiceContainer/Provider/ApiClientProvider.php b/src/ServiceContainer/Provider/ApiClientProvider.php
new file mode 100644
index 000000000..68baf352f
--- /dev/null
+++ b/src/ServiceContainer/Provider/ApiClientProvider.php
@@ -0,0 +1,54 @@
+<?php
+/**
+ * Copyright since 2007 PrestaShop SA and Contributors
+ * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License version 3.0
+ * that is bundled with this package in the file LICENSE.md.
+ * It is also available through the world-wide-web at this URL:
+ * https://opensource.org/licenses/AFL-3.0
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@prestashop.com so we can send you a copy immediately.
+ *
+ * @author    PrestaShop SA and Contributors <contact@prestashop.com>
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license   https://opensource.org/licenses/AFL-3.0 Academic Free License version 3.0
+ */
+
+namespace PrestaShop\Module\PsAccounts\ServiceContainer\Provider;
+
+use PrestaShop\Module\PsAccounts\Api\Client\AccountsClient;
+use PrestaShop\Module\PsAccounts\Api\Client\ServicesBillingClient;
+use PrestaShop\Module\PsAccounts\Provider\ShopProvider;
+use PrestaShop\Module\PsAccounts\Service\PsAccountsService;
+use PrestaShop\Module\PsAccounts\ServiceContainer\Contract\IServiceProvider;
+use PrestaShop\Module\PsAccounts\ServiceContainer\ServiceContainer;
+
+class ApiClientProvider implements IServiceProvider
+{
+    /**
+     * @param ServiceContainer $container
+     *
+     * @return void
+     */
+    public function provide(ServiceContainer $container)
+    {
+        $container->registerProvider(AccountsClient::class, function () use ($container) {
+            return new AccountsClient(
+                $container->getParameter('ps_accounts.accounts_api_url'),
+                null,
+                10
+            );
+        });
+        $container->registerProvider(ServicesBillingClient::class, function () use ($container) {
+            return new ServicesBillingClient(
+                $container->getParameter('ps_accounts.billing_api_url'),
+                $container->get(PsAccountsService::class),
+                $container->get(ShopProvider::class)
+            );
+        });
+    }
+}
diff --git a/src/ServiceContainer/Provider/CommandProvider.php b/src/ServiceContainer/Provider/CommandProvider.php
new file mode 100644
index 000000000..424a9a0bc
--- /dev/null
+++ b/src/ServiceContainer/Provider/CommandProvider.php
@@ -0,0 +1,90 @@
+<?php
+/**
+ * Copyright since 2007 PrestaShop SA and Contributors
+ * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License version 3.0
+ * that is bundled with this package in the file LICENSE.md.
+ * It is also available through the world-wide-web at this URL:
+ * https://opensource.org/licenses/AFL-3.0
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@prestashop.com so we can send you a copy immediately.
+ *
+ * @author    PrestaShop SA and Contributors <contact@prestashop.com>
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license   https://opensource.org/licenses/AFL-3.0 Academic Free License version 3.0
+ */
+
+namespace PrestaShop\Module\PsAccounts\ServiceContainer\Provider;
+
+use PrestaShop\Module\PsAccounts\Account\CommandHandler\DeleteUserShopHandler;
+use PrestaShop\Module\PsAccounts\Account\CommandHandler\LinkShopHandler;
+use PrestaShop\Module\PsAccounts\Account\CommandHandler\UnlinkShopHandler;
+use PrestaShop\Module\PsAccounts\Account\CommandHandler\UpdateUserShopHandler;
+use PrestaShop\Module\PsAccounts\Account\CommandHandler\UpgradeModuleHandler;
+use PrestaShop\Module\PsAccounts\Account\CommandHandler\UpgradeModuleMultiHandler;
+use PrestaShop\Module\PsAccounts\Account\LinkShop;
+use PrestaShop\Module\PsAccounts\Account\Session\Firebase\OwnerSession;
+use PrestaShop\Module\PsAccounts\Account\Session\Firebase\ShopSession;
+use PrestaShop\Module\PsAccounts\Api\Client\AccountsClient;
+use PrestaShop\Module\PsAccounts\Context\ShopContext;
+use PrestaShop\Module\PsAccounts\Cqrs\CommandBus;
+use PrestaShop\Module\PsAccounts\Provider\ShopProvider;
+use PrestaShop\Module\PsAccounts\Repository\ConfigurationRepository;
+use PrestaShop\Module\PsAccounts\Service\AnalyticsService;
+use PrestaShop\Module\PsAccounts\ServiceContainer\Contract\IServiceProvider;
+use PrestaShop\Module\PsAccounts\ServiceContainer\ServiceContainer;
+
+class CommandProvider implements IServiceProvider
+{
+    public function provide(ServiceContainer $container)
+    {
+        $container->registerProvider(DeleteUserShopHandler::class, function () use ($container) {
+            return new DeleteUserShopHandler(
+                $container->get(AccountsClient::class),
+                $container->get(ShopContext::class),
+                $container->get(ShopSession::class),
+                $container->get(OwnerSession::class)
+            );
+        });
+        $container->registerProvider(LinkShopHandler::class, function () use ($container) {
+            return new LinkShopHandler(
+                $container->get(LinkShop::class)
+            );
+        });
+        $container->registerProvider(UnlinkShopHandler::class, function () use ($container) {
+            return new UnlinkShopHandler(
+                $container->get(LinkShop::class),
+                $container->get(AnalyticsService::class),
+                $container->get(ShopProvider::class)
+            );
+        });
+        $container->registerProvider(UpdateUserShopHandler::class, function () use ($container) {
+            return new UpdateUserShopHandler(
+                $container->get(AccountsClient::class),
+                $container->get(ShopContext::class),
+                $container->get(ShopSession::class),
+                $container->get(OwnerSession::class)
+            );
+        });
+        $container->registerProvider(UpgradeModuleHandler::class, function () use ($container) {
+            return new UpgradeModuleHandler(
+                $container->get(AccountsClient::class),
+                $container->get(LinkShop::class),
+                $container->get(ShopSession::class),
+                $container->get(ShopContext::class),
+                $container->get(ConfigurationRepository::class),
+                $container->get(CommandBus::class)
+            );
+        });
+        $container->registerProvider(UpgradeModuleMultiHandler::class, function () use ($container) {
+            return new UpgradeModuleMultiHandler(
+                $container->get(CommandBus::class),
+                $container->get(ConfigurationRepository::class)
+            );
+        });
+    }
+}
diff --git a/src/ServiceContainer/Provider/DefaultProvider.php b/src/ServiceContainer/Provider/DefaultProvider.php
new file mode 100644
index 000000000..59d36d981
--- /dev/null
+++ b/src/ServiceContainer/Provider/DefaultProvider.php
@@ -0,0 +1,150 @@
+<?php
+/**
+ * Copyright since 2007 PrestaShop SA and Contributors
+ * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License version 3.0
+ * that is bundled with this package in the file LICENSE.md.
+ * It is also available through the world-wide-web at this URL:
+ * https://opensource.org/licenses/AFL-3.0
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@prestashop.com so we can send you a copy immediately.
+ *
+ * @author    PrestaShop SA and Contributors <contact@prestashop.com>
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license   https://opensource.org/licenses/AFL-3.0 Academic Free License version 3.0
+ */
+
+namespace PrestaShop\Module\PsAccounts\ServiceContainer\Provider;
+
+use PrestaShop\Module\PsAccounts\Account\LinkShop;
+use PrestaShop\Module\PsAccounts\Adapter;
+use PrestaShop\Module\PsAccounts\Adapter\Configuration;
+use PrestaShop\Module\PsAccounts\Adapter\Link;
+use PrestaShop\Module\PsAccounts\Api\Client\ServicesBillingClient;
+use PrestaShop\Module\PsAccounts\Context\ShopContext;
+use PrestaShop\Module\PsAccounts\Cqrs\CommandBus;
+use PrestaShop\Module\PsAccounts\Factory\CircuitBreakerFactory;
+use PrestaShop\Module\PsAccounts\Installer\Installer;
+use PrestaShop\Module\PsAccounts\Presenter\PsAccountsPresenter;
+use PrestaShop\Module\PsAccounts\Provider;
+use PrestaShop\Module\PsAccounts\Repository\ConfigurationRepository;
+use PrestaShop\Module\PsAccounts\Repository\ShopTokenRepository;
+use PrestaShop\Module\PsAccounts\Service\AnalyticsService;
+use PrestaShop\Module\PsAccounts\Service\PsAccountsService;
+use PrestaShop\Module\PsAccounts\Service\PsBillingService;
+use PrestaShop\Module\PsAccounts\Service\SentryService;
+use PrestaShop\Module\PsAccounts\ServiceContainer\Contract\IServiceProvider;
+use PrestaShop\Module\PsAccounts\ServiceContainer\ServiceContainer;
+
+class DefaultProvider implements IServiceProvider
+{
+    /**
+     * @param ServiceContainer $container
+     *
+     * @return void
+     */
+    public function provide(ServiceContainer $container)
+    {
+        $container->registerProvider('ps_accounts.context', function () {
+            return \Context::getContext();
+        });
+        $container->registerProvider('ps_accounts.logger', function () {
+            return \PrestaShop\Module\PsAccounts\Log\Logger::create();
+        });
+        $container->registerProvider('ps_accounts.module', function () {
+            return \Module::getInstanceByName('ps_accounts');
+        });
+        // Entities ?
+        $container->registerProvider(LinkShop::class, function () use ($container) {
+            return new LinkShop(
+                $container->get(ConfigurationRepository::class)
+            );
+        });
+        // Adapter
+        $container->registerProvider(Adapter\Configuration::class, function () use ($container) {
+            return new Adapter\Configuration(
+                $container->get('ps_accounts.context')
+            );
+        });
+        $container->registerProvider(Adapter\Link::class, function () use ($container) {
+            return new Adapter\Link(
+                $container->get(ShopContext::class)
+            );
+        });
+        // Services
+        $container->registerProvider(AnalyticsService::class, function () use ($container) {
+            return new AnalyticsService(
+                $container->getParameter('ps_accounts.segment_write_key'),
+                $container->get('ps_accounts.logger')
+            );
+        });
+        $container->registerProvider(PsAccountsService::class, function () use ($container) {
+            return new PsAccountsService(
+                $container->get('ps_accounts.module')
+            );
+        });
+        $container->registerProvider(PsBillingService::class, function () use ($container) {
+            return new PsBillingService(
+                $container->get(ServicesBillingClient::class),
+                $container->get(ShopTokenRepository::class),
+                $container->get(ConfigurationRepository::class)
+            );
+        });
+        $container->registerProvider(SentryService::class, function () use ($container) {
+            return new SentryService(
+                $container->getParameter('ps_accounts.sentry_credentials'),
+                $container->getParameter('ps_accounts.environment'),
+                $container->get(LinkShop::class),
+                $container->get('ps_accounts.context')
+            );
+        });
+        // "Providers"
+        $container->registerProvider(Provider\RsaKeysProvider::class, function () use ($container) {
+            return new Provider\RsaKeysProvider(
+                $container->get(ConfigurationRepository::class)
+            );
+        });
+        $container->registerProvider(Provider\ShopProvider::class, function () use ($container) {
+            return new Provider\ShopProvider(
+                $container->get(ShopContext::class),
+                $container->get(Link::class)
+            );
+        });
+        // Context
+        $container->registerProvider(ShopContext::class, function () use ($container) {
+            return new ShopContext(
+                $container->get(ConfigurationRepository::class),
+                $container->get('ps_accounts.context')
+            );
+        });
+        // CQRS
+        $container->registerProvider(CommandBus::class, function () use ($container) {
+            return new CommandBus(
+                $container->get('ps_accounts.module')
+            );
+        });
+        // Factories
+        $container->registerProvider(CircuitBreakerFactory::class, function () use ($container) {
+            return new CircuitBreakerFactory(
+                $container->get(Configuration::class)
+            );
+        });
+        // Installer
+        $container->registerProvider(Installer::class, function () use ($container) {
+            return new Installer(
+                $container->get(ShopContext::class),
+                $container->get(Link::class)
+            );
+        });
+        // Presenter
+        $container->registerProvider(PsAccountsPresenter::class, function () use ($container) {
+            return new PsAccountsPresenter(
+                $container->get('ps_accounts.module')
+            );
+        });
+    }
+}
diff --git a/src/ServiceContainer/Provider/OAuth2Provider.php b/src/ServiceContainer/Provider/OAuth2Provider.php
new file mode 100644
index 000000000..7dd9c3d22
--- /dev/null
+++ b/src/ServiceContainer/Provider/OAuth2Provider.php
@@ -0,0 +1,58 @@
+<?php
+/**
+ * Copyright since 2007 PrestaShop SA and Contributors
+ * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License version 3.0
+ * that is bundled with this package in the file LICENSE.md.
+ * It is also available through the world-wide-web at this URL:
+ * https://opensource.org/licenses/AFL-3.0
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@prestashop.com so we can send you a copy immediately.
+ *
+ * @author    PrestaShop SA and Contributors <contact@prestashop.com>
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license   https://opensource.org/licenses/AFL-3.0 Academic Free License version 3.0
+ */
+
+namespace PrestaShop\Module\PsAccounts\ServiceContainer\Provider;
+
+use PrestaShop\Module\PsAccounts\Factory\PrestaShopSessionFactory;
+use PrestaShop\Module\PsAccounts\Middleware\Oauth2Middleware;
+use PrestaShop\Module\PsAccounts\Provider;
+use PrestaShop\Module\PsAccounts\Repository\ConfigurationRepository;
+use PrestaShop\Module\PsAccounts\ServiceContainer\Contract\IServiceProvider;
+use PrestaShop\Module\PsAccounts\ServiceContainer\ServiceContainer;
+
+class OAuth2Provider implements IServiceProvider
+{
+    /**
+     * @param ServiceContainer $container
+     *
+     * @return void
+     */
+    public function provide(ServiceContainer $container)
+    {
+        // OAuth2
+        $container->registerProvider(Provider\OAuth2\Oauth2Client::class, function () use ($container) {
+            return new Provider\OAuth2\Oauth2Client(
+                $container->get(ConfigurationRepository::class)
+            );
+        });
+        $container->registerProvider(Provider\OAuth2\PrestaShopSession::class, function () {
+            return PrestaShopSessionFactory::create();
+        });
+        $container->registerProvider(Provider\OAuth2\ShopProvider::class, function () {
+            return Provider\OAuth2\ShopProvider::create();
+        });
+        // Middleware
+        $container->registerProvider(Oauth2Middleware::class, function () use ($container) {
+            return new Oauth2Middleware(
+                $container->get('ps_accounts.module')
+            );
+        });
+    }
+}
diff --git a/src/ServiceContainer/Provider/RepositoryProvider.php b/src/ServiceContainer/Provider/RepositoryProvider.php
new file mode 100644
index 000000000..4eb9deb65
--- /dev/null
+++ b/src/ServiceContainer/Provider/RepositoryProvider.php
@@ -0,0 +1,58 @@
+<?php
+/**
+ * Copyright since 2007 PrestaShop SA and Contributors
+ * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License version 3.0
+ * that is bundled with this package in the file LICENSE.md.
+ * It is also available through the world-wide-web at this URL:
+ * https://opensource.org/licenses/AFL-3.0
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@prestashop.com so we can send you a copy immediately.
+ *
+ * @author    PrestaShop SA and Contributors <contact@prestashop.com>
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license   https://opensource.org/licenses/AFL-3.0 Academic Free License version 3.0
+ */
+
+namespace PrestaShop\Module\PsAccounts\ServiceContainer\Provider;
+
+use PrestaShop\Module\PsAccounts\Account\Session\Firebase;
+use PrestaShop\Module\PsAccounts\Account\Session\Firebase\OwnerSession;
+use PrestaShop\Module\PsAccounts\Adapter\Configuration;
+use PrestaShop\Module\PsAccounts\Repository\ConfigurationRepository;
+use PrestaShop\Module\PsAccounts\Repository\ShopTokenRepository;
+use PrestaShop\Module\PsAccounts\Repository\UserTokenRepository;
+use PrestaShop\Module\PsAccounts\ServiceContainer\Contract\IServiceProvider;
+use PrestaShop\Module\PsAccounts\ServiceContainer\ServiceContainer;
+
+class RepositoryProvider implements IServiceProvider
+{
+    /**
+     * @param ServiceContainer $container
+     *
+     * @return void
+     */
+    public function provide(ServiceContainer $container)
+    {
+        // Repositories
+        $container->registerProvider(ConfigurationRepository::class, function () use ($container) {
+            return new ConfigurationRepository(
+                $container->get(Configuration::class)
+            );
+        });
+        $container->registerProvider(ShopTokenRepository::class, function () use ($container) {
+            return new ShopTokenRepository(
+                $container->get(Firebase\ShopSession::class)
+            );
+        });
+        $container->registerProvider(UserTokenRepository::class, function () use ($container) {
+            return new UserTokenRepository(
+                $container->get(OwnerSession::class)
+            );
+        });
+    }
+}
diff --git a/src/ServiceContainer/Provider/SessionProvider.php b/src/ServiceContainer/Provider/SessionProvider.php
new file mode 100644
index 000000000..6870fd97d
--- /dev/null
+++ b/src/ServiceContainer/Provider/SessionProvider.php
@@ -0,0 +1,63 @@
+<?php
+/**
+ * Copyright since 2007 PrestaShop SA and Contributors
+ * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License version 3.0
+ * that is bundled with this package in the file LICENSE.md.
+ * It is also available through the world-wide-web at this URL:
+ * https://opensource.org/licenses/AFL-3.0
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@prestashop.com so we can send you a copy immediately.
+ *
+ * @author    PrestaShop SA and Contributors <contact@prestashop.com>
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license   https://opensource.org/licenses/AFL-3.0 Academic Free License version 3.0
+ */
+
+namespace PrestaShop\Module\PsAccounts\ServiceContainer\Provider;
+
+use PrestaShop\Module\PsAccounts\Account\LinkShop;
+use PrestaShop\Module\PsAccounts\Account\Session\Firebase;
+use PrestaShop\Module\PsAccounts\Account\Session\ShopSession;
+use PrestaShop\Module\PsAccounts\Cqrs\CommandBus;
+use PrestaShop\Module\PsAccounts\Provider\OAuth2\ShopProvider;
+use PrestaShop\Module\PsAccounts\Repository\ConfigurationRepository;
+use PrestaShop\Module\PsAccounts\ServiceContainer\Contract\IServiceProvider;
+use PrestaShop\Module\PsAccounts\ServiceContainer\ServiceContainer;
+
+class SessionProvider implements IServiceProvider
+{
+    /**
+     * @param ServiceContainer $container
+     *
+     * @return void
+     */
+    public function provide(ServiceContainer $container)
+    {
+        // Sessions
+        $container->registerProvider(ShopSession::class, function () use ($container) {
+            return new ShopSession(
+                $container->get(ConfigurationRepository::class),
+                $container->get(ShopProvider::class),
+                $container->get(LinkShop::class),
+                $container->get(CommandBus::class)
+            );
+        });
+        $container->registerProvider(Firebase\OwnerSession::class, function () use ($container) {
+            return new Firebase\OwnerSession(
+                $container->get(ConfigurationRepository::class),
+                $container->get(ShopSession::class)
+            );
+        });
+        $container->registerProvider(Firebase\ShopSession::class, function () use ($container) {
+            return new Firebase\ShopSession(
+                $container->get(ConfigurationRepository::class),
+                $container->get(ShopSession::class)
+            );
+        });
+    }
+}
diff --git a/src/ServiceContainer/ServiceContainer.php b/src/ServiceContainer/ServiceContainer.php
index 17ac0cea6..70547d894 100644
--- a/src/ServiceContainer/ServiceContainer.php
+++ b/src/ServiceContainer/ServiceContainer.php
@@ -20,6 +20,18 @@
 
 namespace PrestaShop\Module\PsAccounts\ServiceContainer;
 
+use PrestaShop\Module\PsAccounts\ServiceContainer\Contract\IServiceContainerService;
+use PrestaShop\Module\PsAccounts\ServiceContainer\Contract\IServiceProvider;
+use PrestaShop\Module\PsAccounts\ServiceContainer\Exception\ParameterNotFoundException;
+use PrestaShop\Module\PsAccounts\ServiceContainer\Exception\ProviderNotFoundException;
+use PrestaShop\Module\PsAccounts\ServiceContainer\Exception\ServiceNotFoundException;
+use PrestaShop\Module\PsAccounts\ServiceContainer\Provider\ApiClientProvider;
+use PrestaShop\Module\PsAccounts\ServiceContainer\Provider\CommandProvider;
+use PrestaShop\Module\PsAccounts\ServiceContainer\Provider\DefaultProvider;
+use PrestaShop\Module\PsAccounts\ServiceContainer\Provider\OAuth2Provider;
+use PrestaShop\Module\PsAccounts\ServiceContainer\Provider\RepositoryProvider;
+use PrestaShop\Module\PsAccounts\ServiceContainer\Provider\SessionProvider;
+
 class ServiceContainer
 {
     /**
@@ -37,6 +49,18 @@ class ServiceContainer
      */
     protected $providers = [];
 
+    /**
+     * @var string[]
+     */
+    protected $provides = [
+        ApiClientProvider::class,
+        CommandProvider::class,
+        DefaultProvider::class,
+        OAuth2Provider::class,
+        RepositoryProvider::class,
+        SessionProvider::class,
+    ];
+
     /**
      * @var string
      */
@@ -49,19 +73,9 @@ class ServiceContainer
 
     public function __construct()
     {
-        $this->config = require_once __DIR__ . '/../../' . $this->configName . '.php';
-
-        $this->providers = [
-            'ps_accounts.context' => function () {
-                return \Context::getContext();
-            },
-            'ps_accounts.logger' => function () {
-                return \PrestaShop\Module\PsAccounts\Log\Logger::create();
-            },
-            'ps_accounts.module' => function () {
-                return \Module::getInstanceByName('ps_accounts');
-            },
-        ];
+        $this->config = $this->loadConfig();
+
+        $this->init();
     }
 
     /**
@@ -76,6 +90,26 @@ public static function getInstance()
         return self::$instance;
     }
 
+    /**
+     * @return mixed
+     */
+    public function loadConfig()
+    {
+        return require_once __DIR__ . '/../../' . $this->configName . '.php';
+    }
+
+    /**
+     * @return void
+     */
+    public function init()
+    {
+        foreach ($this->provides as $provider) {
+            if (is_a($provider, IServiceProvider::class, true)) {
+                (new $provider())->provide($this);
+            }
+        }
+    }
+
     /**
      * @param string $name
      *
@@ -88,11 +122,20 @@ public function get($name)
         if ($this->has($name)) {
             return $this->services[$name];
         }
-        if (array_key_exists($name, $this->providers)) {
-            return $this->providers[$name]();
+
+        if ($this->hasProvider($name)) {
+            $service = $this->getProvider($name)();
+        } else {
+            $service = $this->provideInstanceFromClassname($name);
         }
 
-        return $this->provideInstanceFromClassname($name);
+        if (null === $service) {
+            throw new ServiceNotFoundException('Service Not Found: ' . $name);
+        }
+
+        $this->set($name, $service);
+
+        return $service;
     }
 
     /**
@@ -153,20 +196,54 @@ public function hasParameter($name)
         return array_key_exists($name, $this->config);
     }
 
+    /**
+     * @param string $name
+     *
+     * @return \Closure
+     *
+     * @throws ProviderNotFoundException
+     */
+    public function getProvider($name)
+    {
+        if (array_key_exists($name, $this->providers)) {
+            return $this->providers[$name];
+        }
+        throw new ProviderNotFoundException('Provider "' . $name . '" not found.');
+    }
+
+    /**
+     * @param string $name
+     *
+     * @return bool
+     */
+    public function hasProvider($name)
+    {
+        return array_key_exists($name, $this->providers);
+    }
+
+    /**
+     * @param string $name
+     * @param \Closure $provider
+     *
+     * @return void
+     */
+    public function registerProvider($name, \Closure $provider)
+    {
+        //echo(sprintf('Initializing "%s"', $name) . PHP_EOL);
+        $this->providers[$name] = $provider;
+    }
+
     /**
      * @param string $className
      *
      * @return mixed
-     *
-     * @throws ServiceNotFoundException
      */
     protected function provideInstanceFromClassname($className)
     {
-        if (class_exists($className) && method_exists($className, 'getInstance')) {
-            $this->set($className, $className::getInstance($this));
-
-            return $this->services[$className];
+        if (is_a($className, IServiceContainerService::class, true)) {
+            return $className::getInstance($this);
         }
-        throw new ServiceNotFoundException('Service Not Found: ' . $className);
+
+        return null;
     }
 }

From 23965501807dbc5daf85b04c667dc96497482757 Mon Sep 17 00:00:00 2001
From: hschoenenberger <herve.schoenenberger@prestashop.com>
Date: Tue, 5 Nov 2024 16:42:39 +0100
Subject: [PATCH 10/46] refactor: create provider files

---
 src/ServiceContainer/ServiceContainer.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/ServiceContainer/ServiceContainer.php b/src/ServiceContainer/ServiceContainer.php
index 70547d894..6e892d3d8 100644
--- a/src/ServiceContainer/ServiceContainer.php
+++ b/src/ServiceContainer/ServiceContainer.php
@@ -124,7 +124,8 @@ public function get($name)
         }
 
         if ($this->hasProvider($name)) {
-            $service = $this->getProvider($name)();
+            $callback = $this->getProvider($name);
+            $service = $callback();
         } else {
             $service = $this->provideInstanceFromClassname($name);
         }

From 3bc7f20172b545f38bd7dd199f57489ffe57e424 Mon Sep 17 00:00:00 2001
From: hschoenenberger <herve.schoenenberger@prestashop.com>
Date: Tue, 5 Nov 2024 16:53:29 +0100
Subject: [PATCH 11/46] chore: empty services files

---
 config/admin/services.yml | 1 +
 config/front/services.yml | 1 +
 2 files changed, 2 insertions(+)
 create mode 100644 config/admin/services.yml
 create mode 100644 config/front/services.yml

diff --git a/config/admin/services.yml b/config/admin/services.yml
new file mode 100644
index 000000000..0baad4766
--- /dev/null
+++ b/config/admin/services.yml
@@ -0,0 +1 @@
+services:
diff --git a/config/front/services.yml b/config/front/services.yml
new file mode 100644
index 000000000..0baad4766
--- /dev/null
+++ b/config/front/services.yml
@@ -0,0 +1 @@
+services:

From 7169c3f4a349747362c95884c0966f8aea343448 Mon Sep 17 00:00:00 2001
From: hschoenenberger <herve.schoenenberger@prestashop.com>
Date: Tue, 5 Nov 2024 18:12:45 +0100
Subject: [PATCH 12/46] chore: empty services files

---
 ps_accounts.php                           | 10 ----------
 src/ServiceContainer/ServiceContainer.php |  2 ++
 2 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/ps_accounts.php b/ps_accounts.php
index 6c7087db4..7156d63dc 100644
--- a/ps_accounts.php
+++ b/ps_accounts.php
@@ -236,16 +236,6 @@ public function getCoreServiceContainer()
      */
     public function getServiceContainer()
     {
-//        if (null === $this->serviceContainer) {
-//            // append version number to force cache generation (1.6 Core won't clear it)
-//            $this->serviceContainer = new \PrestaShop\Module\PsAccounts\DependencyInjection\ServiceContainer(
-//                $this->name . str_replace(['.', '-', '+'], '', $this->version),
-//                $this->getLocalPath(),
-//                $this->getModuleEnv()
-//            );
-//        }
-//
-//        return $this->serviceContainer;
         return \PrestaShop\Module\PsAccounts\ServiceContainer\ServiceContainer::getInstance();
     }
 
diff --git a/src/ServiceContainer/ServiceContainer.php b/src/ServiceContainer/ServiceContainer.php
index 6e892d3d8..c917ca566 100644
--- a/src/ServiceContainer/ServiceContainer.php
+++ b/src/ServiceContainer/ServiceContainer.php
@@ -116,6 +116,7 @@ public function init()
      * @return mixed
      *
      * @throws ServiceNotFoundException
+     * @throws ProviderNotFoundException
      */
     public function get($name)
     {
@@ -145,6 +146,7 @@ public function get($name)
      * @return mixed
      *
      * @throws ServiceNotFoundException
+     * @throws ProviderNotFoundException
      */
     public function getService($name)
     {

From 33259be1c7b5bf5df31d2121ea7ad16fb07405fe Mon Sep 17 00:00:00 2001
From: hschoenenberger <herve.schoenenberger@prestashop.com>
Date: Tue, 5 Nov 2024 18:14:36 +0100
Subject: [PATCH 13/46] chore: empty services files

---
 ps_accounts.php | 2 --
 1 file changed, 2 deletions(-)

diff --git a/ps_accounts.php b/ps_accounts.php
index 7156d63dc..94636d031 100644
--- a/ps_accounts.php
+++ b/ps_accounts.php
@@ -256,7 +256,6 @@ public function getService($serviceName)
      */
     public function getParameter($name)
     {
-        //return $this->getServiceContainer()->getContainer()->getParameter($name);
         return $this->getServiceContainer()->getParameter($name);
     }
 
@@ -267,7 +266,6 @@ public function getParameter($name)
      */
     public function hasParameter($name)
     {
-        //return $this->getServiceContainer()->getContainer()->hasParameter($name);
         return $this->getServiceContainer()->hasParameter($name);
     }
 

From 0454058c9a5ce9b90f06da28c790f07a2e5c4df7 Mon Sep 17 00:00:00 2001
From: hschoenenberger <herve.schoenenberger@prestashop.com>
Date: Wed, 6 Nov 2024 09:13:13 +0100
Subject: [PATCH 14/46] chore: empty services files

---
 src/ServiceContainer/TODO | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 src/ServiceContainer/TODO

diff --git a/src/ServiceContainer/TODO b/src/ServiceContainer/TODO
new file mode 100644
index 000000000..5c37430fd
--- /dev/null
+++ b/src/ServiceContainer/TODO
@@ -0,0 +1,3 @@
+- cleanup config files -> upgrade script & TESTER LE LOGIN v8 !!!!!!!
+- use module singleton to store ServiceContainer instance
+- check logs on PHP8.1

From 65d73dfd75807c4db7d06c74f095f0975e4790a1 Mon Sep 17 00:00:00 2001
From: hschoenenberger <herve.schoenenberger@prestashop.com>
Date: Fri, 8 Nov 2024 18:38:46 +0100
Subject: [PATCH 15/46] fix: cherry pick some fixes

---
 src/Adapter/Link.php          | 53 ++++++++++++++++++++++++++++++-----
 src/Hook/HookableTrait.php    |  2 +-
 src/Provider/ShopProvider.php |  6 ++--
 3 files changed, 51 insertions(+), 10 deletions(-)

diff --git a/src/Adapter/Link.php b/src/Adapter/Link.php
index 89f516f10..7aff75c1b 100644
--- a/src/Adapter/Link.php
+++ b/src/Adapter/Link.php
@@ -59,12 +59,11 @@ public function __construct(
      * @param bool $withToken include or not the token in the url
      * @param array $sfRouteParams
      * @param array $params
+     * @param bool $absolute require an absolute uri
      *
      * @return string
-     *
-     * @throws \PrestaShopException
      */
-    public function getAdminLink($controller, $withToken = true, $sfRouteParams = [], $params = [])
+    public function getAdminLink($controller, $withToken = true, $sfRouteParams = [], $params = [], $absolute = false)
     {
         // Cannot generate admin link from front
         if (!defined('_PS_ADMIN_DIR_')) {
@@ -72,14 +71,41 @@ public function getAdminLink($controller, $withToken = true, $sfRouteParams = []
         }
 
         if ($this->shopContext->isShop17()) {
-            return $this->link->getAdminLink($controller, $withToken, $sfRouteParams, $params);
+            $uri = $this->rel2abs(
+                $this->link->getAdminLink($controller, $withToken, $sfRouteParams, $params),
+                $absolute
+            );
+        } else {
+            $uri = $this->getAdminLink16($controller, $withToken, $params);
+        }
+
+        if (!$withToken) {
+            // FIXME: getAdminLink still adds the token (sometimes)
+            $uri = preg_replace('/&_token=[^&]*/', '', $uri);
         }
+
+        return $uri;
+    }
+
+    /**
+     * @param string $controller
+     * @param bool $withToken
+     * @param array $params
+     *
+     * @return string
+     */
+    public function getAdminLink16($controller, $withToken, array $params)
+    {
         $paramsAsString = '';
         foreach ($params as $key => $value) {
             $paramsAsString .= "&$key=$value";
         }
 
-        return \Tools::getShopDomainSsl(true) . __PS_BASE_URI__ . basename(_PS_ADMIN_DIR_) . '/' . $this->link->getAdminLink($controller, $withToken) . $paramsAsString;
+        return \Tools::getShopDomainSsl(true) . // scheme + domain
+            __PS_BASE_URI__ . // physical + virtual
+            basename(_PS_ADMIN_DIR_) . '/' . // admin path
+            $this->link->getAdminLink($controller, $withToken) .
+            $paramsAsString;
     }
 
     /**
@@ -101,8 +127,6 @@ public function getLink()
      * @param array $params
      *
      * @return string
-     *
-     * @throws \PrestaShopException
      */
     public function getAdminLinkWithCustomDomain($sslDomain, $domain, $controller, $withToken = true, $sfRouteParams = [], $params = [])
     {
@@ -119,4 +143,19 @@ public function getAdminLinkWithCustomDomain($sslDomain, $domain, $controller, $
 
         return $boBaseUrl;
     }
+
+    /**
+     * @param $url
+     * @param $absolute
+     *
+     * @return mixed|string
+     */
+    protected function rel2abs($url, $absolute)
+    {
+        if ($absolute && !preg_match('/https?:\/\//', $url)) {
+            $url = \Tools::getShopDomainSsl(true) . $url;
+        }
+
+        return $url;
+    }
 }
diff --git a/src/Hook/HookableTrait.php b/src/Hook/HookableTrait.php
index 3dc09ff50..c9fb8fd84 100644
--- a/src/Hook/HookableTrait.php
+++ b/src/Hook/HookableTrait.php
@@ -58,6 +58,6 @@ private function executeHook($methodName, array $params = [])
      */
     public function __call($name, array $arguments)
     {
-        return $this->executeHook($name, $arguments[0]);
+        return $this->executeHook($name, is_array($arguments[0]) ? $arguments[0] : []);
     }
 }
diff --git a/src/Provider/ShopProvider.php b/src/Provider/ShopProvider.php
index 5baf221f6..bb30bd4cc 100644
--- a/src/Provider/ShopProvider.php
+++ b/src/Provider/ShopProvider.php
@@ -99,9 +99,11 @@ public function formatShopData(array $shopData, $psxName = '', $refreshTokens =
                     true,
                     [],
                     [
+                        'module_name' => $psxName,
                         'configure' => $psxName,
                         'setShopContext' => 's-' . $shopData['id_shop'],
-                    ]
+                    ],
+                    true
                 ),
                 'isLinkedV4' => null,
                 'unlinkedAuto' => !empty($linkShop->getUnlinkedOnError()),
@@ -123,7 +125,7 @@ public function formatShopData(array $shopData, $psxName = '', $refreshTokens =
      *
      * @throws \PrestaShopException|\Exception
      */
-    public function getCurrentShop($psxName = '')
+    public function getCurrentShop($psxName = 'ps_accounts')
     {
         $shop = $this->formatShopData((array) \Shop::getShop($this->shopContext->getContext()->shop->id), $psxName);
 

From 7ff488844eec59960cbfa95add972ef550bfeaa0 Mon Sep 17 00:00:00 2001
From: hschoenenberger <herve.schoenenberger@prestashop.com>
Date: Fri, 8 Nov 2024 18:54:41 +0100
Subject: [PATCH 16/46] fix: cherry pick some fixes

---
 src/Adapter/Link.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Adapter/Link.php b/src/Adapter/Link.php
index 7aff75c1b..0940d66fb 100644
--- a/src/Adapter/Link.php
+++ b/src/Adapter/Link.php
@@ -145,10 +145,10 @@ public function getAdminLinkWithCustomDomain($sslDomain, $domain, $controller, $
     }
 
     /**
-     * @param $url
-     * @param $absolute
+     * @param string $url
+     * @param bool $absolute
      *
-     * @return mixed|string
+     * @return string
      */
     protected function rel2abs($url, $absolute)
     {

From 072e8bfd1d3c26133a76ab871f95e8f6f65512e0 Mon Sep 17 00:00:00 2001
From: hschoenenberger <herve.schoenenberger@prestashop.com>
Date: Sat, 9 Nov 2024 09:24:03 +0100
Subject: [PATCH 17/46] refactor: wip

---
 src/Http/Client/Guzzle/Guzzle7Client.php      |  36 ---
 src/Http/Client/Guzzle/GuzzleClient.php       | 280 +++++++++++++-----
 .../Client/Guzzle/GuzzleClientFactory.php     |   2 +-
 3 files changed, 201 insertions(+), 117 deletions(-)

diff --git a/src/Http/Client/Guzzle/Guzzle7Client.php b/src/Http/Client/Guzzle/Guzzle7Client.php
index 94ac31845..1f097a766 100644
--- a/src/Http/Client/Guzzle/Guzzle7Client.php
+++ b/src/Http/Client/Guzzle/Guzzle7Client.php
@@ -24,43 +24,7 @@
 
 class Guzzle7Client extends GuzzleClient
 {
-    public function __construct($options)
-    {
-        parent::__construct($options);
 
-//        \Tools::refreshCACertFile();
 
-        $this->client = new Client(array_merge(
-            [
-                'timeout' => $this->timeout,
-                'http_errors' => $this->catchExceptions,
-                'verify' => $this->getVerify(),
-            ],
-            $options
-        ));
-    }
 
-    /**
-     * @return bool|string
-     */
-    protected function getVerify()
-    {
-        if (version_compare((string) phpversion(), '7', '>=')) {
-            /** @var \Ps_accounts $module */
-            $module = \Module::getInstanceByName('ps_accounts');
-
-            return (bool) $module->getParameter('ps_accounts.check_api_ssl_cert');
-        }
-        // bypass certificate expiration issue with PHP5.6
-        return false;
-
-//        if ((bool) $module->getParameter('ps_accounts.check_api_ssl_cert')) {
-//            if (defined('_PS_CACHE_CA_CERT_FILE_') && file_exists(constant('_PS_CACHE_CA_CERT_FILE_'))) {
-//                return constant('_PS_CACHE_CA_CERT_FILE_');
-//            }
-//
-//            return true;
-//        }
-//        return false;
-    }
 }
diff --git a/src/Http/Client/Guzzle/GuzzleClient.php b/src/Http/Client/Guzzle/GuzzleClient.php
index 6e1455a18..e7082d808 100644
--- a/src/Http/Client/Guzzle/GuzzleClient.php
+++ b/src/Http/Client/Guzzle/GuzzleClient.php
@@ -22,16 +22,10 @@
 
 use PrestaShop\Module\PsAccounts\Factory\CircuitBreakerFactory;
 use PrestaShop\Module\PsAccounts\Http\Client\CircuitBreaker\CircuitBreaker;
-use PrestaShop\Module\PsAccounts\Http\Client\ClientInterface;
-use PrestaShop\Module\PsAccounts\Vendor\GuzzleHttp\Client;
+use PrestaShop\Module\PsAccounts\Log\Logger;
 
-abstract class GuzzleClient implements ClientInterface
+class GuzzleClient
 {
-    /**
-     * @var Client
-     */
-    protected $client;
-
     /**
      * @var string
      */
@@ -63,32 +57,19 @@ public function __construct($options)
             isset($options['name']) ? $options['name'] : static::class
         );
         unset($options['name']);
-    }
 
-    /**
-     * @param mixed $response
-     *
-     * @return array
-     */
-    public function handleResponse($response)
-    {
-        $responseContents = $this->getResponseJson($response);
+//        \Tools::refreshCACertFile();
 
-        return [
-            'status' => $this->responseIsSuccessful($responseContents, $response->getStatusCode()),
-            'httpCode' => $response->getStatusCode(),
-            'body' => $responseContents,
-        ];
-    }
-
-    /**
-     * @param mixed $response
-     *
-     * @return mixed
-     */
-    public function getResponseJson($response)
-    {
-        return json_decode($response->getBody()->getContents(), true);
+        // TODO: http_errors
+        // TODO: circuit breaker
+//        $this->client = new Client(array_merge(
+//            [
+//                'timeout' => $this->timeout,
+//                'http_errors' => $this->catchExceptions,
+//                'verify' => $this->getVerify(),
+//            ],
+//            $options
+//        ));
     }
 
     /**
@@ -98,13 +79,25 @@ public function getResponseJson($response)
      */
     public function post(array $options = [])
     {
-        return $this->circuitBreaker->call(function () use ($options) {
-            $response = $this->getClient()->post($this->getRoute(), $options);
-            $response = $this->handleResponse($response);
-            $this->logResponseError($response, $options);
+//        return $this->circuitBreaker->call(function () use ($options) {
+//            $response = $this->getClient()->post($this->getRoute(), $options);
+//            $response = $this->handleResponse($response);
+//            $this->logResponseError($response, $options);
+//
+//            return $response;
+//        });
+
+        $ch = $this->initCurl($options);
+
+        curl_setopt($ch, CURLOPT_POST, true);
+
+        $this->initPayloadJson($options, $ch);
+
+        $response = $this->getResponse($ch, curl_exec($ch));
+
+        curl_close($ch);
 
-            return $response;
-        });
+        return $response;
     }
 
     /**
@@ -114,13 +107,25 @@ public function post(array $options = [])
      */
     public function patch(array $options = [])
     {
-        return $this->circuitBreaker->call(function () use ($options) {
-            $response = $this->getClient()->patch($this->getRoute(), $options);
-            $response = $this->handleResponse($response);
-            $this->logResponseError($response, $options);
+//        return $this->circuitBreaker->call(function () use ($options) {
+//            $response = $this->getClient()->patch($this->getRoute(), $options);
+//            $response = $this->handleResponse($response);
+//            $this->logResponseError($response, $options);
+//
+//            return $response;
+//        });
 
-            return $response;
-        });
+        $ch = $this->initCurl($options);
+
+        curl_setopt($ch, CURLOPT_CUSTOMREQUEST, 'PATCH');
+
+        $this->initPayloadJson($options, $ch);
+
+        $response = $this->getResponse($ch, curl_exec($ch));
+
+        curl_close($ch);
+
+        return $response;
     }
 
     /**
@@ -130,13 +135,20 @@ public function patch(array $options = [])
      */
     public function get(array $options = [])
     {
-        return $this->circuitBreaker->call(function () use ($options) {
-            $response = $this->getClient()->get($this->getRoute(), $options);
-            $response = $this->handleResponse($response);
-            $this->logResponseError($response, $options);
+//        return $this->circuitBreaker->call(function () use ($options) {
+//            $response = $this->getClient()->get($this->getRoute(), $options);
+//            $response = $this->handleResponse($response);
+//            $this->logResponseError($response, $options);
+//
+//            return $response;
+//        });
+        $ch = $this->initCurl($options);
+
+        $response = $this->getResponse($ch, curl_exec($ch));
 
-            return $response;
-        });
+        curl_close($ch);
+
+        return $response;
     }
 
     /**
@@ -146,13 +158,23 @@ public function get(array $options = [])
      */
     public function delete(array $options = [])
     {
-        return $this->circuitBreaker->call(function () use ($options) {
-            $response = $this->getClient()->delete($this->getRoute(), $options);
-            $response = $this->handleResponse($response);
-            $this->logResponseError($response, $options);
+//        return $this->circuitBreaker->call(function () use ($options) {
+//            $response = $this->getClient()->delete($this->getRoute(), $options);
+//            $response = $this->handleResponse($response);
+//            $this->logResponseError($response, $options);
+//
+//            return $response;
+//        });
+
+        $ch = $this->initCurl($options);
+
+        curl_setopt($ch, CURLOPT_CUSTOMREQUEST, 'DELETE');
+
+        $response = $this->getResponse($ch, curl_exec($ch));
 
-            return $response;
-        });
+        curl_close($ch);
+
+        return $response;
     }
 
     /**
@@ -167,62 +189,160 @@ public function responseIsSuccessful($responseContents, $httpStatusCode)
     }
 
     /**
-     * Getter for client.
+     * @return string
+     */
+    public function getRoute()
+    {
+        return $this->route;
+    }
+
+    /**
+     * @param string $route
      *
-     * @return Client
+     * @return void
      */
-    public function getClient()
+    public function setRoute($route)
     {
-        return $this->client;
+        $this->route = $route;
     }
 
     /**
-     * @param Client $client
+     * @param resource $ch
+     * @param string $response
+     *
+     * @return array
+     */
+    public function getResponse($ch, $response)
+    {
+        $statusCode = curl_getinfo($ch, CURLINFO_HTTP_CODE);
+        $res =  [
+            'status' => $this->responseIsSuccessful([], $statusCode),
+            'httpCode' => $statusCode,
+            'body' => \json_decode($response, true),
+        ];
+        $this->logResponse($response, $ch);
+
+        return $res;
+    }
+
+    /**
+     * @param array $response
+     * @param mixed $chr
      *
      * @return void
      */
-    public function setClient(Client $client)
+    private function logResponse(array $response, array $chr)
     {
-        $this->client = $client;
+        // If response is not successful only
+        if (!$response['status']) {
+            try {
+                $logger = Logger::getInstance();
+                $logger->error('route ' . $this->getRoute());
+                $logger->error('options ' . var_export(curl_getinfo($chr), true));
+                $logger->error('response ' . var_export($response, true));
+            } catch (\Exception $e) {
+            }
+        }
     }
 
     /**
-     * @return string
+     * @param array $options
+     * @param resource $ch
+     *
+     * @return void
      */
-    public function getRoute()
+    public function initHeaders(array $options, $ch)
     {
-        return $this->route;
+        if (array_key_exists('headers', $options)) {
+            $headers = [];
+            foreach ($options['headers'] as $header => $value) {
+                $headers[] = "$header: $value";
+            }
+            curl_setopt($ch, CURLOPT_HTTPHEADER, $headers);
+        }
     }
 
     /**
-     * @param string $route
+     * @return resource
+     */
+    public function initRoute()
+    {
+        /** @var \Ps_accounts $module */
+        $module = \Module::getInstanceByName('ps_accounts');
+        $apiRoute = $module->getParameter('ps_accounts.accounts_api_url');
+        $absRoute = preg_replace('/\/$/', '', $apiRoute) . preg_replace('/\/+/', '/', '/' . $this->getRoute());
+
+        $ch = curl_init();
+
+        curl_setopt($ch, CURLOPT_URL, $absRoute);
+        curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, $this->timeout);
+        curl_setopt($ch, CURLOPT_TIMEOUT, $this->timeout);
+        curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
+        //curl_setopt($ch, CURLOPT_VERBOSE, true);
+
+        return $ch;
+    }
+
+    /**
+     * @param resource $ch
      *
      * @return void
      */
-    public function setRoute($route)
+    public function initSsl($ch)
     {
-        $this->route = $route;
+        $checkSsl = $this->getVerify();
+        curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, $checkSsl);
+        curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, $checkSsl);
     }
 
     /**
-     * @param array $response
      * @param array $options
+     * @param resource $ch
      *
      * @return void
      */
-    private function logResponseError(array $response, array $options)
+    public function initPayloadJson(array $options, $ch)
     {
-        // If response is not successful only
-        if (!$response['status']) {
+        if (array_key_exists('json', $options)) {
+            curl_setopt($ch, CURLOPT_POSTFIELDS, json_encode($options['json']));
+            curl_setopt($ch, CURLOPT_HTTPHEADER, array('Content-Type: application/json'));
+        }
+    }
+
+    /**
+     * @return bool
+     */
+    protected function getVerify()
+    {
+        if (version_compare((string) phpversion(), '7', '>=')) {
             /** @var \Ps_accounts $module */
             $module = \Module::getInstanceByName('ps_accounts');
-            try {
-                $logger = $module->getLogger();
-                $logger->error('route ' . $this->getRoute());
-                $logger->error('options ' . var_export($options, true));
-                $logger->error('response ' . var_export($response, true));
-            } catch (\Exception $e) {
-            }
+
+            return (bool) $module->getParameter('ps_accounts.check_api_ssl_cert');
         }
+        // bypass certificate expiration issue with PHP5.6
+        return false;
+
+//        if ((bool) $module->getParameter('ps_accounts.check_api_ssl_cert')) {
+//            if (defined('_PS_CACHE_CA_CERT_FILE_') && file_exists(constant('_PS_CACHE_CA_CERT_FILE_'))) {
+//                return constant('_PS_CACHE_CA_CERT_FILE_');
+//            }
+//
+//            return true;
+//        }
+//        return false;
+    }
+
+    /**
+     * @param array $options
+     *
+     * @return resource
+     */
+    public function initCurl(array $options)
+    {
+        $ch = $this->initRoute();
+        $this->initHeaders($options, $ch);
+        $this->initSsl($ch);
+        return $ch;
     }
 }
diff --git a/src/Http/Client/Guzzle/GuzzleClientFactory.php b/src/Http/Client/Guzzle/GuzzleClientFactory.php
index 110e3b265..58b8d3e0a 100644
--- a/src/Http/Client/Guzzle/GuzzleClientFactory.php
+++ b/src/Http/Client/Guzzle/GuzzleClientFactory.php
@@ -34,6 +34,6 @@ class GuzzleClientFactory
      */
     public function create($options)
     {
-        return new Guzzle7Client($options);
+        return new GuzzleClient($options);
     }
 }

From b96997f9b45e13d434f5ccb084cc3cf30d507e87 Mon Sep 17 00:00:00 2001
From: hschoenenberger <herve.schoenenberger@prestashop.com>
Date: Sat, 9 Nov 2024 12:56:10 +0100
Subject: [PATCH 18/46] chore: cleanup namespaces

---
 src/Api/Client/AccountsClient.php             | 18 ++---
 src/Api/Client/ServicesBillingClient.php      | 12 ++--
 src/Http/Client/ClientInterface.php           | 65 -------------------
 .../GuzzleClient.php => Curl/HttpClient.php}  | 38 ++---------
 .../HttpClientFactory.php}                    | 10 +--
 src/Http/Client/Guzzle/Guzzle7Client.php      | 30 ---------
 6 files changed, 25 insertions(+), 148 deletions(-)
 delete mode 100644 src/Http/Client/ClientInterface.php
 rename src/Http/Client/{Guzzle/GuzzleClient.php => Curl/HttpClient.php} (85%)
 rename src/Http/Client/{Guzzle/GuzzleClientFactory.php => Curl/HttpClientFactory.php} (83%)
 delete mode 100644 src/Http/Client/Guzzle/Guzzle7Client.php

diff --git a/src/Api/Client/AccountsClient.php b/src/Api/Client/AccountsClient.php
index 3dd35116b..077ae9c26 100644
--- a/src/Api/Client/AccountsClient.php
+++ b/src/Api/Client/AccountsClient.php
@@ -22,8 +22,8 @@
 
 use PrestaShop\Module\PsAccounts\Account\Dto\UpdateShop;
 use PrestaShop\Module\PsAccounts\Account\Dto\UpgradeModule;
-use PrestaShop\Module\PsAccounts\Http\Client\Guzzle\GuzzleClient;
-use PrestaShop\Module\PsAccounts\Http\Client\Guzzle\GuzzleClientFactory;
+use PrestaShop\Module\PsAccounts\Http\Client\Curl\HttpClient;
+use PrestaShop\Module\PsAccounts\Http\Client\Curl\HttpClientFactory;
 use PrestaShop\Module\PsAccounts\Vendor\Ramsey\Uuid\Uuid;
 
 class AccountsClient
@@ -34,7 +34,7 @@ class AccountsClient
     private $apiUrl;
 
     /**
-     * @var GuzzleClient
+     * @var HttpClient
      */
     private $client;
 
@@ -47,15 +47,15 @@ class AccountsClient
      * ServicesAccountsClient constructor.
      *
      * @param string $apiUrl
-     * @param GuzzleClient|null $client
+     * @param HttpClient|null $client
      * @param int $defaultTimeout
      *
      * @throws \Exception
      */
     public function __construct(
-                     $apiUrl,
-        GuzzleClient $client = null,
-                     $defaultTimeout = 20
+        $apiUrl,
+        HttpClient $client = null,
+        $defaultTimeout = 20
     ) {
         $this->apiUrl = $apiUrl;
         $this->client = $client;
@@ -63,12 +63,12 @@ public function __construct(
     }
 
     /**
-     * @return GuzzleClient
+     * @return HttpClient
      */
     private function getClient()
     {
         if (null === $this->client) {
-            $this->client = (new GuzzleClientFactory())->create([
+            $this->client = (new HttpClientFactory())->create([
                 'name' => static::class,
                 'base_uri' => $this->apiUrl,
                 'headers' => $this->getHeaders(),
diff --git a/src/Api/Client/ServicesBillingClient.php b/src/Api/Client/ServicesBillingClient.php
index 28da29e3c..7553d9a88 100644
--- a/src/Api/Client/ServicesBillingClient.php
+++ b/src/Api/Client/ServicesBillingClient.php
@@ -20,8 +20,8 @@
 
 namespace PrestaShop\Module\PsAccounts\Api\Client;
 
-use PrestaShop\Module\PsAccounts\Http\Client\Guzzle\GuzzleClient;
-use PrestaShop\Module\PsAccounts\Http\Client\Guzzle\GuzzleClientFactory;
+use PrestaShop\Module\PsAccounts\Http\Client\Curl\HttpClient;
+use PrestaShop\Module\PsAccounts\Http\Client\Curl\HttpClientFactory;
 use PrestaShop\Module\PsAccounts\Provider\ShopProvider;
 use PrestaShop\Module\PsAccounts\Service\PsAccountsService;
 
@@ -31,7 +31,7 @@
 class ServicesBillingClient
 {
     /**
-     * @var GuzzleClient
+     * @var HttpClient
      */
     private $client;
 
@@ -41,7 +41,7 @@ class ServicesBillingClient
      * @param string $apiUrl
      * @param PsAccountsService $psAccountsService
      * @param ShopProvider $shopProvider
-     * @param GuzzleClient|null $client
+     * @param HttpClient|null $client
      *
      * @throws \PrestaShopException
      * @throws \Exception
@@ -50,7 +50,7 @@ public function __construct(
         $apiUrl,
         PsAccountsService $psAccountsService,
         ShopProvider $shopProvider,
-        GuzzleClient $client = null
+        HttpClient $client = null
     ) {
         $shopId = $shopProvider->getCurrentShop()['id'];
 
@@ -58,7 +58,7 @@ public function __construct(
 
         // Client can be provided for tests
         if (null === $client) {
-            $client = (new GuzzleClientFactory())->create([
+            $client = (new HttpClientFactory())->create([
                 'base_uri' => $apiUrl,
                 'headers' => [
                     // Commented, else does not work anymore with API.
diff --git a/src/Http/Client/ClientInterface.php b/src/Http/Client/ClientInterface.php
deleted file mode 100644
index 2035ef1fd..000000000
--- a/src/Http/Client/ClientInterface.php
+++ /dev/null
@@ -1,65 +0,0 @@
-<?php
-/**
- * Copyright since 2007 PrestaShop SA and Contributors
- * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License version 3.0
- * that is bundled with this package in the file LICENSE.md.
- * It is also available through the world-wide-web at this URL:
- * https://opensource.org/licenses/AFL-3.0
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@prestashop.com so we can send you a copy immediately.
- *
- * @author    PrestaShop SA and Contributors <contact@prestashop.com>
- * @copyright Since 2007 PrestaShop SA and Contributors
- * @license   https://opensource.org/licenses/AFL-3.0 Academic Free License version 3.0
- */
-
-namespace PrestaShop\Module\PsAccounts\Http\Client;
-
-use PrestaShop\Module\PsAccounts\Vendor\GuzzleHttp\Client;
-
-/**
- * Interface that the guzzle client class implement
- */
-interface ClientInterface
-{
-    /**
-     * Abtract client constructor
-     *
-     * @param array $options
-     */
-    public function __construct($options);
-
-    /**
-     * @return Client
-     */
-    public function getClient();
-
-    /**
-     * @param mixed $response
-     *
-     * @return array
-     */
-    public function handleResponse($response);
-
-    /**
-     * Check if the response is successful or not (response code 200 to 299).
-     *
-     * @param array $responseContents
-     * @param int $httpStatusCode
-     *
-     * @return bool
-     */
-    public function responseIsSuccessful($responseContents, $httpStatusCode);
-
-    /**
-     * @param mixed $response
-     *
-     * @return mixed
-     */
-    public function getResponseJson($response);
-}
diff --git a/src/Http/Client/Guzzle/GuzzleClient.php b/src/Http/Client/Curl/HttpClient.php
similarity index 85%
rename from src/Http/Client/Guzzle/GuzzleClient.php
rename to src/Http/Client/Curl/HttpClient.php
index e7082d808..1b968a501 100644
--- a/src/Http/Client/Guzzle/GuzzleClient.php
+++ b/src/Http/Client/Curl/HttpClient.php
@@ -18,13 +18,13 @@
  * @license   https://opensource.org/licenses/AFL-3.0 Academic Free License version 3.0
  */
 
-namespace PrestaShop\Module\PsAccounts\Http\Client\Guzzle;
+namespace PrestaShop\Module\PsAccounts\Http\Client\Curl;
 
 use PrestaShop\Module\PsAccounts\Factory\CircuitBreakerFactory;
 use PrestaShop\Module\PsAccounts\Http\Client\CircuitBreaker\CircuitBreaker;
 use PrestaShop\Module\PsAccounts\Log\Logger;
 
-class GuzzleClient
+class HttpClient
 {
     /**
      * @var string
@@ -38,11 +38,13 @@ class GuzzleClient
 
     /**
      * @var bool
+     * FIXME TODO: implement exceptions
      */
     protected $catchExceptions = false;
 
     /**
      * @var CircuitBreaker
+     * FIXME TODO: implement circuit breaker
      */
     protected $circuitBreaker;
 
@@ -57,19 +59,7 @@ public function __construct($options)
             isset($options['name']) ? $options['name'] : static::class
         );
         unset($options['name']);
-
 //        \Tools::refreshCACertFile();
-
-        // TODO: http_errors
-        // TODO: circuit breaker
-//        $this->client = new Client(array_merge(
-//            [
-//                'timeout' => $this->timeout,
-//                'http_errors' => $this->catchExceptions,
-//                'verify' => $this->getVerify(),
-//            ],
-//            $options
-//        ));
     }
 
     /**
@@ -80,11 +70,6 @@ public function __construct($options)
     public function post(array $options = [])
     {
 //        return $this->circuitBreaker->call(function () use ($options) {
-//            $response = $this->getClient()->post($this->getRoute(), $options);
-//            $response = $this->handleResponse($response);
-//            $this->logResponseError($response, $options);
-//
-//            return $response;
 //        });
 
         $ch = $this->initCurl($options);
@@ -108,11 +93,6 @@ public function post(array $options = [])
     public function patch(array $options = [])
     {
 //        return $this->circuitBreaker->call(function () use ($options) {
-//            $response = $this->getClient()->patch($this->getRoute(), $options);
-//            $response = $this->handleResponse($response);
-//            $this->logResponseError($response, $options);
-//
-//            return $response;
 //        });
 
         $ch = $this->initCurl($options);
@@ -136,11 +116,6 @@ public function patch(array $options = [])
     public function get(array $options = [])
     {
 //        return $this->circuitBreaker->call(function () use ($options) {
-//            $response = $this->getClient()->get($this->getRoute(), $options);
-//            $response = $this->handleResponse($response);
-//            $this->logResponseError($response, $options);
-//
-//            return $response;
 //        });
         $ch = $this->initCurl($options);
 
@@ -159,11 +134,6 @@ public function get(array $options = [])
     public function delete(array $options = [])
     {
 //        return $this->circuitBreaker->call(function () use ($options) {
-//            $response = $this->getClient()->delete($this->getRoute(), $options);
-//            $response = $this->handleResponse($response);
-//            $this->logResponseError($response, $options);
-//
-//            return $response;
 //        });
 
         $ch = $this->initCurl($options);
diff --git a/src/Http/Client/Guzzle/GuzzleClientFactory.php b/src/Http/Client/Curl/HttpClientFactory.php
similarity index 83%
rename from src/Http/Client/Guzzle/GuzzleClientFactory.php
rename to src/Http/Client/Curl/HttpClientFactory.php
index 58b8d3e0a..8b6e5f417 100644
--- a/src/Http/Client/Guzzle/GuzzleClientFactory.php
+++ b/src/Http/Client/Curl/HttpClientFactory.php
@@ -18,22 +18,24 @@
  * @license   https://opensource.org/licenses/AFL-3.0 Academic Free License version 3.0
  */
 
-namespace PrestaShop\Module\PsAccounts\Http\Client\Guzzle;
+namespace PrestaShop\Module\PsAccounts\Http\Client\Curl;
+
+use PrestaShop\Module\PsAccounts\Http\Client\Curl\HttpClient;
 
 /**
  * Construct the guzzle client depending on PrestaShop version
  */
-class GuzzleClientFactory
+class HttpClientFactory
 {
     /**
      * @param array $options
      *
-     * @return GuzzleClient
+     * @return HttpClient
      *
      * @throws \Exception
      */
     public function create($options)
     {
-        return new GuzzleClient($options);
+        return new HttpClient($options);
     }
 }
diff --git a/src/Http/Client/Guzzle/Guzzle7Client.php b/src/Http/Client/Guzzle/Guzzle7Client.php
deleted file mode 100644
index 1f097a766..000000000
--- a/src/Http/Client/Guzzle/Guzzle7Client.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-/**
- * Copyright since 2007 PrestaShop SA and Contributors
- * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License version 3.0
- * that is bundled with this package in the file LICENSE.md.
- * It is also available through the world-wide-web at this URL:
- * https://opensource.org/licenses/AFL-3.0
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@prestashop.com so we can send you a copy immediately.
- *
- * @author    PrestaShop SA and Contributors <contact@prestashop.com>
- * @copyright Since 2007 PrestaShop SA and Contributors
- * @license   https://opensource.org/licenses/AFL-3.0 Academic Free License version 3.0
- */
-
-namespace PrestaShop\Module\PsAccounts\Http\Client\Guzzle;
-
-use PrestaShop\Module\PsAccounts\Vendor\GuzzleHttp\Client;
-
-class Guzzle7Client extends GuzzleClient
-{
-
-
-
-}

From b08d2f68a9e5b6cdf08109d1ecbbd8fd8218e1df Mon Sep 17 00:00:00 2001
From: hschoenenberger <herve.schoenenberger@prestashop.com>
Date: Tue, 7 Jan 2025 18:38:24 +0100
Subject: [PATCH 19/46] feat: alpha proposal

---
 .dir-scoped                                   |   4 -
 composer.json                                 |  10 +-
 composer.lock                                 | 920 +-----------------
 config.local.php                              |   2 +-
 .../admin/AdminLoginPsAccountsController.php  |   8 +-
 .../admin/AdminOAuth2PsAccountsController.php |  44 +-
 controllers/front/apiV2ShopHealthCheck.php    |  10 +-
 src/Account/Session/ShopSession.php           |  40 +-
 src/Api/Client/AccountsClient.php             |  23 +-
 src/Api/Client/OAuth2Client.php               | 401 ++++++++
 src/Api/Client/ServicesBillingClient.php      |   2 +-
 .../AccountLogin/AccountLoginException.php    |  10 +-
 .../EmailNotVerifiedException.php             |   6 +-
 .../EmployeeNotFoundException.php             |   6 +-
 .../AccountLogin/Oauth2Exception.php          |   6 +-
 src/Factory/PrestaShopSessionFactory.php      |  12 +-
 .../ActionAdminLoginControllerSetMedia.php    |   2 -
 src/Hook/DisplayBackOfficeHeader.php          |   5 +-
 .../Client/CircuitBreaker/CircuitBreaker.php  |  10 +-
 .../CircuitBreakerException.php               |   7 +
 src/Http/Client/Curl/HttpClient.php           | 170 ++--
 src/Http/Client/Curl/HttpClientFactory.php    |   2 -
 src/Http/Client/Curl/Response.php             |  21 +
 src/Middleware/Oauth2Middleware.php           |  17 +-
 src/Provider/OAuth2/AccessToken.php           |  58 ++
 src/Provider/OAuth2/CachedFile.php            | 128 +++
 src/Provider/OAuth2/PrestaShopLoginTrait.php  |  50 +-
 src/Provider/OAuth2/PrestaShopLogoutTrait.php |  25 +-
 src/Provider/OAuth2/PrestaShopSession.php     |  53 +-
 src/Provider/OAuth2/ShopProvider.php          |   3 +
 src/Provider/OAuth2/UserInfos.php             |  80 ++
 src/Provider/OAuth2/WellKnown.php             | 134 +++
 src/Repository/ConfigurationRepository.php    |   2 -
 .../Contract/IServiceContainerService.php     |  33 -
 .../Contract/IServiceProvider.php             |  33 -
 .../Exception/ParameterNotFoundException.php  |  25 -
 .../Exception/ProviderNotFoundException.php   |  25 -
 .../Exception/ServiceNotFoundException.php    |  25 -
 .../Provider/ApiClientProvider.php            |  54 -
 .../Provider/CommandProvider.php              |  90 --
 .../Provider/DefaultProvider.php              | 150 ---
 .../Provider/OAuth2Provider.php               |  58 --
 .../Provider/RepositoryProvider.php           |  58 --
 .../Provider/SessionProvider.php              |  63 --
 src/ServiceContainer/ServiceContainer.php     | 252 -----
 src/ServiceContainer/TODO                     |   3 -
 src/ServiceProvider/ApiClientProvider.php     |  16 +-
 src/ServiceProvider/OAuth2Provider.php        |   3 -
 src/ServiceProvider/SessionProvider.php       |   4 +-
 49 files changed, 1154 insertions(+), 2009 deletions(-)
 create mode 100644 src/Api/Client/OAuth2Client.php
 create mode 100644 src/Http/Client/CircuitBreaker/CircuitBreakerException.php
 create mode 100644 src/Http/Client/Curl/Response.php
 create mode 100644 src/Provider/OAuth2/AccessToken.php
 create mode 100644 src/Provider/OAuth2/CachedFile.php
 create mode 100644 src/Provider/OAuth2/UserInfos.php
 create mode 100644 src/Provider/OAuth2/WellKnown.php
 delete mode 100644 src/ServiceContainer/Contract/IServiceContainerService.php
 delete mode 100644 src/ServiceContainer/Contract/IServiceProvider.php
 delete mode 100644 src/ServiceContainer/Exception/ParameterNotFoundException.php
 delete mode 100644 src/ServiceContainer/Exception/ProviderNotFoundException.php
 delete mode 100644 src/ServiceContainer/Exception/ServiceNotFoundException.php
 delete mode 100644 src/ServiceContainer/Provider/ApiClientProvider.php
 delete mode 100644 src/ServiceContainer/Provider/CommandProvider.php
 delete mode 100644 src/ServiceContainer/Provider/DefaultProvider.php
 delete mode 100644 src/ServiceContainer/Provider/OAuth2Provider.php
 delete mode 100644 src/ServiceContainer/Provider/RepositoryProvider.php
 delete mode 100644 src/ServiceContainer/Provider/SessionProvider.php
 delete mode 100644 src/ServiceContainer/ServiceContainer.php
 delete mode 100644 src/ServiceContainer/TODO

diff --git a/.dir-scoped b/.dir-scoped
index 406208e05..a55ac0e6a 100644
--- a/.dir-scoped
+++ b/.dir-scoped
@@ -1,10 +1,6 @@
 psr
-guzzlehttp
-league
-prestashopcorp/oauth2-prestashop
 prestashopcorp/lightweight-container
 lcobucci
 monolog
 ramsey/uuid
-ralouphie/getallheaders
 phpseclib/phpseclib/phpseclib
diff --git a/composer.json b/composer.json
index 7a510b966..e6abeb43b 100644
--- a/composer.json
+++ b/composer.json
@@ -22,18 +22,12 @@
     "autoload": {
         "psr-4": {
             "PrestaShop\\Module\\PsAccounts\\": "src/",
-            "PrestaShop\\Module\\PsAccounts\\Vendor\\GuzzleHttp\\": "vendor/guzzlehttp/guzzle/src",
-            "PrestaShop\\Module\\PsAccounts\\Vendor\\GuzzleHttp\\Promise\\": "vendor/guzzlehttp/promises/src",
-            "PrestaShop\\Module\\PsAccounts\\Vendor\\GuzzleHttp\\Psr7\\": "vendor/guzzlehttp/psr7/src",
-            "PrestaShop\\Module\\PsAccounts\\Vendor\\League\\OAuth2\\Client\\": "vendor/league/oauth2-client/src",
             "PrestaShop\\Module\\PsAccounts\\Vendor\\Lcobucci\\JWT\\": "vendor/lcobucci/jwt/src",
             "PrestaShop\\Module\\PsAccounts\\Vendor\\Monolog\\": "vendor/monolog/monolog/src/Monolog",
             "PrestaShop\\Module\\PsAccounts\\Vendor\\phpseclib\\": "vendor/phpseclib/phpseclib/phpseclib",
-            "PrestaShop\\Module\\PsAccounts\\Vendor\\Psr\\Http\\Message\\": "vendor/psr/http-message/src",
             "PrestaShop\\Module\\PsAccounts\\Vendor\\Psr\\Log\\": "vendor/psr/log/Psr/Log",
             "PrestaShop\\Module\\PsAccounts\\Vendor\\Ramsey\\Uuid\\": "vendor/ramsey/uuid/src",
-            "PrestaShop\\Module\\PsAccounts\\Vendor\\PrestaShopCorp\\LightweightContainer\\": "vendor/prestashopcorp/lightweight-container/src",
-            "PrestaShop\\Module\\PsAccounts\\Vendor\\PrestaShop\\OAuth2\\Client\\": "vendor/prestashopcorp/oauth2-prestashop/src"
+            "PrestaShop\\Module\\PsAccounts\\Vendor\\PrestaShopCorp\\LightweightContainer\\": "vendor/prestashopcorp/lightweight-container/src"
         },
         "classmap": [
             "ps_accounts.php",
@@ -49,8 +43,6 @@
         "sentry/sentry": "^1.0",
         "segmentio/analytics-php": "^1.8",
         "ramsey/uuid": "^3.9",
-        "prestashopcorp/oauth2-prestashop": "^2.0",
-        "guzzlehttp/guzzle": "^6.0",
         "prestashopcorp/lightweight-container": "v0.1.0"
     },
     "repositories": [
diff --git a/composer.lock b/composer.lock
index a7f60fce0..e9ab552c5 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,307 +4,8 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "04e664f2137e342837c03fe0d210f53e",
+    "content-hash": "409139f95e3e4a93448e81bdaf0f826d",
     "packages": [
-        {
-            "name": "guzzlehttp/guzzle",
-            "version": "6.5.8",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/guzzle/guzzle.git",
-                "reference": "a52f0440530b54fa079ce76e8c5d196a42cad981"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/guzzle/guzzle/zipball/a52f0440530b54fa079ce76e8c5d196a42cad981",
-                "reference": "a52f0440530b54fa079ce76e8c5d196a42cad981",
-                "shasum": ""
-            },
-            "require": {
-                "ext-json": "*",
-                "guzzlehttp/promises": "^1.0",
-                "guzzlehttp/psr7": "^1.9",
-                "php": ">=5.5",
-                "symfony/polyfill-intl-idn": "^1.17"
-            },
-            "require-dev": {
-                "ext-curl": "*",
-                "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.4 || ^7.0",
-                "psr/log": "^1.1"
-            },
-            "suggest": {
-                "psr/log": "Required for using the Log middleware"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "6.5-dev"
-                }
-            },
-            "autoload": {
-                "files": [
-                    "src/functions_include.php"
-                ],
-                "psr-4": {
-                    "GuzzleHttp\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Graham Campbell",
-                    "email": "hello@gjcampbell.co.uk",
-                    "homepage": "https://github.com/GrahamCampbell"
-                },
-                {
-                    "name": "Michael Dowling",
-                    "email": "mtdowling@gmail.com",
-                    "homepage": "https://github.com/mtdowling"
-                },
-                {
-                    "name": "Jeremy Lindblom",
-                    "email": "jeremeamia@gmail.com",
-                    "homepage": "https://github.com/jeremeamia"
-                },
-                {
-                    "name": "George Mponos",
-                    "email": "gmponos@gmail.com",
-                    "homepage": "https://github.com/gmponos"
-                },
-                {
-                    "name": "Tobias Nyholm",
-                    "email": "tobias.nyholm@gmail.com",
-                    "homepage": "https://github.com/Nyholm"
-                },
-                {
-                    "name": "Márk Sági-Kazár",
-                    "email": "mark.sagikazar@gmail.com",
-                    "homepage": "https://github.com/sagikazarmark"
-                },
-                {
-                    "name": "Tobias Schultze",
-                    "email": "webmaster@tubo-world.de",
-                    "homepage": "https://github.com/Tobion"
-                }
-            ],
-            "description": "Guzzle is a PHP HTTP client library",
-            "homepage": "http://guzzlephp.org/",
-            "keywords": [
-                "client",
-                "curl",
-                "framework",
-                "http",
-                "http client",
-                "rest",
-                "web service"
-            ],
-            "support": {
-                "issues": "https://github.com/guzzle/guzzle/issues",
-                "source": "https://github.com/guzzle/guzzle/tree/6.5.8"
-            },
-            "funding": [
-                {
-                    "url": "https://github.com/GrahamCampbell",
-                    "type": "github"
-                },
-                {
-                    "url": "https://github.com/Nyholm",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/guzzlehttp/guzzle",
-                    "type": "tidelift"
-                }
-            ],
-            "time": "2022-06-20T22:16:07+00:00"
-        },
-        {
-            "name": "guzzlehttp/promises",
-            "version": "1.5.3",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/guzzle/promises.git",
-                "reference": "67ab6e18aaa14d753cc148911d273f6e6cb6721e"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/guzzle/promises/zipball/67ab6e18aaa14d753cc148911d273f6e6cb6721e",
-                "reference": "67ab6e18aaa14d753cc148911d273f6e6cb6721e",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.5"
-            },
-            "require-dev": {
-                "symfony/phpunit-bridge": "^4.4 || ^5.1"
-            },
-            "type": "library",
-            "autoload": {
-                "files": [
-                    "src/functions_include.php"
-                ],
-                "psr-4": {
-                    "GuzzleHttp\\Promise\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Graham Campbell",
-                    "email": "hello@gjcampbell.co.uk",
-                    "homepage": "https://github.com/GrahamCampbell"
-                },
-                {
-                    "name": "Michael Dowling",
-                    "email": "mtdowling@gmail.com",
-                    "homepage": "https://github.com/mtdowling"
-                },
-                {
-                    "name": "Tobias Nyholm",
-                    "email": "tobias.nyholm@gmail.com",
-                    "homepage": "https://github.com/Nyholm"
-                },
-                {
-                    "name": "Tobias Schultze",
-                    "email": "webmaster@tubo-world.de",
-                    "homepage": "https://github.com/Tobion"
-                }
-            ],
-            "description": "Guzzle promises library",
-            "keywords": [
-                "promise"
-            ],
-            "support": {
-                "issues": "https://github.com/guzzle/promises/issues",
-                "source": "https://github.com/guzzle/promises/tree/1.5.3"
-            },
-            "funding": [
-                {
-                    "url": "https://github.com/GrahamCampbell",
-                    "type": "github"
-                },
-                {
-                    "url": "https://github.com/Nyholm",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/guzzlehttp/promises",
-                    "type": "tidelift"
-                }
-            ],
-            "time": "2023-05-21T12:31:43+00:00"
-        },
-        {
-            "name": "guzzlehttp/psr7",
-            "version": "1.9.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/guzzle/psr7.git",
-                "reference": "e4490cabc77465aaee90b20cfc9a770f8c04be6b"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/guzzle/psr7/zipball/e4490cabc77465aaee90b20cfc9a770f8c04be6b",
-                "reference": "e4490cabc77465aaee90b20cfc9a770f8c04be6b",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.4.0",
-                "psr/http-message": "~1.0",
-                "ralouphie/getallheaders": "^2.0.5 || ^3.0.0"
-            },
-            "provide": {
-                "psr/http-message-implementation": "1.0"
-            },
-            "require-dev": {
-                "ext-zlib": "*",
-                "phpunit/phpunit": "~4.8.36 || ^5.7.27 || ^6.5.14 || ^7.5.20 || ^8.5.8 || ^9.3.10"
-            },
-            "suggest": {
-                "laminas/laminas-httphandlerrunner": "Emit PSR-7 responses"
-            },
-            "type": "library",
-            "autoload": {
-                "files": [
-                    "src/functions_include.php"
-                ],
-                "psr-4": {
-                    "GuzzleHttp\\Psr7\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Graham Campbell",
-                    "email": "hello@gjcampbell.co.uk",
-                    "homepage": "https://github.com/GrahamCampbell"
-                },
-                {
-                    "name": "Michael Dowling",
-                    "email": "mtdowling@gmail.com",
-                    "homepage": "https://github.com/mtdowling"
-                },
-                {
-                    "name": "George Mponos",
-                    "email": "gmponos@gmail.com",
-                    "homepage": "https://github.com/gmponos"
-                },
-                {
-                    "name": "Tobias Nyholm",
-                    "email": "tobias.nyholm@gmail.com",
-                    "homepage": "https://github.com/Nyholm"
-                },
-                {
-                    "name": "Márk Sági-Kazár",
-                    "email": "mark.sagikazar@gmail.com",
-                    "homepage": "https://github.com/sagikazarmark"
-                },
-                {
-                    "name": "Tobias Schultze",
-                    "email": "webmaster@tubo-world.de",
-                    "homepage": "https://github.com/Tobion"
-                }
-            ],
-            "description": "PSR-7 message implementation that also provides common utility methods",
-            "keywords": [
-                "http",
-                "message",
-                "psr-7",
-                "request",
-                "response",
-                "stream",
-                "uri",
-                "url"
-            ],
-            "support": {
-                "issues": "https://github.com/guzzle/psr7/issues",
-                "source": "https://github.com/guzzle/psr7/tree/1.9.1"
-            },
-            "funding": [
-                {
-                    "url": "https://github.com/GrahamCampbell",
-                    "type": "github"
-                },
-                {
-                    "url": "https://github.com/Nyholm",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/guzzlehttp/psr7",
-                    "type": "tidelift"
-                }
-            ],
-            "time": "2023-04-17T16:00:37+00:00"
-        },
         {
             "name": "lcobucci/jwt",
             "version": "3.4.6",
@@ -382,76 +83,6 @@
             ],
             "time": "2021-09-28T19:18:28+00:00"
         },
-        {
-            "name": "league/oauth2-client",
-            "version": "2.7.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/thephpleague/oauth2-client.git",
-                "reference": "160d6274b03562ebeb55ed18399281d8118b76c8"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/thephpleague/oauth2-client/zipball/160d6274b03562ebeb55ed18399281d8118b76c8",
-                "reference": "160d6274b03562ebeb55ed18399281d8118b76c8",
-                "shasum": ""
-            },
-            "require": {
-                "guzzlehttp/guzzle": "^6.0 || ^7.0",
-                "paragonie/random_compat": "^1 || ^2 || ^9.99",
-                "php": "^5.6 || ^7.0 || ^8.0"
-            },
-            "require-dev": {
-                "mockery/mockery": "^1.3.5",
-                "php-parallel-lint/php-parallel-lint": "^1.3.1",
-                "phpunit/phpunit": "^5.7 || ^6.0 || ^9.5",
-                "squizlabs/php_codesniffer": "^2.3 || ^3.0"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-2.x": "2.0.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "League\\OAuth2\\Client\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Alex Bilbie",
-                    "email": "hello@alexbilbie.com",
-                    "homepage": "http://www.alexbilbie.com",
-                    "role": "Developer"
-                },
-                {
-                    "name": "Woody Gilk",
-                    "homepage": "https://github.com/shadowhand",
-                    "role": "Contributor"
-                }
-            ],
-            "description": "OAuth 2.0 Client Library",
-            "keywords": [
-                "Authentication",
-                "SSO",
-                "authorization",
-                "identity",
-                "idp",
-                "oauth",
-                "oauth2",
-                "single sign on"
-            ],
-            "support": {
-                "issues": "https://github.com/thephpleague/oauth2-client/issues",
-                "source": "https://github.com/thephpleague/oauth2-client/tree/2.7.0"
-            },
-            "time": "2023-04-16T18:19:15+00:00"
-        },
         {
             "name": "monolog/monolog",
             "version": "1.27.1",
@@ -763,32 +394,31 @@
             "time": "2024-12-24T08:26:20+00:00"
         },
         {
-            "name": "prestashopcorp/oauth2-prestashop",
-            "version": "v2.0.0",
+            "name": "psr/log",
+            "version": "1.1.4",
             "source": {
                 "type": "git",
-                "url": "https://github.com/PrestaShopCorp/oauth2-prestashop.git",
-                "reference": "694ea5b33527f3d5d2ef91d3f7e040a5dd2ec048"
+                "url": "https://github.com/php-fig/log.git",
+                "reference": "d49695b909c3b7628b6289db5479a1c204601f11"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/PrestaShopCorp/oauth2-prestashop/zipball/694ea5b33527f3d5d2ef91d3f7e040a5dd2ec048",
-                "reference": "694ea5b33527f3d5d2ef91d3f7e040a5dd2ec048",
+                "url": "https://api.github.com/repos/php-fig/log/zipball/d49695b909c3b7628b6289db5479a1c204601f11",
+                "reference": "d49695b909c3b7628b6289db5479a1c204601f11",
                 "shasum": ""
             },
             "require": {
-                "league/oauth2-client": "^2.0",
-                "php": ">=5.6"
-            },
-            "require-dev": {
-                "phpstan/phpstan": "^1.7",
-                "phpunit/phpunit": "^8.0 || ^9.0",
-                "prestashop/php-dev-tools": "^4.2"
+                "php": ">=5.3.0"
             },
             "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.1.x-dev"
+                }
+            },
             "autoload": {
                 "psr-4": {
-                    "PrestaShop\\OAuth2\\Client\\": "src/"
+                    "Psr\\Log\\": "Psr/Log/"
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
@@ -797,196 +427,44 @@
             ],
             "authors": [
                 {
-                    "name": "PrestaShop SA",
-                    "email": "contact@prestashop.com"
+                    "name": "PHP-FIG",
+                    "homepage": "https://www.php-fig.org/"
                 }
             ],
-            "description": "PrestaShop OAuth 2.0 support for the PHP League's OAuth 2.0 Client",
+            "description": "Common interface for logging libraries",
+            "homepage": "https://github.com/php-fig/log",
             "keywords": [
-                "Authentication",
-                "api",
-                "authorization",
-                "client",
-                "oauth",
-                "oauth2",
-                "php",
-                "prestashop"
+                "log",
+                "psr",
+                "psr-3"
             ],
             "support": {
-                "issues": "https://github.com/PrestaShopCorp/oauth2-prestashop/issues",
-                "source": "https://github.com/PrestaShopCorp/oauth2-prestashop/tree/v2.0.0"
+                "source": "https://github.com/php-fig/log/tree/1.1.4"
             },
-            "time": "2024-05-22T12:33:38+00:00"
+            "time": "2021-05-03T11:20:27+00:00"
         },
         {
-            "name": "psr/http-message",
-            "version": "1.0.1",
+            "name": "ramsey/uuid",
+            "version": "3.9.7",
             "source": {
                 "type": "git",
-                "url": "https://github.com/php-fig/http-message.git",
-                "reference": "f6561bf28d520154e4b0ec72be95418abe6d9363"
+                "url": "https://github.com/ramsey/uuid.git",
+                "reference": "dc75aa439eb4c1b77f5379fd958b3dc0e6014178"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/php-fig/http-message/zipball/f6561bf28d520154e4b0ec72be95418abe6d9363",
-                "reference": "f6561bf28d520154e4b0ec72be95418abe6d9363",
+                "url": "https://api.github.com/repos/ramsey/uuid/zipball/dc75aa439eb4c1b77f5379fd958b3dc0e6014178",
+                "reference": "dc75aa439eb4c1b77f5379fd958b3dc0e6014178",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.3.0"
+                "ext-json": "*",
+                "paragonie/random_compat": "^1 | ^2 | ^9.99.99",
+                "php": "^5.4 | ^7.0 | ^8.0",
+                "symfony/polyfill-ctype": "^1.8"
             },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.0.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Psr\\Http\\Message\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "PHP-FIG",
-                    "homepage": "http://www.php-fig.org/"
-                }
-            ],
-            "description": "Common interface for HTTP messages",
-            "homepage": "https://github.com/php-fig/http-message",
-            "keywords": [
-                "http",
-                "http-message",
-                "psr",
-                "psr-7",
-                "request",
-                "response"
-            ],
-            "support": {
-                "source": "https://github.com/php-fig/http-message/tree/master"
-            },
-            "time": "2016-08-06T14:39:51+00:00"
-        },
-        {
-            "name": "psr/log",
-            "version": "1.1.4",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/php-fig/log.git",
-                "reference": "d49695b909c3b7628b6289db5479a1c204601f11"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/php-fig/log/zipball/d49695b909c3b7628b6289db5479a1c204601f11",
-                "reference": "d49695b909c3b7628b6289db5479a1c204601f11",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.0"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.1.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Psr\\Log\\": "Psr/Log/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "PHP-FIG",
-                    "homepage": "https://www.php-fig.org/"
-                }
-            ],
-            "description": "Common interface for logging libraries",
-            "homepage": "https://github.com/php-fig/log",
-            "keywords": [
-                "log",
-                "psr",
-                "psr-3"
-            ],
-            "support": {
-                "source": "https://github.com/php-fig/log/tree/1.1.4"
-            },
-            "time": "2021-05-03T11:20:27+00:00"
-        },
-        {
-            "name": "ralouphie/getallheaders",
-            "version": "3.0.3",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/ralouphie/getallheaders.git",
-                "reference": "120b605dfeb996808c31b6477290a714d356e822"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/ralouphie/getallheaders/zipball/120b605dfeb996808c31b6477290a714d356e822",
-                "reference": "120b605dfeb996808c31b6477290a714d356e822",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.6"
-            },
-            "require-dev": {
-                "php-coveralls/php-coveralls": "^2.1",
-                "phpunit/phpunit": "^5 || ^6.5"
-            },
-            "type": "library",
-            "autoload": {
-                "files": [
-                    "src/getallheaders.php"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Ralph Khattar",
-                    "email": "ralph.khattar@gmail.com"
-                }
-            ],
-            "description": "A polyfill for getallheaders.",
-            "support": {
-                "issues": "https://github.com/ralouphie/getallheaders/issues",
-                "source": "https://github.com/ralouphie/getallheaders/tree/develop"
-            },
-            "time": "2019-03-08T08:55:37+00:00"
-        },
-        {
-            "name": "ramsey/uuid",
-            "version": "3.9.7",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/ramsey/uuid.git",
-                "reference": "dc75aa439eb4c1b77f5379fd958b3dc0e6014178"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/ramsey/uuid/zipball/dc75aa439eb4c1b77f5379fd958b3dc0e6014178",
-                "reference": "dc75aa439eb4c1b77f5379fd958b3dc0e6014178",
-                "shasum": ""
-            },
-            "require": {
-                "ext-json": "*",
-                "paragonie/random_compat": "^1 | ^2 | ^9.99.99",
-                "php": "^5.4 | ^7.0 | ^8.0",
-                "symfony/polyfill-ctype": "^1.8"
-            },
-            "replace": {
-                "rhumsaa/uuid": "self.version"
+            "replace": {
+                "rhumsaa/uuid": "self.version"
             },
             "require-dev": {
                 "codeception/aspect-mock": "^1 | ^2",
@@ -1266,334 +744,6 @@
                 }
             ],
             "time": "2020-10-23T09:01:57+00:00"
-        },
-        {
-            "name": "symfony/polyfill-intl-idn",
-            "version": "v1.19.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/polyfill-intl-idn.git",
-                "reference": "4ad5115c0f5d5172a9fe8147675ec6de266d8826"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/4ad5115c0f5d5172a9fe8147675ec6de266d8826",
-                "reference": "4ad5115c0f5d5172a9fe8147675ec6de266d8826",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.3",
-                "symfony/polyfill-intl-normalizer": "^1.10",
-                "symfony/polyfill-php70": "^1.10",
-                "symfony/polyfill-php72": "^1.10"
-            },
-            "suggest": {
-                "ext-intl": "For best performance"
-            },
-            "type": "library",
-            "extra": {
-                "thanks": {
-                    "url": "https://github.com/symfony/polyfill",
-                    "name": "symfony/polyfill"
-                },
-                "branch-alias": {
-                    "dev-main": "1.19-dev"
-                }
-            },
-            "autoload": {
-                "files": [
-                    "bootstrap.php"
-                ],
-                "psr-4": {
-                    "Symfony\\Polyfill\\Intl\\Idn\\": ""
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Laurent Bassin",
-                    "email": "laurent@bassin.info"
-                },
-                {
-                    "name": "Trevor Rowbotham",
-                    "email": "trevor.rowbotham@pm.me"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "description": "Symfony polyfill for intl's idn_to_ascii and idn_to_utf8 functions",
-            "homepage": "https://symfony.com",
-            "keywords": [
-                "compatibility",
-                "idn",
-                "intl",
-                "polyfill",
-                "portable",
-                "shim"
-            ],
-            "support": {
-                "source": "https://github.com/symfony/polyfill-intl-idn/tree/v1.19.0"
-            },
-            "funding": [
-                {
-                    "url": "https://symfony.com/sponsor",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/fabpot",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                    "type": "tidelift"
-                }
-            ],
-            "time": "2020-10-21T09:57:48+00:00"
-        },
-        {
-            "name": "symfony/polyfill-intl-normalizer",
-            "version": "v1.19.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/polyfill-intl-normalizer.git",
-                "reference": "8db0ae7936b42feb370840cf24de1a144fb0ef27"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/8db0ae7936b42feb370840cf24de1a144fb0ef27",
-                "reference": "8db0ae7936b42feb370840cf24de1a144fb0ef27",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.3"
-            },
-            "suggest": {
-                "ext-intl": "For best performance"
-            },
-            "type": "library",
-            "extra": {
-                "thanks": {
-                    "url": "https://github.com/symfony/polyfill",
-                    "name": "symfony/polyfill"
-                },
-                "branch-alias": {
-                    "dev-main": "1.19-dev"
-                }
-            },
-            "autoload": {
-                "files": [
-                    "bootstrap.php"
-                ],
-                "psr-4": {
-                    "Symfony\\Polyfill\\Intl\\Normalizer\\": ""
-                },
-                "classmap": [
-                    "Resources/stubs"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Nicolas Grekas",
-                    "email": "p@tchwork.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "description": "Symfony polyfill for intl's Normalizer class and related functions",
-            "homepage": "https://symfony.com",
-            "keywords": [
-                "compatibility",
-                "intl",
-                "normalizer",
-                "polyfill",
-                "portable",
-                "shim"
-            ],
-            "support": {
-                "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.19.0"
-            },
-            "funding": [
-                {
-                    "url": "https://symfony.com/sponsor",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/fabpot",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                    "type": "tidelift"
-                }
-            ],
-            "time": "2020-10-23T09:01:57+00:00"
-        },
-        {
-            "name": "symfony/polyfill-php70",
-            "version": "v1.19.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/polyfill-php70.git",
-                "reference": "3fe414077251a81a1b15b1c709faf5c2fbae3d4e"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-php70/zipball/3fe414077251a81a1b15b1c709faf5c2fbae3d4e",
-                "reference": "3fe414077251a81a1b15b1c709faf5c2fbae3d4e",
-                "shasum": ""
-            },
-            "require": {
-                "paragonie/random_compat": "~1.0|~2.0|~9.99",
-                "php": ">=5.3.3"
-            },
-            "type": "library",
-            "extra": {
-                "thanks": {
-                    "url": "https://github.com/symfony/polyfill",
-                    "name": "symfony/polyfill"
-                },
-                "branch-alias": {
-                    "dev-main": "1.19-dev"
-                }
-            },
-            "autoload": {
-                "files": [
-                    "bootstrap.php"
-                ],
-                "psr-4": {
-                    "Symfony\\Polyfill\\Php70\\": ""
-                },
-                "classmap": [
-                    "Resources/stubs"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Nicolas Grekas",
-                    "email": "p@tchwork.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "description": "Symfony polyfill backporting some PHP 7.0+ features to lower PHP versions",
-            "homepage": "https://symfony.com",
-            "keywords": [
-                "compatibility",
-                "polyfill",
-                "portable",
-                "shim"
-            ],
-            "support": {
-                "source": "https://github.com/symfony/polyfill-php70/tree/v1.19.0"
-            },
-            "funding": [
-                {
-                    "url": "https://symfony.com/sponsor",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/fabpot",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                    "type": "tidelift"
-                }
-            ],
-            "time": "2020-10-23T09:01:57+00:00"
-        },
-        {
-            "name": "symfony/polyfill-php72",
-            "version": "v1.19.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/polyfill-php72.git",
-                "reference": "beecef6b463b06954638f02378f52496cb84bacc"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/beecef6b463b06954638f02378f52496cb84bacc",
-                "reference": "beecef6b463b06954638f02378f52496cb84bacc",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.3"
-            },
-            "type": "library",
-            "extra": {
-                "thanks": {
-                    "url": "https://github.com/symfony/polyfill",
-                    "name": "symfony/polyfill"
-                },
-                "branch-alias": {
-                    "dev-main": "1.19-dev"
-                }
-            },
-            "autoload": {
-                "files": [
-                    "bootstrap.php"
-                ],
-                "psr-4": {
-                    "Symfony\\Polyfill\\Php72\\": ""
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Nicolas Grekas",
-                    "email": "p@tchwork.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "description": "Symfony polyfill backporting some PHP 7.2+ features to lower PHP versions",
-            "homepage": "https://symfony.com",
-            "keywords": [
-                "compatibility",
-                "polyfill",
-                "portable",
-                "shim"
-            ],
-            "support": {
-                "source": "https://github.com/symfony/polyfill-php72/tree/v1.19.0"
-            },
-            "funding": [
-                {
-                    "url": "https://symfony.com/sponsor",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/fabpot",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                    "type": "tidelift"
-                }
-            ],
-            "time": "2020-10-23T09:01:57+00:00"
         }
     ],
     "packages-dev": [],
diff --git a/config.local.php b/config.local.php
index 498dc7f82..838d8cfa3 100644
--- a/config.local.php
+++ b/config.local.php
@@ -44,5 +44,5 @@
     'ps_accounts.oauth2_url' => 'https://oauth.prestashop.local',
 
     'ps_accounts.testimonials_url' => 'https://assets.prestashop3.com/dst/accounts/assets/testimonials.json',
-    'ps_accounts.log_level' => 'DEBUG',
+    'ps_accounts.log_level' => 'INFO',
 ];
diff --git a/controllers/admin/AdminLoginPsAccountsController.php b/controllers/admin/AdminLoginPsAccountsController.php
index 39a443cc0..1e8609b72 100644
--- a/controllers/admin/AdminLoginPsAccountsController.php
+++ b/controllers/admin/AdminLoginPsAccountsController.php
@@ -18,8 +18,8 @@
  * @license   https://opensource.org/licenses/AFL-3.0 Academic Free License version 3.0
  */
 
+use PrestaShop\Module\PsAccounts\Api\Client\OAuth2Client;
 use PrestaShop\Module\PsAccounts\Polyfill\Traits\AdminController\IsAnonymousAllowed;
-use PrestaShop\Module\PsAccounts\Provider\OAuth2\ShopProvider;
 
 class AdminLoginPsAccountsController extends \AdminController
 {
@@ -121,8 +121,8 @@ public function setMedia($isNewTheme = false)
      */
     public function createTemplate($tpl_name)
     {
-        /** @var ShopProvider $provider */
-        $provider = $this->psAccounts->getService(ShopProvider::class);
+        /** @var OAuth2Client $provider */
+        $provider = $this->psAccounts->getService(OAuth2Client::class);
 
         $testimonials = $this->getTestimonials();
 
@@ -134,7 +134,7 @@ public function createTemplate($tpl_name)
         $this->context->smarty->assign([
             /* @phpstan-ignore-next-line */
             'shopUrl' => $this->context->shop->getBaseUrl(true),
-            'oauthRedirectUri' => $provider->getRedirectUri(),
+            'oauthRedirectUri' => $provider->getAuthRedirectUri(),
             'legacyLoginUri' => $this->context->link->getAdminLink(
                 'AdminLogin', true, [], [
                 'mode' => self::PARAM_MODE_LOCAL,
diff --git a/controllers/admin/AdminOAuth2PsAccountsController.php b/controllers/admin/AdminOAuth2PsAccountsController.php
index bf103c530..959e8d961 100644
--- a/controllers/admin/AdminOAuth2PsAccountsController.php
+++ b/controllers/admin/AdminOAuth2PsAccountsController.php
@@ -18,6 +18,7 @@
  * @license   https://opensource.org/licenses/AFL-3.0 Academic Free License version 3.0
  */
 
+use PrestaShop\Module\PsAccounts\Api\Client\OAuth2Client;
 use PrestaShop\Module\PsAccounts\Entity\EmployeeAccount;
 use PrestaShop\Module\PsAccounts\Exception\AccountLogin\AccountLoginException;
 use PrestaShop\Module\PsAccounts\Exception\AccountLogin\EmailNotVerifiedException;
@@ -25,11 +26,10 @@
 use PrestaShop\Module\PsAccounts\Polyfill\Traits\AdminController\IsAnonymousAllowed;
 use PrestaShop\Module\PsAccounts\Provider\OAuth2\PrestaShopLoginTrait;
 use PrestaShop\Module\PsAccounts\Provider\OAuth2\PrestaShopSession;
-use PrestaShop\Module\PsAccounts\Provider\OAuth2\ShopProvider;
+use PrestaShop\Module\PsAccounts\Provider\OAuth2\UserInfos;
 use PrestaShop\Module\PsAccounts\Repository\EmployeeAccountRepository;
 use PrestaShop\Module\PsAccounts\Service\AnalyticsService;
 use PrestaShop\Module\PsAccounts\Service\PsAccountsService;
-use PrestaShop\Module\PsAccounts\Vendor\PrestaShop\OAuth2\Client\Provider\PrestaShopUser;
 use Symfony\Component\HttpFoundation\Session\SessionInterface;
 
 /**
@@ -109,7 +109,7 @@ public function init()
     }
 
     /**
-     * @param PrestaShopUser $user
+     * @param UserInfos $user
      *
      * @return bool
      *
@@ -117,15 +117,15 @@ public function init()
      * @throws EmployeeNotFoundException
      * @throws Exception
      */
-    private function initUserSession(PrestaShopUser $user)
+    private function initUserSession(UserInfos $user)
     {
-        $this->oauth2ErrorLog((string) json_encode($user->toArray(), JSON_PRETTY_PRINT | JSON_UNESCAPED_UNICODE));
+        $this->oauth2ErrorLog((string) print_r($user, true));
 
         $context = $this->context;
 
-        $emailVerified = $user->getEmailVerified();
+        $emailVerified = $user->email_verified;
 
-        $context->employee = $this->getEmployeeByUidOrEmail($user->getId(), $user->getEmail());
+        $context->employee = $this->getEmployeeByUidOrEmail($user->sub, $user->email);
 
         if (!$context->employee->id || empty($emailVerified)) {
             $context->employee->logout();
@@ -193,13 +193,13 @@ private function onLoginFailed(AccountLoginException $e)
     }
 
     /**
-     * @return ShopProvider
+     * @return OAuth2Client
      *
      * @throws Exception
      */
-    private function getProvider()
+    private function getOAuth2Client()
     {
-        return $this->module->getService(ShopProvider::class);
+        return $this->module->getService(OAuth2Client::class);
     }
 
     /**
@@ -241,26 +241,26 @@ protected function getOauth2Session()
     }
 
     /**
-     * @param PrestaShopUser $user
+     * @param UserInfos $user
      *
      * @return void
      *
      * @throws Exception
      */
-    private function trackLoginEvent(PrestaShopUser $user)
+    private function trackLoginEvent(UserInfos $user)
     {
         if ($this->module->isShopEdition()) {
             $this->analyticsService->identify(
-                $user->getId(),
-                $user->getName(),
-                $user->getEmail()
+                $user->sub,
+                $user->name,
+                $user->email
             );
             $this->analyticsService->group(
-                $user->getId(),
+                $user->sub,
                 (string) $this->psAccountsService->getShopUuid()
             );
             $this->analyticsService->trackUserSignedIntoApp(
-                $user->getId(),
+                $user->sub,
                 'smb-edition'
             );
         }
@@ -277,16 +277,16 @@ private function trackLoginFailedEvent($e)
     {
         $user = $e->getUser();
         $this->analyticsService->identify(
-            $user->getId(),
-            $user->getName(),
-            $user->getEmail()
+            $user->sub,
+            $user->name,
+            $user->email
         );
         $this->analyticsService->group(
-            $user->getId(),
+            $user->sub,
             (string) $this->psAccountsService->getShopUuid()
         );
         $this->analyticsService->trackBackOfficeSSOSignInFailed(
-            $user->getId(),
+            $user->sub,
             $e->getType(),
             $e->getMessage()
         );
diff --git a/controllers/front/apiV2ShopHealthCheck.php b/controllers/front/apiV2ShopHealthCheck.php
index 2387436e2..e91bd77cb 100644
--- a/controllers/front/apiV2ShopHealthCheck.php
+++ b/controllers/front/apiV2ShopHealthCheck.php
@@ -24,11 +24,11 @@
 use PrestaShop\Module\PsAccounts\Account\Token\NullToken;
 use PrestaShop\Module\PsAccounts\Account\Token\Token;
 use PrestaShop\Module\PsAccounts\Api\Client\AccountsClient;
+use PrestaShop\Module\PsAccounts\Api\Client\OAuth2Client as OAuth2ApiClient;
 use PrestaShop\Module\PsAccounts\Api\Controller\AbstractShopRestController;
 use PrestaShop\Module\PsAccounts\Api\Controller\Request\ShopHealthCheckRequest;
 use PrestaShop\Module\PsAccounts\Exception\RefreshTokenException;
 use PrestaShop\Module\PsAccounts\Provider\OAuth2\Oauth2Client;
-use PrestaShop\Module\PsAccounts\Provider\OAuth2\ShopProvider;
 use PrestaShop\Module\PsAccounts\Service\PsAccountsService;
 
 class ps_AccountsApiV2ShopHealthCheckModuleFrontController extends AbstractShopRestController
@@ -69,9 +69,9 @@ class ps_AccountsApiV2ShopHealthCheckModuleFrontController extends AbstractShopR
     private $accountsClient;
 
     /**
-     * @var ShopProvider
+     * @var OAuth2ApiClient
      */
-    private $shopProvider;
+    private $oauth2ApiClient;
 
     public function __construct()
     {
@@ -87,7 +87,7 @@ public function __construct()
         $this->firebaseOwnerSession = $this->module->getService(Firebase\OwnerSession::class);
         $this->accountsClient = $this->module->getService(AccountsClient::class);
         $this->psAccountsService = $this->module->getService(PsAccountsService::class);
-        $this->shopProvider = $this->module->getService(ShopProvider::class);
+        $this->oauth2ApiClient = $this->module->getService(OAuth2ApiClient::class);
     }
 
     /**
@@ -129,7 +129,7 @@ public function show(Shop $shop, ShopHealthCheckRequest $request)
             'firebaseShopToken' => $this->tokenInfos($firebaseShopToken),
             'fopenActive' => (bool) ini_get('allow_url_fopen'),
             'curlActive' => extension_loaded('curl'), //function_exists('curl_version'),
-            'oauthApiConnectivity' => (bool) $this->shopProvider->getWellKnown()->issuer,
+            'oauthApiConnectivity' => (bool) $this->oauth2ApiClient->getWellKnown()->issuer,
             'accountsApiConnectivity' => $this->accountsApiHealthCheck(),
             'serverUTC' => time(),
             'mysqlUTC' => $this->getDatabaseTimestamp(),
diff --git a/src/Account/Session/ShopSession.php b/src/Account/Session/ShopSession.php
index 10b1a0273..9854451b8 100644
--- a/src/Account/Session/ShopSession.php
+++ b/src/Account/Session/ShopSession.php
@@ -24,16 +24,12 @@
 use PrestaShop\Module\PsAccounts\Account\Exception\InconsistentAssociationStateException;
 use PrestaShop\Module\PsAccounts\Account\LinkShop;
 use PrestaShop\Module\PsAccounts\Account\Token\Token;
+use PrestaShop\Module\PsAccounts\Api\Client\OAuth2Client;
 use PrestaShop\Module\PsAccounts\Cqrs\CommandBus;
 use PrestaShop\Module\PsAccounts\Exception\RefreshTokenException;
 use PrestaShop\Module\PsAccounts\Hook\ActionShopAccessTokenRefreshAfter;
-use PrestaShop\Module\PsAccounts\Log\Logger;
-use PrestaShop\Module\PsAccounts\Provider\OAuth2\ShopProvider;
+use PrestaShop\Module\PsAccounts\Provider\OAuth2\AccessToken;
 use PrestaShop\Module\PsAccounts\Repository\ConfigurationRepository;
-use PrestaShop\Module\PsAccounts\Vendor\League\OAuth2\Client\Grant\ClientCredentials;
-use PrestaShop\Module\PsAccounts\Vendor\League\OAuth2\Client\Provider\Exception\IdentityProviderException;
-use PrestaShop\Module\PsAccounts\Vendor\League\OAuth2\Client\Token\AccessToken;
-use PrestaShop\Module\PsAccounts\Vendor\League\OAuth2\Client\Token\AccessTokenInterface;
 
 class ShopSession extends Session implements SessionInterface
 {
@@ -48,9 +44,9 @@ class ShopSession extends Session implements SessionInterface
     protected $configurationRepository;
 
     /**
-     * @var ShopProvider
+     * @var OAuth2Client
      */
-    protected $oauth2ClientProvider;
+    protected $oauth2ApiClient;
 
     /**
      * @var LinkShop
@@ -64,17 +60,18 @@ class ShopSession extends Session implements SessionInterface
 
     /**
      * @param ConfigurationRepository $configurationRepository
-     * @param ShopProvider $oauth2ClientProvider
+     * @param OAuth2Client $oauth2ApiClient
+     * @param LinkShop $linkShop
      * @param CommandBus $commandBus
      */
     public function __construct(
         ConfigurationRepository $configurationRepository,
-        ShopProvider $oauth2ClientProvider,
+        OAuth2Client $oauth2ApiClient,
         LinkShop $linkShop,
         CommandBus $commandBus
     ) {
         $this->configurationRepository = $configurationRepository;
-        $this->oauth2ClientProvider = $oauth2ClientProvider;
+        $this->oauth2ApiClient = $oauth2ApiClient;
         $this->linkShop = $linkShop;
         $this->commandBus = $commandBus;
     }
@@ -95,8 +92,8 @@ public function refreshToken($refreshToken = null)
 
             //return new Token($accessToken->getToken(), $accessToken->getRefreshToken());
             $this->setToken(
-                $accessToken->getToken(),
-                $accessToken->getRefreshToken()
+                $accessToken->access_token,
+                $accessToken->refresh_token
             );
 
             $token = $this->getToken();
@@ -109,7 +106,7 @@ public function refreshToken($refreshToken = null)
                 $this->configurationRepository->getShopId(),
                 $e->getMessage()
             ));
-        } catch (IdentityProviderException $e) {
+        //} catch (IdentityProviderException $e) {
         } catch (\Throwable $e) {
             /* @phpstan-ignore-next-line */
         } catch (\Exception $e) {
@@ -157,9 +154,7 @@ public function setOauth2ClientReceiptTimeout($oauth2ClientReceiptTimeout)
     /**
      * @param string $shopUid
      *
-     * @return AccessToken|AccessTokenInterface
-     *
-     * @throws IdentityProviderException
+     * @return AccessToken
      */
     protected function getAccessToken($shopUid)
     {
@@ -167,13 +162,10 @@ protected function getAccessToken($shopUid)
             'shop_' . $shopUid,
             //'another.audience'
         ];
-        $token = $this->oauth2ClientProvider->getAccessToken(new ClientCredentials(), [
-            //'scope' => 'read.all write.all',
-            'audience' => implode(' ', $audience),
-        ]);
-        Logger::getInstance()->debug(__METHOD__ . json_encode($token->jsonSerialize(), JSON_PRETTY_PRINT));
 
-        return $token;
+        $accessToken = $this->oauth2ApiClient->getAccessTokenByClientCredentials([], $audience);
+
+        return $accessToken;
     }
 
     /**
@@ -192,7 +184,7 @@ protected function assertAssociationState($oauth2ClientReceiptTimeout = 60)
 
         if ($this->linkShop->exists() &&
             $currentTs - $linkedAtTs > $oauth2ClientReceiptTimeout &&
-            !$this->oauth2ClientProvider->getOauth2Client()->exists()) {
+            !$this->oauth2ApiClient->getOauth2Client()->exists()) {
             throw new InconsistentAssociationStateException('Invalid OAuth2 client');
         }
     }
diff --git a/src/Api/Client/AccountsClient.php b/src/Api/Client/AccountsClient.php
index ce5cf7e68..92835d9cd 100644
--- a/src/Api/Client/AccountsClient.php
+++ b/src/Api/Client/AccountsClient.php
@@ -31,7 +31,7 @@ class AccountsClient
     /**
      * @var string
      */
-    private $apiUrl;
+    private $baseUri;
 
     /**
      * @var HttpClient
@@ -43,23 +43,27 @@ class AccountsClient
      */
     private $defaultTimeout;
 
+    /**
+     * @var bool
+     */
+    protected $sslCheck;
+
     /**
      * ServicesAccountsClient constructor.
      *
-     * @param string $apiUrl
-     * @param HttpClient|null $client
+     * @param string $baseUri
      * @param int $defaultTimeout
      *
      * @throws \Exception
      */
     public function __construct(
-        $apiUrl,
-        HttpClient $client = null,
-        $defaultTimeout = 20
+        $baseUri,
+        $defaultTimeout = 20,
+        $sslCheck = true
     ) {
-        $this->apiUrl = $apiUrl;
-        $this->client = $client;
+        $this->baseUri = $baseUri;
         $this->defaultTimeout = $defaultTimeout;
+        $this->sslCheck = $sslCheck;
     }
 
     /**
@@ -70,9 +74,10 @@ private function getClient()
         if (null === $this->client) {
             $this->client = (new HttpClientFactory())->create([
                 'name' => static::class,
-                'base_uri' => $this->apiUrl,
+                'baseUri' => $this->baseUri,
                 'headers' => $this->getHeaders(),
                 'timeout' => $this->defaultTimeout,
+                'sslCheck' => $this->sslCheck,
             ]);
         }
 
diff --git a/src/Api/Client/OAuth2Client.php b/src/Api/Client/OAuth2Client.php
new file mode 100644
index 000000000..af204e14f
--- /dev/null
+++ b/src/Api/Client/OAuth2Client.php
@@ -0,0 +1,401 @@
+<?php
+/**
+ * Copyright since 2007 PrestaShop SA and Contributors
+ * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License version 3.0
+ * that is bundled with this package in the file LICENSE.md.
+ * It is also available through the world-wide-web at this URL:
+ * https://opensource.org/licenses/AFL-3.0
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@prestashop.com so we can send you a copy immediately.
+ *
+ * @author    PrestaShop SA and Contributors <contact@prestashop.com>
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license   https://opensource.org/licenses/AFL-3.0 Academic Free License version 3.0
+ */
+
+namespace PrestaShop\Module\PsAccounts\Api\Client;
+
+use PrestaShop\Module\PsAccounts\Adapter\Link;
+use PrestaShop\Module\PsAccounts\Http\Client\Curl\HttpClient;
+use PrestaShop\Module\PsAccounts\Http\Client\Curl\HttpClientFactory;
+use PrestaShop\Module\PsAccounts\Provider\OAuth2\AccessToken;
+use PrestaShop\Module\PsAccounts\Provider\OAuth2\CachedFile;
+use PrestaShop\Module\PsAccounts\Provider\OAuth2\Oauth2Client as OauthClient;
+use PrestaShop\Module\PsAccounts\Provider\OAuth2\PrestaShopLogoutTrait;
+use PrestaShop\Module\PsAccounts\Provider\OAuth2\UserInfos;
+use PrestaShop\Module\PsAccounts\Provider\OAuth2\WellKnown;
+use PrestaShop\Module\PsAccounts\Vendor\Ramsey\Uuid\Uuid;
+
+class OAuth2Client
+{
+    /**
+     * @var string
+     */
+    private $baseUri;
+
+    /**
+     * @var HttpClient
+     */
+    private $client;
+
+    /**
+     * @var WellKnown
+     */
+    private $wellKnown;
+
+    /**
+     * @var CachedFile
+     */
+    private $cachedWellKnown;
+
+    /**
+     * @var OauthClient
+     */
+    private $oauth2Client;
+
+    /**
+     * @var Link
+     */
+    private $link;
+
+    /**
+     * @var int
+     */
+    private $defaultTimeout;
+
+    /**
+     * @var bool
+     */
+    protected $sslCheck;
+
+    /**
+     * @param string $baseUri
+     * @param OauthClient $oauth2Client
+     * @param Link $link
+     * @param string $cacheDir
+     * @param int $defaultTimeout
+     * @param bool $sslCheck
+     *
+     * @throws \Exception
+     */
+    public function __construct(
+        $baseUri,
+        OauthClient $oauth2Client,
+        Link $link,
+        $cacheDir = null,
+        $defaultTimeout = 20,
+        $sslCheck = true
+    ) {
+        $this->baseUri = $baseUri;
+        $this->oauth2Client = $oauth2Client;
+        $this->link = $link;
+        $this->defaultTimeout = $defaultTimeout;
+        $this->sslCheck = $sslCheck;
+
+        // FIXME configuration parameter
+        $this->cachedWellKnown = new CachedFile(
+            $cacheDir . '/openid-configuration.json',
+            60 * 60 * 24
+        );
+    }
+
+    /**
+     * @return HttpClient
+     */
+    private function getClient()
+    {
+        if (null === $this->client) {
+            $this->client = (new HttpClientFactory())->create([
+                'name' => static::class,
+                'baseUri' => $this->baseUri,
+                'headers' => $this->getHeaders(),
+                'timeout' => $this->defaultTimeout,
+                'sslCheck' => $this->sslCheck,
+                'objectResponse' => true,
+            ]);
+        }
+
+        return $this->client;
+    }
+
+    /**
+     * @param array $additionalHeaders
+     *
+     * @return array
+     */
+    private function getHeaders($additionalHeaders = [])
+    {
+        return array_merge([
+            'Accept' => 'application/json',
+            'X-Module-Version' => \Ps_accounts::VERSION,
+            'X-Prestashop-Version' => _PS_VERSION_,
+            'X-Request-ID' => Uuid::uuid4()->toString(),
+        ], $additionalHeaders);
+    }
+
+    /**
+     * @return WellKnown
+     */
+    public function getWellKnown()
+    {
+        /* @phpstan-ignore-next-line */
+        if (!isset($this->wellKnown) || $this->cachedWellKnown->isExpired()) {
+            try {
+                $this->wellKnown = new WellKnown(
+                    json_decode(
+                        ($this->cachedWellKnown !== null) ?
+                            $this->getCachedWellKnown() :
+                            $this->fetchWellKnown($this->getOauth2Url()),
+                        true
+                    )
+                );
+            } catch (\Throwable $e) {
+                /* @phpstan-ignore-next-line */
+            } catch (\Exception $e) {
+            }
+            if (isset($e)) {
+                $this->wellKnown = new WellKnown();
+            }
+        }
+
+        return $this->wellKnown;
+    }
+
+    /**
+     * @param bool $forceRefresh
+     *
+     * @return string
+     *
+     * @throws \Exception
+     */
+    protected function getCachedWellKnown($forceRefresh = false)
+    {
+        if (null === $this->cachedWellKnown) {
+            throw new \Exception('Cache file not configured');
+        }
+
+        if ($this->cachedWellKnown->isExpired() || $forceRefresh) {
+            $this->cachedWellKnown->write(
+                json_encode($this->fetchWellKnown($this->baseUri), JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES)
+            );
+        }
+
+        return $this->cachedWellKnown->read();
+    }
+
+    /**
+     * @param string|null $url
+     *
+     * @return array
+     */
+    protected function fetchWellKnown($url = null)
+    {
+        $wellKnownUrl = $url ?: $this->baseUri;
+        if (\strpos($wellKnownUrl, '/.well-known') === \false) {
+            $wellKnownUrl = \preg_replace('/\\/?$/', '/.well-known/openid-configuration', $wellKnownUrl);
+        }
+
+        $this->getClient()->setRoute($wellKnownUrl);
+        $response = $this->getClient()->get();
+
+        return $response->body;
+    }
+
+    /**
+     * @param array $scope
+     * @param array $audience
+     *
+     * @return AccessToken access token
+     */
+    public function getAccessTokenByClientCredentials(array $scope = [], array $audience = [])
+    {
+        $this->getClient()->setRoute($this->getWellKnown()->token_endpoint);
+
+        $response = $this->getClient()->post([
+            'body' => [
+                'grant_type' => 'client_credentials',
+                'client_id' => $this->oauth2Client->getClientId(),
+                'client_secret' => $this->oauth2Client->getClientSecret(),
+                'scope' => implode(' ', $scope),
+                'audience' => implode(' ', $audience),
+            ],
+        ]);
+
+        return new AccessToken($response->body);
+    }
+
+    /**
+     * @param string $state
+     * @param string $redirectUri
+     * @param string|null $pkceCode
+     * @param string $pkceMethod
+     * @param string $uiLocales
+     *
+     * @return string authorization flow uri
+     */
+    public function getAuthorizationUri(
+        $state,
+        $redirectUri,
+        $pkceCode = null,
+        $pkceMethod = 'S256',
+        $uiLocales = 'fr'
+    ) {
+        return $this->getWellKnown()->authorization_endpoint . '?' .
+            http_build_query(array_merge([
+                'ui_locales' => $uiLocales,
+                'state' => $state,
+                'scope' => 'openid offline_access',
+                'response_type' => 'code',
+                'approval_prompt' => 'auto',
+                'redirect_uri' => $redirectUri,
+                'client_id' => $this->oauth2Client->getClientId(),
+            ], $pkceCode ? [
+                'code_challenge' => trim(strtr(base64_encode(hash('sha256', $pkceCode, true)), '+/', '-_'), '='),
+                'code_challenge_method' => $pkceMethod,
+            ] : []));
+    }
+
+    /**
+     * @example  http://my-shop.mydomain/admin-path/index.php?controller=AdminOAuth2PsAccounts
+     *
+     * @return string
+     */
+    public function getAuthRedirectUri()
+    {
+        return $this->link->getAdminLink('AdminOAuth2PsAccounts', false);
+    }
+
+    /**
+     * @param int $length
+     *
+     * @return string
+     *
+     * @throws \Random\RandomException
+     */
+    public function getRandomState($length = 32)
+    {
+        return bin2hex(random_bytes($length / 2));
+    }
+
+    /**
+     * @param int $length
+     *
+     * @return false|string
+     *
+     * @throws \Random\RandomException
+     */
+    public function getRandomPkceCode($length = 64)
+    {
+        return substr(strtr(base64_encode(random_bytes($length)), '+/', '-_'), 0, $length);
+    }
+
+    /**
+     * @param string $code
+     * @param string|null $pkceCode
+     * @param string|null $redirectUri
+     * @param array $scope
+     * @param array $audience
+     *
+     * @return AccessToken access token
+     */
+    public function getAccessTokenByAuthorizationCode(
+        $code,
+        $pkceCode = null,
+        $redirectUri = null,
+        array $scope = [],
+        array $audience = []
+    ) {
+        $this->getClient()->setRoute($this->getWellKnown()->token_endpoint);
+
+        $response = $this->getClient()->post([
+            'body' => array_merge([
+                'grant_type' => 'authorization_code',
+                'client_id' => $this->oauth2Client->getClientId(),
+                'client_secret' => $this->oauth2Client->getClientSecret(),
+                'code' => $code,
+                'scope' => implode(' ', $scope),
+                'audience' => implode(' ', $audience),
+            ], $pkceCode ? [
+                'code_verifier' => $pkceCode,
+                'redirect_uri' => $redirectUri,
+            ] : []),
+        ]);
+
+        return new AccessToken($response->body);
+    }
+
+    /**
+     * @param string $refreshToken
+     *
+     * @return AccessToken
+     */
+    public function refreshAccessToken($refreshToken)
+    {
+        $this->getClient()->setRoute($this->getWellKnown()->token_endpoint);
+
+        $response = $this->getClient()->post([
+            'body' => [
+                'grant_type' => 'refresh_token',
+                'client_id' => $this->oauth2Client->getClientId(),
+                'refresh_token' => $refreshToken,
+            ],
+        ]);
+
+        return new AccessToken($response->body);
+    }
+
+    /**
+     * @param string $accessToken
+     *
+     * @return UserInfos
+     */
+    public function getUserInfos($accessToken)
+    {
+        $this->getClient()->setRoute($this->getWellKnown()->userinfo_endpoint);
+
+        $response = $this->getClient()->get([
+            'headers' => $this->getHeaders([
+                'Authorization' => 'Bearer ' . $accessToken,
+            ]),
+        ]);
+
+        return new UserInfos($response->body);
+    }
+
+    /**
+     * @param string $postLogoutRedirectUri
+     * @param string|null $idTokenHint
+     *
+     * @return string
+     */
+    public function getLogoutUri($postLogoutRedirectUri, $idTokenHint = null)
+    {
+        return $this->getWellKnown()->end_session_endpoint . '?' .
+            http_build_query([
+                'id_token_hint' => $idTokenHint,
+                'post_logout_redirect_uri' => $postLogoutRedirectUri,
+            ]);
+    }
+
+    /**
+     * @example http://my-shop.mydomain/admin-path/index.php?controller=AdminLogin&logout=1&oauth2Callback=1
+     *
+     * @return string
+     */
+    public function getPostLogoutRedirectUri()
+    {
+        return $this->link->getAdminLink('AdminLogin', false, [], [
+            'logout' => 1,
+            PrestaShopLogoutTrait::getQueryLogoutCallbackParam() => 1,
+        ]);
+    }
+
+    // TODO: remove Lcobucci (use firebase/jwt)
+    // TODO: instantiate real response types (and throw exceptions)
+    // TODO: check response types (HTTPClient)
+}
diff --git a/src/Api/Client/ServicesBillingClient.php b/src/Api/Client/ServicesBillingClient.php
index 7553d9a88..0809203e1 100644
--- a/src/Api/Client/ServicesBillingClient.php
+++ b/src/Api/Client/ServicesBillingClient.php
@@ -59,7 +59,7 @@ public function __construct(
         // Client can be provided for tests
         if (null === $client) {
             $client = (new HttpClientFactory())->create([
-                'base_uri' => $apiUrl,
+                'baseUri' => $apiUrl,
                 'headers' => [
                     // Commented, else does not work anymore with API.
                     //'Content-Type' => 'application/vnd.accounts.v1+json', // api version to use
diff --git a/src/Exception/AccountLogin/AccountLoginException.php b/src/Exception/AccountLogin/AccountLoginException.php
index de958d7a2..a75f14df6 100644
--- a/src/Exception/AccountLogin/AccountLoginException.php
+++ b/src/Exception/AccountLogin/AccountLoginException.php
@@ -20,12 +20,12 @@
 
 namespace PrestaShop\Module\PsAccounts\Exception\AccountLogin;
 
-use PrestaShop\Module\PsAccounts\Vendor\PrestaShop\OAuth2\Client\Provider\PrestaShopUser;
+use PrestaShop\Module\PsAccounts\Provider\OAuth2\UserInfos;
 
 class AccountLoginException extends \Exception
 {
     /**
-     * @var PrestaShopUser|null
+     * @var UserInfos|null
      */
     protected $user;
 
@@ -36,12 +36,12 @@ class AccountLoginException extends \Exception
 
     /**
      * @param string $message
-     * @param PrestaShopUser|null $user
+     * @param UserInfos|null $user
      * @param \Exception $previous
      */
     public function __construct(
         $message = '',
-        PrestaShopUser $user = null,
+        UserInfos $user = null,
         \Exception $previous = null
     ) {
         parent::__construct($message, 0, $previous);
@@ -50,7 +50,7 @@ public function __construct(
     }
 
     /**
-     * @return PrestaShopUser|null
+     * @return UserInfos|null
      */
     public function getUser()
     {
diff --git a/src/Exception/AccountLogin/EmailNotVerifiedException.php b/src/Exception/AccountLogin/EmailNotVerifiedException.php
index 5721db765..766bb0cb3 100644
--- a/src/Exception/AccountLogin/EmailNotVerifiedException.php
+++ b/src/Exception/AccountLogin/EmailNotVerifiedException.php
@@ -20,18 +20,18 @@
 
 namespace PrestaShop\Module\PsAccounts\Exception\AccountLogin;
 
-use PrestaShop\Module\PsAccounts\Vendor\PrestaShop\OAuth2\Client\Provider\PrestaShopUser;
+use PrestaShop\Module\PsAccounts\Provider\OAuth2\UserInfos;
 
 class EmailNotVerifiedException extends AccountLoginException
 {
     /**
      * @param string $message
-     * @param PrestaShopUser|null $user
+     * @param UserInfos|null $user
      * @param \Exception $previous
      */
     public function __construct(
         $message = 'Your account email is not verified',
-        PrestaShopUser $user = null,
+        UserInfos $user = null,
         \Exception $previous = null
     ) {
         parent::__construct($message, $user, $previous);
diff --git a/src/Exception/AccountLogin/EmployeeNotFoundException.php b/src/Exception/AccountLogin/EmployeeNotFoundException.php
index 00acfa574..f2e72c7d9 100644
--- a/src/Exception/AccountLogin/EmployeeNotFoundException.php
+++ b/src/Exception/AccountLogin/EmployeeNotFoundException.php
@@ -20,18 +20,18 @@
 
 namespace PrestaShop\Module\PsAccounts\Exception\AccountLogin;
 
-use PrestaShop\Module\PsAccounts\Vendor\PrestaShop\OAuth2\Client\Provider\PrestaShopUser;
+use PrestaShop\Module\PsAccounts\Provider\OAuth2\UserInfos;
 
 class EmployeeNotFoundException extends AccountLoginException
 {
     /**
      * @param string $message
-     * @param PrestaShopUser|null $user
+     * @param UserInfos|null $user
      * @param \Exception $previous
      */
     public function __construct(
         $message = 'The email address is not associated to a PrestaShop backoffice account.',
-        PrestaShopUser $user = null,
+        UserInfos $user = null,
         \Exception $previous = null
     ) {
         parent::__construct($message, $user, $previous);
diff --git a/src/Exception/AccountLogin/Oauth2Exception.php b/src/Exception/AccountLogin/Oauth2Exception.php
index 8c5acedca..ae763524f 100644
--- a/src/Exception/AccountLogin/Oauth2Exception.php
+++ b/src/Exception/AccountLogin/Oauth2Exception.php
@@ -20,18 +20,18 @@
 
 namespace PrestaShop\Module\PsAccounts\Exception\AccountLogin;
 
-use PrestaShop\Module\PsAccounts\Vendor\PrestaShop\OAuth2\Client\Provider\PrestaShopUser;
+use PrestaShop\Module\PsAccounts\Provider\OAuth2\UserInfos;
 
 class Oauth2Exception extends AccountLoginException
 {
     /**
      * @param string $message
-     * @param PrestaShopUser|null $user
+     * @param UserInfos|null $user
      * @param \Exception $previous
      */
     public function __construct(
         $message = 'OAuth2 error',
-        PrestaShopUser $user = null,
+        UserInfos $user = null,
         \Exception $previous = null
     ) {
         parent::__construct($message, $user, $previous);
diff --git a/src/Factory/PrestaShopSessionFactory.php b/src/Factory/PrestaShopSessionFactory.php
index f71ab0b3d..2abf6c49c 100644
--- a/src/Factory/PrestaShopSessionFactory.php
+++ b/src/Factory/PrestaShopSessionFactory.php
@@ -20,8 +20,9 @@
 
 namespace PrestaShop\Module\PsAccounts\Factory;
 
+use PrestaShop\Module\PsAccounts\Api\Client\OAuth2Client as Oauth2ApiClient;
+use PrestaShop\Module\PsAccounts\Provider\OAuth2\Oauth2Client;
 use PrestaShop\Module\PsAccounts\Provider\OAuth2\PrestaShopSession;
-use PrestaShop\Module\PsAccounts\Provider\OAuth2\ShopProvider;
 
 class PrestaShopSessionFactory
 {
@@ -35,9 +36,10 @@ public static function create()
         /** @var \Ps_accounts $module */
         $module = \Module::getInstanceByName('ps_accounts');
 
-        /** @var ShopProvider $provider */
-        $provider = $module->getService(ShopProvider::class);
-
-        return new PrestaShopSession($module->getSession(), $provider);
+        return new PrestaShopSession(
+            $module->getSession(),
+            $module->getService(Oauth2ApiClient::class),
+            $module->getService(OAuth2Client::class)
+        );
     }
 }
diff --git a/src/Hook/ActionAdminLoginControllerSetMedia.php b/src/Hook/ActionAdminLoginControllerSetMedia.php
index dbdb5bac7..706bb61d3 100644
--- a/src/Hook/ActionAdminLoginControllerSetMedia.php
+++ b/src/Hook/ActionAdminLoginControllerSetMedia.php
@@ -24,7 +24,6 @@
 use Exception;
 use PrestaShop\Module\PsAccounts\Service\AnalyticsService;
 use PrestaShop\Module\PsAccounts\Service\PsAccountsService;
-use PrestaShop\Module\PsAccounts\Vendor\League\OAuth2\Client\Provider\Exception\IdentityProviderException;
 use Tools;
 
 class ActionAdminLoginControllerSetMedia extends Hook
@@ -32,7 +31,6 @@ class ActionAdminLoginControllerSetMedia extends Hook
     /**
      * @return void
      *
-     * @throws IdentityProviderException
      * @throws Exception
      */
     public function execute(array $params = [])
diff --git a/src/Hook/DisplayBackOfficeHeader.php b/src/Hook/DisplayBackOfficeHeader.php
index 80b272715..1bca5141a 100644
--- a/src/Hook/DisplayBackOfficeHeader.php
+++ b/src/Hook/DisplayBackOfficeHeader.php
@@ -21,7 +21,6 @@
 namespace PrestaShop\Module\PsAccounts\Hook;
 
 use PrestaShop\Module\PsAccounts\Account\Command\UpgradeModuleMultiCommand;
-use PrestaShop\Module\PsAccounts\Vendor\League\OAuth2\Client\Provider\Exception\IdentityProviderException;
 
 class DisplayBackOfficeHeader extends Hook
 {
@@ -34,8 +33,8 @@ public function execute(array $params = [])
             && version_compare(_PS_VERSION_, '8', '>=')) {
             try {
                 $this->module->getOauth2Middleware()->execute();
-            } catch (IdentityProviderException $e) {
-                $this->logger->error('error while executing middleware : ' . $e->getMessage());
+//            } catch (IdentityProviderException $e) {
+//                $this->logger->error('error while executing middleware : ' . $e->getMessage());
                 /* @phpstan-ignore-next-line */
             } catch (\Exception $e) {
                 /* @phpstan-ignore-next-line */
diff --git a/src/Http/Client/CircuitBreaker/CircuitBreaker.php b/src/Http/Client/CircuitBreaker/CircuitBreaker.php
index 84b23d23d..7e54549b0 100644
--- a/src/Http/Client/CircuitBreaker/CircuitBreaker.php
+++ b/src/Http/Client/CircuitBreaker/CircuitBreaker.php
@@ -22,8 +22,6 @@
 
 use DateTime;
 use PrestaShop\Module\PsAccounts\Log\Logger;
-use PrestaShop\Module\PsAccounts\Vendor\GuzzleHttp\Exception\ConnectException;
-use PrestaShop\Module\PsAccounts\Vendor\GuzzleHttp\Exception\RequestException;
 
 abstract class CircuitBreaker
 {
@@ -61,11 +59,13 @@ public function call($callback, $fallbackResponse = null)
                 $this->reset();
 
                 return $result;
-            } catch (ConnectException $e) {
-                // FIXME: CircuitBreak bound to GuzzleException
+            } catch (CircuitBreakerException $e) {
                 $this->setLastFailure();
                 Logger::getInstance()->error($e->getMessage());
-            } catch (RequestException $e) {
+            } catch (\Throwable $e) {
+                Logger::getInstance()->error($e->getMessage());
+                /* @phpstan-ignore-next-line */
+            } catch (\Exception $e) {
                 Logger::getInstance()->error($e->getMessage());
             }
         }
diff --git a/src/Http/Client/CircuitBreaker/CircuitBreakerException.php b/src/Http/Client/CircuitBreaker/CircuitBreakerException.php
new file mode 100644
index 000000000..2aa14703e
--- /dev/null
+++ b/src/Http/Client/CircuitBreaker/CircuitBreakerException.php
@@ -0,0 +1,7 @@
+<?php
+
+namespace PrestaShop\Module\PsAccounts\Http\Client\CircuitBreaker;
+
+class CircuitBreakerException extends \Exception
+{
+}
diff --git a/src/Http/Client/Curl/HttpClient.php b/src/Http/Client/Curl/HttpClient.php
index 1b968a501..c3a798c1c 100644
--- a/src/Http/Client/Curl/HttpClient.php
+++ b/src/Http/Client/Curl/HttpClient.php
@@ -22,10 +22,16 @@
 
 use PrestaShop\Module\PsAccounts\Factory\CircuitBreakerFactory;
 use PrestaShop\Module\PsAccounts\Http\Client\CircuitBreaker\CircuitBreaker;
+use PrestaShop\Module\PsAccounts\Http\Client\CircuitBreaker\CircuitBreakerException;
 use PrestaShop\Module\PsAccounts\Log\Logger;
 
 class HttpClient
 {
+    /**
+     * @var string
+     */
+    protected $baseUri;
+
     /**
      * @var string
      */
@@ -38,16 +44,28 @@ class HttpClient
 
     /**
      * @var bool
-     * FIXME TODO: implement exceptions
+     *
+     * TODO: implement exceptions
      */
     protected $catchExceptions = false;
 
     /**
      * @var CircuitBreaker
-     * FIXME TODO: implement circuit breaker
+     *
+     * TODO: implement circuit breaker
      */
     protected $circuitBreaker;
 
+    /**
+     * @var bool
+     */
+    protected $objectResponse = false;
+
+    /**
+     * @var bool
+     */
+    protected $sslCheck = true;
+
     /**
      * @param array $options
      *
@@ -60,91 +78,95 @@ public function __construct($options)
         );
         unset($options['name']);
 //        \Tools::refreshCACertFile();
+
+        // FIXME headers
+        foreach (['baseUri', 'timeout', 'objectResponse', 'sslCheck'] as $option) {
+            if (isset($options[$option])) {
+                $this->$option = $options[$option];
+            }
+        }
     }
 
     /**
      * @param array $options payload
      *
-     * @return array return response or false if no response
+     * @return Response|array return response or false if no response
      */
     public function post(array $options = [])
     {
-//        return $this->circuitBreaker->call(function () use ($options) {
-//        });
-
-        $ch = $this->initCurl($options);
+        return $this->circuitBreaker->call(function () use ($options) {
+            $ch = $this->initCurl($options);
 
-        curl_setopt($ch, CURLOPT_POST, true);
+            curl_setopt($ch, CURLOPT_POST, true);
 
-        $this->initPayloadJson($options, $ch);
+            $this->initPayload($options, $ch);
 
-        $response = $this->getResponse($ch, curl_exec($ch));
+            $response = $this->getResponse($ch, curl_exec($ch));
 
-        curl_close($ch);
+            curl_close($ch);
 
-        return $response;
+            return $response;
+        });
     }
 
     /**
      * @param array $options payload
      *
-     * @return array return response or false if no response
+     * @return Response|array return response or false if no response
      */
     public function patch(array $options = [])
     {
-//        return $this->circuitBreaker->call(function () use ($options) {
-//        });
+        return $this->circuitBreaker->call(function () use ($options) {
+            $ch = $this->initCurl($options);
 
-        $ch = $this->initCurl($options);
+            curl_setopt($ch, CURLOPT_CUSTOMREQUEST, 'PATCH');
 
-        curl_setopt($ch, CURLOPT_CUSTOMREQUEST, 'PATCH');
+            $this->initPayload($options, $ch);
 
-        $this->initPayloadJson($options, $ch);
+            $response = $this->getResponse($ch, curl_exec($ch));
 
-        $response = $this->getResponse($ch, curl_exec($ch));
+            curl_close($ch);
 
-        curl_close($ch);
-
-        return $response;
+            return $response;
+        });
     }
 
     /**
      * @param array $options payload
      *
-     * @return array return response or false if no response
+     * @return Response|array return response or false if no response
      */
     public function get(array $options = [])
     {
-//        return $this->circuitBreaker->call(function () use ($options) {
-//        });
-        $ch = $this->initCurl($options);
+        return $this->circuitBreaker->call(function () use ($options) {
+            $ch = $this->initCurl($options);
 
-        $response = $this->getResponse($ch, curl_exec($ch));
+            $response = $this->getResponse($ch, curl_exec($ch));
 
-        curl_close($ch);
+            curl_close($ch);
 
-        return $response;
+            return $response;
+        });
     }
 
     /**
      * @param array $options payload
      *
-     * @return array return response array
+     * @return Response|array return response array
      */
     public function delete(array $options = [])
     {
-//        return $this->circuitBreaker->call(function () use ($options) {
-//        });
-
-        $ch = $this->initCurl($options);
+        return $this->circuitBreaker->call(function () use ($options) {
+            $ch = $this->initCurl($options);
 
-        curl_setopt($ch, CURLOPT_CUSTOMREQUEST, 'DELETE');
+            curl_setopt($ch, CURLOPT_CUSTOMREQUEST, 'DELETE');
 
-        $response = $this->getResponse($ch, curl_exec($ch));
+            $response = $this->getResponse($ch, curl_exec($ch));
 
-        curl_close($ch);
+            curl_close($ch);
 
-        return $response;
+            return $response;
+        });
     }
 
     /**
@@ -178,41 +200,45 @@ public function setRoute($route)
 
     /**
      * @param resource $ch
-     * @param string $response
+     * @param mixed $response
      *
-     * @return array
+     * @return Response|array
      */
     public function getResponse($ch, $response)
     {
+        switch (curl_errno($ch)) {
+            case CURLE_OPERATION_TIMEDOUT:
+            case CURLE_COULDNT_CONNECT:
+                throw new CircuitBreakerException('Curl error: ' . curl_error($ch));
+        }
+
         $statusCode = curl_getinfo($ch, CURLINFO_HTTP_CODE);
-        $res =  [
+        $res = [
             'status' => $this->responseIsSuccessful([], $statusCode),
             'httpCode' => $statusCode,
-            'body' => \json_decode($response, true),
+            'body' => is_array($response) ?
+                $response :
+                \json_decode($response, true),
         ];
-        $this->logResponse($response, $ch);
+        $this->logResponse($res, $ch);
+
+        if ($this->objectResponse) {
+            /** @var Response $res */
+            $res = (object) $res;
+        }
 
         return $res;
     }
 
     /**
      * @param array $response
-     * @param mixed $chr
+     * @param resource $ch
      *
      * @return void
      */
-    private function logResponse(array $response, array $chr)
+    private function logResponse($response, $ch)
     {
-        // If response is not successful only
-        if (!$response['status']) {
-            try {
-                $logger = Logger::getInstance();
-                $logger->error('route ' . $this->getRoute());
-                $logger->error('options ' . var_export(curl_getinfo($chr), true));
-                $logger->error('response ' . var_export($response, true));
-            } catch (\Exception $e) {
-            }
-        }
+        Logger::getInstance()->info('response ' . var_export($response, true));
     }
 
     /**
@@ -228,6 +254,7 @@ public function initHeaders(array $options, $ch)
             foreach ($options['headers'] as $header => $value) {
                 $headers[] = "$header: $value";
             }
+            Logger::getInstance()->info('headers ' . var_export($headers, true));
             curl_setopt($ch, CURLOPT_HTTPHEADER, $headers);
         }
     }
@@ -237,10 +264,10 @@ public function initHeaders(array $options, $ch)
      */
     public function initRoute()
     {
-        /** @var \Ps_accounts $module */
-        $module = \Module::getInstanceByName('ps_accounts');
-        $apiRoute = $module->getParameter('ps_accounts.accounts_api_url');
-        $absRoute = preg_replace('/\/$/', '', $apiRoute) . preg_replace('/\/+/', '/', '/' . $this->getRoute());
+        $absRoute = $this->getRoute();
+        if (!empty($this->baseUri) && !preg_match('/^http(s)?:\/\//', $absRoute)) {
+            $absRoute = preg_replace('/\/$/', '', $this->baseUri) . preg_replace('/\/+/', '/', '/' . $absRoute);
+        }
 
         $ch = curl_init();
 
@@ -271,11 +298,15 @@ public function initSsl($ch)
      *
      * @return void
      */
-    public function initPayloadJson(array $options, $ch)
+    public function initPayload(array $options, $ch)
     {
         if (array_key_exists('json', $options)) {
+            Logger::getInstance()->info('payload ' . var_export($options['json'], true));
             curl_setopt($ch, CURLOPT_POSTFIELDS, json_encode($options['json']));
-            curl_setopt($ch, CURLOPT_HTTPHEADER, array('Content-Type: application/json'));
+            curl_setopt($ch, CURLOPT_HTTPHEADER, ['Content-Type: application/json']);
+        } elseif (array_key_exists('body', $options)) {
+            Logger::getInstance()->info('payload ' . var_export($options['body'], true));
+            curl_setopt($ch, CURLOPT_POSTFIELDS, http_build_query($options['body']));
         }
     }
 
@@ -285,22 +316,10 @@ public function initPayloadJson(array $options, $ch)
     protected function getVerify()
     {
         if (version_compare((string) phpversion(), '7', '>=')) {
-            /** @var \Ps_accounts $module */
-            $module = \Module::getInstanceByName('ps_accounts');
-
-            return (bool) $module->getParameter('ps_accounts.check_api_ssl_cert');
+            return $this->sslCheck;
         }
         // bypass certificate expiration issue with PHP5.6
         return false;
-
-//        if ((bool) $module->getParameter('ps_accounts.check_api_ssl_cert')) {
-//            if (defined('_PS_CACHE_CA_CERT_FILE_') && file_exists(constant('_PS_CACHE_CA_CERT_FILE_'))) {
-//                return constant('_PS_CACHE_CA_CERT_FILE_');
-//            }
-//
-//            return true;
-//        }
-//        return false;
     }
 
     /**
@@ -313,6 +332,9 @@ public function initCurl(array $options)
         $ch = $this->initRoute();
         $this->initHeaders($options, $ch);
         $this->initSsl($ch);
+
+        Logger::getInstance()->info('options ' . var_export(curl_getinfo($ch), true));
+
         return $ch;
     }
 }
diff --git a/src/Http/Client/Curl/HttpClientFactory.php b/src/Http/Client/Curl/HttpClientFactory.php
index 8b6e5f417..b59104435 100644
--- a/src/Http/Client/Curl/HttpClientFactory.php
+++ b/src/Http/Client/Curl/HttpClientFactory.php
@@ -20,8 +20,6 @@
 
 namespace PrestaShop\Module\PsAccounts\Http\Client\Curl;
 
-use PrestaShop\Module\PsAccounts\Http\Client\Curl\HttpClient;
-
 /**
  * Construct the guzzle client depending on PrestaShop version
  */
diff --git a/src/Http/Client/Curl/Response.php b/src/Http/Client/Curl/Response.php
new file mode 100644
index 000000000..0d126a694
--- /dev/null
+++ b/src/Http/Client/Curl/Response.php
@@ -0,0 +1,21 @@
+<?php
+
+namespace PrestaShop\Module\PsAccounts\Http\Client\Curl;
+
+class Response
+{
+    /**
+     * @var array
+     */
+    public $body;
+
+    /**
+     * @var int
+     */
+    public $httpCode;
+
+    /**
+     * @var bool
+     */
+    public $status;
+}
diff --git a/src/Middleware/Oauth2Middleware.php b/src/Middleware/Oauth2Middleware.php
index d6294e052..358ca40d6 100644
--- a/src/Middleware/Oauth2Middleware.php
+++ b/src/Middleware/Oauth2Middleware.php
@@ -21,11 +21,10 @@
 namespace PrestaShop\Module\PsAccounts\Middleware;
 
 use Exception;
+use PrestaShop\Module\PsAccounts\Api\Client\OAuth2Client;
 use PrestaShop\Module\PsAccounts\Provider\OAuth2\PrestaShopLogoutTrait;
 use PrestaShop\Module\PsAccounts\Provider\OAuth2\PrestaShopSession;
-use PrestaShop\Module\PsAccounts\Provider\OAuth2\ShopProvider;
 use PrestaShop\Module\PsAccounts\Service\PsAccountsService;
-use PrestaShop\Module\PsAccounts\Vendor\League\OAuth2\Client\Provider\Exception\IdentityProviderException;
 use Ps_accounts;
 
 class Oauth2Middleware
@@ -71,21 +70,19 @@ public function execute()
                 // We keep token fresh !
                 $session->getOrRefreshAccessToken();
             }
-        } catch (IdentityProviderException $e) {
-            $this->module->getLogger()->err($e->getMessage());
+//        } catch (IdentityProviderException $e) {
+//            $this->module->getLogger()->err($e->getMessage());
         } catch (Exception $e) {
             $this->module->getLogger()->err($e->getMessage());
         }
     }
 
     /**
-     * @return ShopProvider
-     *
-     * @throws Exception
+     * @return OAuth2Client
      */
-    protected function getProvider()
+    protected function getOAuth2Client()
     {
-        return $this->module->getService(ShopProvider::class);
+        return $this->module->getService(OAuth2Client::class);
     }
 
     /**
@@ -118,7 +115,7 @@ protected function isOauth2LogoutEnabled()
     protected function onLogoutCallback()
     {
         if ($this->bypassLoginPage) {
-            \Tools::redirectLink($this->getProvider()->getRedirectUri());
+            \Tools::redirectLink($this->getOAuth2Client()->getRedirectUri());
         }
     }
 }
diff --git a/src/Provider/OAuth2/AccessToken.php b/src/Provider/OAuth2/AccessToken.php
new file mode 100644
index 000000000..3b98e98a7
--- /dev/null
+++ b/src/Provider/OAuth2/AccessToken.php
@@ -0,0 +1,58 @@
+<?php
+
+namespace PrestaShop\Module\PsAccounts\Provider\OAuth2;
+
+class AccessToken
+{
+    /**
+     * @var string
+     */
+    public $access_token;
+
+    /**
+     * @var string
+     */
+    public $refresh_token;
+
+    /**
+     * @var string
+     */
+    public $id_token;
+
+    /**
+     * @var string
+     */
+    public $scope;
+
+    /**
+     * @var string;
+     */
+    public $token_type;
+
+    /**
+     * @var string
+     */
+    public $expires;
+
+    /**
+     * @var string
+     */
+    public $expires_in;
+
+    /**
+     * @var string
+     */
+    public $resource_owner_id;
+
+    /**
+     * @param array $data
+     */
+    public function __construct(array $data = [])
+    {
+        foreach ($data as $key => $value) {
+            if (property_exists($this, $key)) {
+                $this->$key = $value;
+            }
+        }
+    }
+}
diff --git a/src/Provider/OAuth2/CachedFile.php b/src/Provider/OAuth2/CachedFile.php
new file mode 100644
index 000000000..aa365a358
--- /dev/null
+++ b/src/Provider/OAuth2/CachedFile.php
@@ -0,0 +1,128 @@
+<?php
+
+namespace PrestaShop\Module\PsAccounts\Provider\OAuth2;
+
+class CachedFile
+{
+    /**
+     * @var string
+     */
+    private $filename;
+
+    /**
+     * @var int lifetime in seconds
+     */
+    private $ttl;
+
+    /**
+     * @param string $filename
+     * @param int|null $ttl
+     *
+     * @throws \Exception
+     */
+    public function __construct($filename, $ttl = null)
+    {
+        $this->filename = $filename;
+        $this->ttl = (int) $ttl;
+
+        $this->initDirectory();
+        $this->assertReadable();
+        $this->assertWritable();
+    }
+
+    /**
+     * @return bool
+     */
+    public function isExpired()
+    {
+        if (file_exists($this->filename)) {
+            if ($this->ttl === null) {
+                return false;
+            }
+
+            return time() - filemtime($this->filename) > $this->ttl;
+        }
+
+        return true;
+    }
+
+    /**
+     * @return false|string
+     */
+    public function read()
+    {
+        return file_get_contents($this->filename);
+    }
+
+    /**
+     * @param mixed $content
+     *
+     * @return void
+     */
+    public function write($content)
+    {
+        file_put_contents($this->filename, $content);
+    }
+
+    /**
+     * @return void
+     */
+    public function clear()
+    {
+        if (file_exists($this->filename)) {
+            unlink($this->filename);
+        }
+    }
+
+    /**
+     * @return string
+     */
+    public function getFilename()
+    {
+        return $this->filename;
+    }
+
+    /**
+     * @return int|null
+     */
+    public function getTtl()
+    {
+        return $this->ttl;
+    }
+
+    /**
+     * @return bool
+     */
+    protected function initDirectory()
+    {
+        if (!file_exists(dirname($this->filename))) {
+            return mkdir(dirname($this->filename), 0755, true);
+        }
+
+        return true;
+    }
+
+    /**
+     * @return void
+     *
+     * @throws \Exception
+     */
+    protected function assertReadable()
+    {
+        if (!is_readable($this->filename) && !is_readable(dirname($this->filename))) {
+            throw new \Exception('File "' . $this->filename . '" is not readable.');
+        }
+    }
+
+    /**
+     * @return void
+     *
+     * @throws \Exception
+     */
+    protected function assertWritable()
+    {
+        if (!is_writable($this->filename) && !is_writeable(dirname($this->filename))) {
+            throw new \Exception('File "' . $this->filename . '" is not writable.');
+        }
+    }
+}
diff --git a/src/Provider/OAuth2/PrestaShopLoginTrait.php b/src/Provider/OAuth2/PrestaShopLoginTrait.php
index 5d3e7f59a..2c7ce7366 100644
--- a/src/Provider/OAuth2/PrestaShopLoginTrait.php
+++ b/src/Provider/OAuth2/PrestaShopLoginTrait.php
@@ -20,29 +20,27 @@
 
 namespace PrestaShop\Module\PsAccounts\Provider\OAuth2;
 
+use PrestaShop\Module\PsAccounts\Api\Client\OAuth2Client;
 use PrestaShop\Module\PsAccounts\Exception\AccountLogin\EmailNotVerifiedException;
 use PrestaShop\Module\PsAccounts\Exception\AccountLogin\EmployeeNotFoundException;
 use PrestaShop\Module\PsAccounts\Exception\AccountLogin\Oauth2Exception;
 use PrestaShop\Module\PsAccounts\Log\Logger;
-use PrestaShop\Module\PsAccounts\Vendor\League\OAuth2\Client\Provider\Exception\IdentityProviderException;
-use PrestaShop\Module\PsAccounts\Vendor\League\OAuth2\Client\Token\AccessToken;
-use PrestaShop\Module\PsAccounts\Vendor\PrestaShop\OAuth2\Client\Provider\PrestaShopUser;
 use Symfony\Component\HttpFoundation\Session\SessionInterface;
 use Tools;
 
 trait PrestaShopLoginTrait
 {
     /**
-     * @return ShopProvider
+     * @return OAuth2Client
      */
-    abstract protected function getProvider();
+    abstract protected function getOAuth2Client();
 
     /**
-     * @param PrestaShopUser $user
+     * @param UserInfos $user
      *
      * @return bool
      */
-    abstract protected function initUserSession(PrestaShopUser $user);
+    abstract protected function initUserSession(UserInfos $user);
 
     /**
      * @return void
@@ -69,7 +67,7 @@ abstract protected function getOauth2Session();
      */
     public function oauth2Login()
     {
-        $provider = $this->getProvider();
+        $apiClient = $this->getOAuth2Client();
 
         //$this->getSession()->start();
         $session = $this->getSession();
@@ -93,16 +91,14 @@ public function oauth2Login()
 
             throw new \Exception('Invalid state');
         } else {
-            // Restore the PKCE code before the `getAccessToken()` call.
-            $provider->setPkceCode($this->getSession()->get('oauth2pkceCode'));
-
             try {
-                // Try to get an access token using the authorization code grant.
-                /** @var AccessToken $accessToken */
-                $accessToken = $provider->getAccessToken('authorization_code', [
-                    'code' => $_GET['code'],
-                ]);
+                $accessToken = $apiClient->getAccessTokenByAuthorizationCode(
+                    $_GET['code'],
+                    $this->getSession()->get('oauth2pkceCode'),
+                    $apiClient->getAuthRedirectUri()
+                );
             } catch (IdentityProviderException $e) {
+                // FIXME
                 throw new Oauth2Exception($e->getMessage(), null, $e);
             }
 
@@ -123,19 +119,21 @@ public function oauth2Login()
      */
     private function oauth2Redirect($locale)
     {
-        $provider = $this->getProvider();
+        $apiClient = $this->getOAuth2Client();
 
-        // Fetch the authorization URL from the provider; this returns the
-        // urlAuthorize option and generates and applies any necessary parameters
-        // (e.g. state).
-        $authorizationUrl = $provider->getAuthorizationUrl(['ui_locales' => $locale]);
+        $state = $apiClient->getRandomState();
+        $pkceCode = $apiClient->getRandomPkceCode();
 
-        // Store the PKCE code after the `getAuthorizationUrl()` call.
-        //$_SESSION['oauth2pkceCode'] = $provider->getPkceCode();
-        $this->getSession()->set('oauth2pkceCode', $provider->getPkceCode());
+        $this->getSession()->set('oauth2state', $state);
+        $this->getSession()->set('oauth2pkceCode', $pkceCode);
 
-        // Get the state generated for you and store it to the session.
-        $this->getSession()->set('oauth2state', $provider->getState());
+        $authorizationUrl = $apiClient->getAuthorizationUri(
+            $state,
+            $apiClient->getAuthRedirectUri(),
+            $pkceCode,
+            'S256',
+            'fr'
+        );
 
         // Redirect the user to the authorization URL.
         header('Location: ' . $authorizationUrl);
diff --git a/src/Provider/OAuth2/PrestaShopLogoutTrait.php b/src/Provider/OAuth2/PrestaShopLogoutTrait.php
index 3bbc26f91..3789c690a 100644
--- a/src/Provider/OAuth2/PrestaShopLogoutTrait.php
+++ b/src/Provider/OAuth2/PrestaShopLogoutTrait.php
@@ -20,12 +20,14 @@
 
 namespace PrestaShop\Module\PsAccounts\Provider\OAuth2;
 
+use PrestaShop\Module\PsAccounts\Api\Client\OAuth2Client;
+
 trait PrestaShopLogoutTrait
 {
     /**
-     * @return ShopProvider
+     * @return OAuth2Client
      */
-    abstract protected function getProvider();
+    abstract protected function getOAuth2Client();
 
     /**
      * @return PrestaShopSession
@@ -37,6 +39,14 @@ abstract protected function getOauth2Session();
      */
     abstract protected function isOauth2LogoutEnabled();
 
+    /**
+     * @return string
+     */
+    public static function getQueryLogoutCallbackParam()
+    {
+        return 'oauth2Callback';
+    }
+
     /**
      * @return void
      *
@@ -49,16 +59,19 @@ public function oauth2Logout()
         }
 
         $oauth2Session = $this->getOauth2Session();
-        if (!isset($_GET[ShopProvider::QUERY_LOGOUT_CALLBACK_PARAM])) {
+        if (!isset($_GET[PrestaShopLogoutTrait::getQueryLogoutCallbackParam()])) {
             $idToken = $oauth2Session->getIdToken();
 
             if (empty($idToken)) {
                 return;
             }
 
-            $logoutUrl = $this->getProvider()->getLogoutUrl([
-                'id_token_hint' => $idToken,
-            ]);
+            $oauth2Client = $this->getOAuth2Client();
+
+            $logoutUrl = $oauth2Client->getLogoutUri(
+                $oauth2Client->getPostLogoutRedirectUri(),
+                $idToken
+            );
 
             header('Location: ' . $logoutUrl);
             exit;
diff --git a/src/Provider/OAuth2/PrestaShopSession.php b/src/Provider/OAuth2/PrestaShopSession.php
index 6d55d8833..100636d2a 100644
--- a/src/Provider/OAuth2/PrestaShopSession.php
+++ b/src/Provider/OAuth2/PrestaShopSession.php
@@ -20,9 +20,8 @@
 
 namespace PrestaShop\Module\PsAccounts\Provider\OAuth2;
 
-use PrestaShop\Module\PsAccounts\Vendor\League\OAuth2\Client\Provider\Exception\IdentityProviderException;
-use PrestaShop\Module\PsAccounts\Vendor\League\OAuth2\Client\Token\AccessToken;
-use PrestaShop\Module\PsAccounts\Vendor\PrestaShop\OAuth2\Client\Provider\PrestaShopUser;
+use PrestaShop\Module\PsAccounts\Account\Token\Token;
+use PrestaShop\Module\PsAccounts\Api\Client\OAuth2Client as Oauth2ApiClient;
 use Symfony\Component\HttpFoundation\Session\SessionInterface;
 
 class PrestaShopSession
@@ -35,39 +34,53 @@ class PrestaShopSession
     private $session;
 
     /**
-     * @var ShopProvider
+     * @var Oauth2ApiClient
      */
-    private $provider;
+    private $oauth2ApiClient;
+
+    /**
+     * @var Oauth2Client
+     */
+    private $oauth2Client;
 
     /**
      * @param mixed $session
-     * @param ShopProvider $provider
+     * @param Oauth2ApiClient $oauth2ApiClient
+     * @param Oauth2Client $oauth2Client
      */
-    public function __construct($session, ShopProvider $provider)
+    public function __construct($session, Oauth2ApiClient $oauth2ApiClient, Oauth2Client $oauth2Client)
     {
         $this->session = $session;
-        $this->provider = $provider;
+        $this->oauth2ApiClient = $oauth2ApiClient;
+        $this->oauth2Client = $oauth2Client;
     }
 
     /**
      * @return string|null
-     *
-     * @throws IdentityProviderException
      */
     public function getOrRefreshAccessToken()
     {
         $token = $this->getTokenProvider();
-        if (($token instanceof AccessToken) && $token->hasExpired()) {
-            /** @var AccessToken $token */
-            $token = $this->provider->getAccessToken('refresh_token', [
-                'refresh_token' => $token->getRefreshToken(),
-            ]);
+        if (($token instanceof AccessToken) && $this->hasExpired($token)) {
+            $token = $this->oauth2ApiClient->refreshAccessToken($token->refresh_token);
             $this->setTokenProvider($token);
         }
 
         return $this->getAccessToken();
     }
 
+    /**
+     * @param AccessToken $accessToken
+     *
+     * @return bool
+     */
+    protected function hasExpired(AccessToken $accessToken)
+    {
+        $token = new Token($accessToken->access_token);
+
+        return $token->isExpired();
+    }
+
     /**
      * @return string|null
      */
@@ -75,7 +88,7 @@ public function getIdToken()
     {
         $token = $this->getTokenProvider();
 
-        return ($token instanceof AccessToken) ? $token->getValues()['id_token'] : null;
+        return ($token instanceof AccessToken) ? $token->id_token : null;
     }
 
     /**
@@ -85,7 +98,7 @@ public function getAccessToken()
     {
         $token = $this->getTokenProvider();
 
-        return ($token instanceof AccessToken) ? $token->getToken() : null;
+        return ($token instanceof AccessToken) ? $token->access_token : null;
     }
 
     /**
@@ -107,11 +120,11 @@ public function isAuthenticated()
     }
 
     /**
-     * @return PrestaShopUser
+     * @return UserInfos
      */
     public function getPrestashopUser()
     {
-        return $this->provider->getResourceOwner($this->getTokenProvider());
+        return $this->oauth2ApiClient->getUserInfos($this->getAccessToken());
     }
 
     /**
@@ -127,7 +140,7 @@ public function clear()
      */
     private function getTokenProvider()
     {
-        if (!$this->provider->getOauth2Client()->exists()) {
+        if (!$this->oauth2Client->exists()) {
             $this->clear();
         }
 
diff --git a/src/Provider/OAuth2/ShopProvider.php b/src/Provider/OAuth2/ShopProvider.php
index 93b1e2827..ff07ce9ff 100644
--- a/src/Provider/OAuth2/ShopProvider.php
+++ b/src/Provider/OAuth2/ShopProvider.php
@@ -24,6 +24,9 @@
 use PrestaShop\Module\PsAccounts\Vendor\League\OAuth2\Client\Provider\AbstractProvider;
 use PrestaShop\Module\PsAccounts\Vendor\PrestaShop\OAuth2\Client\Provider\PrestaShop;
 
+/**
+ * @deprecated
+ */
 class ShopProvider extends PrestaShop
 {
     const QUERY_LOGOUT_CALLBACK_PARAM = 'oauth2Callback';
diff --git a/src/Provider/OAuth2/UserInfos.php b/src/Provider/OAuth2/UserInfos.php
new file mode 100644
index 000000000..606c70e11
--- /dev/null
+++ b/src/Provider/OAuth2/UserInfos.php
@@ -0,0 +1,80 @@
+<?php
+
+namespace PrestaShop\Module\PsAccounts\Provider\OAuth2;
+
+// [OAuth2] stdClass Object (
+//     [amr] => Array
+//         (
+//             [0] => google.com
+//         )
+//      [aud] => Array
+//         (
+//             [0] => 1a2709a2-c267-4818-a026-e076c90f7715
+//         )
+//     [auth_time] => 1736251524
+//     [email] => john.doe@prestashop.com
+//     [email_verified] => 1
+//     [firstname] => John
+//     [iat] => 1736251525
+//     [iss] => https://oauth.prestashop.local
+//     [lastname] => DOE
+//     [name] => John DOE
+//     [picture] => https://lh3.googleusercontent.com/a/AGNmyxZXCdlGm0FT0T0MkwjfIRQ_mft0ft3-purpeFoo-BARs96-c
+//     [preferred_username] => 4rFN5bm2piPeYpsotUIwcyabcdeF
+//     [providers] => Array
+//         (
+//             [0] => google.com
+//             [1] => password
+//         )
+//     [rat] => 1736251522
+//     [sub] => 4rFN5bm2piPeYpsotUIwcyabcdeF
+// )  [] []
+class UserInfos
+{
+    /**
+     * @var string
+     */
+    public $sub;
+
+    /**
+     * @var string
+     */
+    public $name;
+
+    /**
+     * @var string
+     */
+    public $firstname;
+
+    /**
+     * @var string
+     */
+    public $lastname;
+
+    /**
+     * @var string
+     */
+    public $email;
+
+    /**
+     * @var bool
+     */
+    public $email_verified;
+
+    /**
+     * @var string
+     */
+    public $picture;
+
+    /**
+     * @param array $data
+     */
+    public function __construct(array $data = [])
+    {
+        foreach ($data as $key => $value) {
+            if (property_exists($this, $key)) {
+                $this->$key = $value;
+            }
+        }
+    }
+}
diff --git a/src/Provider/OAuth2/WellKnown.php b/src/Provider/OAuth2/WellKnown.php
new file mode 100644
index 000000000..f9f6adebc
--- /dev/null
+++ b/src/Provider/OAuth2/WellKnown.php
@@ -0,0 +1,134 @@
+<?php
+
+namespace PrestaShop\Module\PsAccounts\Provider\OAuth2;
+
+/**
+ * {
+ *  "issuer":"https://oauth.prestashop.com/",
+ *  "authorization_endpoint":"https://oauth.prestashop.com/oauth2/auth",
+ *  "token_endpoint":"https://oauth.prestashop.com/oauth2/token",
+ *  "jwks_uri":"https://oauth.prestashop.com/.well-known/jwks.json",
+ *  "subject_types_supported":["public"],
+ *  "response_types_supported":["code","code id_token","id_token","token id_token","token","token id_token code"],
+ *  "claims_supported":["sub","name","picture","email","email_verified"],
+ *  "grant_types_supported":["authorization_code","implicit","client_credentials","refresh_token"],
+ *  "response_modes_supported":["query","fragment"],
+ *  "userinfo_endpoint":"https://oauth.prestashop.com/userinfo",
+ *  "scopes_supported":["offline_access","offline","openid","profile",...],
+ *  "token_endpoint_auth_methods_supported":["client_secret_post","client_secret_basic","private_key_jwt","none"],
+ *  "userinfo_signing_alg_values_supported":["none","RS256"],
+ *  "id_token_signing_alg_values_supported":["RS256"],
+ *  "id_token_signed_response_alg":["RS256"],
+ *  "userinfo_signed_response_alg":["RS256"],
+ *  "request_parameter_supported":true,
+ *  "request_uri_parameter_supported":true,
+ *  "require_request_uri_registration":true,
+ *  "claims_parameter_supported":false,
+ *  "revocation_endpoint":"https://oauth.prestashop.com/oauth2/revoke",
+ *  "backchannel_logout_supported":true,
+ *  "backchannel_logout_session_supported":true,
+ *  "frontchannel_logout_supported":true,
+ *  "frontchannel_logout_session_supported":true,
+ *  "end_session_endpoint":"https://oauth.prestashop.com/oauth2/sessions/logout",
+ *  "request_object_signing_alg_values_supported":["none","RS256","ES256"],
+ *  "code_challenge_methods_supported":["plain","S256"]
+ * }
+ */
+class WellKnown
+{
+    /** @var string */
+    public $issuer;
+
+    /** @var string */
+    public $authorization_endpoint;
+
+    /** @var string */
+    public $token_endpoint;
+
+    /** @var string */
+    public $jwks_uri;
+
+    /** @var array */
+    public $subject_types_supported;
+
+    /** @var array */
+    public $response_types_supported;
+
+    /** @var array */
+    public $claims_supported;
+
+    /** @var array */
+    public $grant_types_supported;
+
+    /** @var array */
+    public $response_modes_supported;
+
+    /** @var string */
+    public $userinfo_endpoint;
+
+    /** @var array */
+    public $scopes_supported;
+
+    /** @var array */
+    public $token_endpoint_auth_methods_supported;
+
+    /** @var array */
+    public $userinfo_signing_alg_values_supported;
+
+    /** @var array */
+    public $id_token_signing_alg_values_supported;
+
+    /** @var array */
+    public $id_token_signed_response_alg;
+
+    /** @var array */
+    public $userinfo_signed_response_alg;
+
+    /** @var bool */
+    public $request_parameter_supported;
+
+    /** @var bool */
+    public $request_uri_parameter_supported;
+
+    /** @var bool */
+    public $require_request_uri_registration;
+
+    /** @var bool */
+    public $claims_parameter_supported;
+
+    /** @var string */
+    public $revocation_endpoint;
+
+    /** @var bool */
+    public $backchannel_logout_supported;
+
+    /** @var bool */
+    public $backchannel_logout_session_supported;
+
+    /** @var bool */
+    public $frontchannel_logout_supported;
+
+    /** @var bool */
+    public $frontchannel_logout_session_supported;
+
+    /** @var string */
+    public $end_session_endpoint;
+
+    /** @var array */
+    public $request_object_signing_alg_values_supported;
+
+    /** @var array */
+    public $code_challenge_methods_supported;
+
+    /**
+     * @param array $data WellKnown data
+     */
+    public function __construct(array $data = [])
+    {
+        foreach ($data as $key => $value) {
+            if (property_exists($this, $key)) {
+                $this->$key = $value;
+            }
+        }
+    }
+}
diff --git a/src/Repository/ConfigurationRepository.php b/src/Repository/ConfigurationRepository.php
index d808e5169..c44672edd 100644
--- a/src/Repository/ConfigurationRepository.php
+++ b/src/Repository/ConfigurationRepository.php
@@ -371,8 +371,6 @@ public function updateAccessToken($accessToken)
      */
     public function fixMultiShopConfig()
     {
-        Logger::getInstance()->info(__METHOD__);
-
         if ($this->isMultishopActive()) {
             $this->migrateToMultiShop();
         } else {
diff --git a/src/ServiceContainer/Contract/IServiceContainerService.php b/src/ServiceContainer/Contract/IServiceContainerService.php
deleted file mode 100644
index 8884b4dde..000000000
--- a/src/ServiceContainer/Contract/IServiceContainerService.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-/**
- * Copyright since 2007 PrestaShop SA and Contributors
- * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License version 3.0
- * that is bundled with this package in the file LICENSE.md.
- * It is also available through the world-wide-web at this URL:
- * https://opensource.org/licenses/AFL-3.0
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@prestashop.com so we can send you a copy immediately.
- *
- * @author    PrestaShop SA and Contributors <contact@prestashop.com>
- * @copyright Since 2007 PrestaShop SA and Contributors
- * @license   https://opensource.org/licenses/AFL-3.0 Academic Free License version 3.0
- */
-
-namespace PrestaShop\Module\PsAccounts\ServiceContainer\Contract;
-
-use PrestaShop\Module\PsAccounts\ServiceContainer\ServiceContainer;
-
-interface IServiceContainerService
-{
-    /**
-     * @param ServiceContainer $serviceContainer
-     *
-     * @return mixed
-     */
-    public static function getInstance(ServiceContainer $serviceContainer);
-}
diff --git a/src/ServiceContainer/Contract/IServiceProvider.php b/src/ServiceContainer/Contract/IServiceProvider.php
deleted file mode 100644
index cbe4e8af2..000000000
--- a/src/ServiceContainer/Contract/IServiceProvider.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-/**
- * Copyright since 2007 PrestaShop SA and Contributors
- * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License version 3.0
- * that is bundled with this package in the file LICENSE.md.
- * It is also available through the world-wide-web at this URL:
- * https://opensource.org/licenses/AFL-3.0
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@prestashop.com so we can send you a copy immediately.
- *
- * @author    PrestaShop SA and Contributors <contact@prestashop.com>
- * @copyright Since 2007 PrestaShop SA and Contributors
- * @license   https://opensource.org/licenses/AFL-3.0 Academic Free License version 3.0
- */
-
-namespace PrestaShop\Module\PsAccounts\ServiceContainer\Contract;
-
-use PrestaShop\Module\PsAccounts\ServiceContainer\ServiceContainer;
-
-interface IServiceProvider
-{
-    /**
-     * @param ServiceContainer $container
-     *
-     * @return void
-     */
-    public function provide(ServiceContainer $container);
-}
diff --git a/src/ServiceContainer/Exception/ParameterNotFoundException.php b/src/ServiceContainer/Exception/ParameterNotFoundException.php
deleted file mode 100644
index 72d6ff7b5..000000000
--- a/src/ServiceContainer/Exception/ParameterNotFoundException.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * Copyright since 2007 PrestaShop SA and Contributors
- * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License version 3.0
- * that is bundled with this package in the file LICENSE.md.
- * It is also available through the world-wide-web at this URL:
- * https://opensource.org/licenses/AFL-3.0
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@prestashop.com so we can send you a copy immediately.
- *
- * @author    PrestaShop SA and Contributors <contact@prestashop.com>
- * @copyright Since 2007 PrestaShop SA and Contributors
- * @license   https://opensource.org/licenses/AFL-3.0 Academic Free License version 3.0
- */
-
-namespace PrestaShop\Module\PsAccounts\ServiceContainer\Exception;
-
-class ParameterNotFoundException extends \Exception
-{
-}
diff --git a/src/ServiceContainer/Exception/ProviderNotFoundException.php b/src/ServiceContainer/Exception/ProviderNotFoundException.php
deleted file mode 100644
index b3e653e9e..000000000
--- a/src/ServiceContainer/Exception/ProviderNotFoundException.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * Copyright since 2007 PrestaShop SA and Contributors
- * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License version 3.0
- * that is bundled with this package in the file LICENSE.md.
- * It is also available through the world-wide-web at this URL:
- * https://opensource.org/licenses/AFL-3.0
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@prestashop.com so we can send you a copy immediately.
- *
- * @author    PrestaShop SA and Contributors <contact@prestashop.com>
- * @copyright Since 2007 PrestaShop SA and Contributors
- * @license   https://opensource.org/licenses/AFL-3.0 Academic Free License version 3.0
- */
-
-namespace PrestaShop\Module\PsAccounts\ServiceContainer\Exception;
-
-class ProviderNotFoundException extends \Exception
-{
-}
diff --git a/src/ServiceContainer/Exception/ServiceNotFoundException.php b/src/ServiceContainer/Exception/ServiceNotFoundException.php
deleted file mode 100644
index 12c3c145d..000000000
--- a/src/ServiceContainer/Exception/ServiceNotFoundException.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * Copyright since 2007 PrestaShop SA and Contributors
- * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License version 3.0
- * that is bundled with this package in the file LICENSE.md.
- * It is also available through the world-wide-web at this URL:
- * https://opensource.org/licenses/AFL-3.0
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@prestashop.com so we can send you a copy immediately.
- *
- * @author    PrestaShop SA and Contributors <contact@prestashop.com>
- * @copyright Since 2007 PrestaShop SA and Contributors
- * @license   https://opensource.org/licenses/AFL-3.0 Academic Free License version 3.0
- */
-
-namespace PrestaShop\Module\PsAccounts\ServiceContainer\Exception;
-
-class ServiceNotFoundException extends \Exception
-{
-}
diff --git a/src/ServiceContainer/Provider/ApiClientProvider.php b/src/ServiceContainer/Provider/ApiClientProvider.php
deleted file mode 100644
index 68baf352f..000000000
--- a/src/ServiceContainer/Provider/ApiClientProvider.php
+++ /dev/null
@@ -1,54 +0,0 @@
-<?php
-/**
- * Copyright since 2007 PrestaShop SA and Contributors
- * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License version 3.0
- * that is bundled with this package in the file LICENSE.md.
- * It is also available through the world-wide-web at this URL:
- * https://opensource.org/licenses/AFL-3.0
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@prestashop.com so we can send you a copy immediately.
- *
- * @author    PrestaShop SA and Contributors <contact@prestashop.com>
- * @copyright Since 2007 PrestaShop SA and Contributors
- * @license   https://opensource.org/licenses/AFL-3.0 Academic Free License version 3.0
- */
-
-namespace PrestaShop\Module\PsAccounts\ServiceContainer\Provider;
-
-use PrestaShop\Module\PsAccounts\Api\Client\AccountsClient;
-use PrestaShop\Module\PsAccounts\Api\Client\ServicesBillingClient;
-use PrestaShop\Module\PsAccounts\Provider\ShopProvider;
-use PrestaShop\Module\PsAccounts\Service\PsAccountsService;
-use PrestaShop\Module\PsAccounts\ServiceContainer\Contract\IServiceProvider;
-use PrestaShop\Module\PsAccounts\ServiceContainer\ServiceContainer;
-
-class ApiClientProvider implements IServiceProvider
-{
-    /**
-     * @param ServiceContainer $container
-     *
-     * @return void
-     */
-    public function provide(ServiceContainer $container)
-    {
-        $container->registerProvider(AccountsClient::class, function () use ($container) {
-            return new AccountsClient(
-                $container->getParameter('ps_accounts.accounts_api_url'),
-                null,
-                10
-            );
-        });
-        $container->registerProvider(ServicesBillingClient::class, function () use ($container) {
-            return new ServicesBillingClient(
-                $container->getParameter('ps_accounts.billing_api_url'),
-                $container->get(PsAccountsService::class),
-                $container->get(ShopProvider::class)
-            );
-        });
-    }
-}
diff --git a/src/ServiceContainer/Provider/CommandProvider.php b/src/ServiceContainer/Provider/CommandProvider.php
deleted file mode 100644
index 424a9a0bc..000000000
--- a/src/ServiceContainer/Provider/CommandProvider.php
+++ /dev/null
@@ -1,90 +0,0 @@
-<?php
-/**
- * Copyright since 2007 PrestaShop SA and Contributors
- * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License version 3.0
- * that is bundled with this package in the file LICENSE.md.
- * It is also available through the world-wide-web at this URL:
- * https://opensource.org/licenses/AFL-3.0
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@prestashop.com so we can send you a copy immediately.
- *
- * @author    PrestaShop SA and Contributors <contact@prestashop.com>
- * @copyright Since 2007 PrestaShop SA and Contributors
- * @license   https://opensource.org/licenses/AFL-3.0 Academic Free License version 3.0
- */
-
-namespace PrestaShop\Module\PsAccounts\ServiceContainer\Provider;
-
-use PrestaShop\Module\PsAccounts\Account\CommandHandler\DeleteUserShopHandler;
-use PrestaShop\Module\PsAccounts\Account\CommandHandler\LinkShopHandler;
-use PrestaShop\Module\PsAccounts\Account\CommandHandler\UnlinkShopHandler;
-use PrestaShop\Module\PsAccounts\Account\CommandHandler\UpdateUserShopHandler;
-use PrestaShop\Module\PsAccounts\Account\CommandHandler\UpgradeModuleHandler;
-use PrestaShop\Module\PsAccounts\Account\CommandHandler\UpgradeModuleMultiHandler;
-use PrestaShop\Module\PsAccounts\Account\LinkShop;
-use PrestaShop\Module\PsAccounts\Account\Session\Firebase\OwnerSession;
-use PrestaShop\Module\PsAccounts\Account\Session\Firebase\ShopSession;
-use PrestaShop\Module\PsAccounts\Api\Client\AccountsClient;
-use PrestaShop\Module\PsAccounts\Context\ShopContext;
-use PrestaShop\Module\PsAccounts\Cqrs\CommandBus;
-use PrestaShop\Module\PsAccounts\Provider\ShopProvider;
-use PrestaShop\Module\PsAccounts\Repository\ConfigurationRepository;
-use PrestaShop\Module\PsAccounts\Service\AnalyticsService;
-use PrestaShop\Module\PsAccounts\ServiceContainer\Contract\IServiceProvider;
-use PrestaShop\Module\PsAccounts\ServiceContainer\ServiceContainer;
-
-class CommandProvider implements IServiceProvider
-{
-    public function provide(ServiceContainer $container)
-    {
-        $container->registerProvider(DeleteUserShopHandler::class, function () use ($container) {
-            return new DeleteUserShopHandler(
-                $container->get(AccountsClient::class),
-                $container->get(ShopContext::class),
-                $container->get(ShopSession::class),
-                $container->get(OwnerSession::class)
-            );
-        });
-        $container->registerProvider(LinkShopHandler::class, function () use ($container) {
-            return new LinkShopHandler(
-                $container->get(LinkShop::class)
-            );
-        });
-        $container->registerProvider(UnlinkShopHandler::class, function () use ($container) {
-            return new UnlinkShopHandler(
-                $container->get(LinkShop::class),
-                $container->get(AnalyticsService::class),
-                $container->get(ShopProvider::class)
-            );
-        });
-        $container->registerProvider(UpdateUserShopHandler::class, function () use ($container) {
-            return new UpdateUserShopHandler(
-                $container->get(AccountsClient::class),
-                $container->get(ShopContext::class),
-                $container->get(ShopSession::class),
-                $container->get(OwnerSession::class)
-            );
-        });
-        $container->registerProvider(UpgradeModuleHandler::class, function () use ($container) {
-            return new UpgradeModuleHandler(
-                $container->get(AccountsClient::class),
-                $container->get(LinkShop::class),
-                $container->get(ShopSession::class),
-                $container->get(ShopContext::class),
-                $container->get(ConfigurationRepository::class),
-                $container->get(CommandBus::class)
-            );
-        });
-        $container->registerProvider(UpgradeModuleMultiHandler::class, function () use ($container) {
-            return new UpgradeModuleMultiHandler(
-                $container->get(CommandBus::class),
-                $container->get(ConfigurationRepository::class)
-            );
-        });
-    }
-}
diff --git a/src/ServiceContainer/Provider/DefaultProvider.php b/src/ServiceContainer/Provider/DefaultProvider.php
deleted file mode 100644
index 59d36d981..000000000
--- a/src/ServiceContainer/Provider/DefaultProvider.php
+++ /dev/null
@@ -1,150 +0,0 @@
-<?php
-/**
- * Copyright since 2007 PrestaShop SA and Contributors
- * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License version 3.0
- * that is bundled with this package in the file LICENSE.md.
- * It is also available through the world-wide-web at this URL:
- * https://opensource.org/licenses/AFL-3.0
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@prestashop.com so we can send you a copy immediately.
- *
- * @author    PrestaShop SA and Contributors <contact@prestashop.com>
- * @copyright Since 2007 PrestaShop SA and Contributors
- * @license   https://opensource.org/licenses/AFL-3.0 Academic Free License version 3.0
- */
-
-namespace PrestaShop\Module\PsAccounts\ServiceContainer\Provider;
-
-use PrestaShop\Module\PsAccounts\Account\LinkShop;
-use PrestaShop\Module\PsAccounts\Adapter;
-use PrestaShop\Module\PsAccounts\Adapter\Configuration;
-use PrestaShop\Module\PsAccounts\Adapter\Link;
-use PrestaShop\Module\PsAccounts\Api\Client\ServicesBillingClient;
-use PrestaShop\Module\PsAccounts\Context\ShopContext;
-use PrestaShop\Module\PsAccounts\Cqrs\CommandBus;
-use PrestaShop\Module\PsAccounts\Factory\CircuitBreakerFactory;
-use PrestaShop\Module\PsAccounts\Installer\Installer;
-use PrestaShop\Module\PsAccounts\Presenter\PsAccountsPresenter;
-use PrestaShop\Module\PsAccounts\Provider;
-use PrestaShop\Module\PsAccounts\Repository\ConfigurationRepository;
-use PrestaShop\Module\PsAccounts\Repository\ShopTokenRepository;
-use PrestaShop\Module\PsAccounts\Service\AnalyticsService;
-use PrestaShop\Module\PsAccounts\Service\PsAccountsService;
-use PrestaShop\Module\PsAccounts\Service\PsBillingService;
-use PrestaShop\Module\PsAccounts\Service\SentryService;
-use PrestaShop\Module\PsAccounts\ServiceContainer\Contract\IServiceProvider;
-use PrestaShop\Module\PsAccounts\ServiceContainer\ServiceContainer;
-
-class DefaultProvider implements IServiceProvider
-{
-    /**
-     * @param ServiceContainer $container
-     *
-     * @return void
-     */
-    public function provide(ServiceContainer $container)
-    {
-        $container->registerProvider('ps_accounts.context', function () {
-            return \Context::getContext();
-        });
-        $container->registerProvider('ps_accounts.logger', function () {
-            return \PrestaShop\Module\PsAccounts\Log\Logger::create();
-        });
-        $container->registerProvider('ps_accounts.module', function () {
-            return \Module::getInstanceByName('ps_accounts');
-        });
-        // Entities ?
-        $container->registerProvider(LinkShop::class, function () use ($container) {
-            return new LinkShop(
-                $container->get(ConfigurationRepository::class)
-            );
-        });
-        // Adapter
-        $container->registerProvider(Adapter\Configuration::class, function () use ($container) {
-            return new Adapter\Configuration(
-                $container->get('ps_accounts.context')
-            );
-        });
-        $container->registerProvider(Adapter\Link::class, function () use ($container) {
-            return new Adapter\Link(
-                $container->get(ShopContext::class)
-            );
-        });
-        // Services
-        $container->registerProvider(AnalyticsService::class, function () use ($container) {
-            return new AnalyticsService(
-                $container->getParameter('ps_accounts.segment_write_key'),
-                $container->get('ps_accounts.logger')
-            );
-        });
-        $container->registerProvider(PsAccountsService::class, function () use ($container) {
-            return new PsAccountsService(
-                $container->get('ps_accounts.module')
-            );
-        });
-        $container->registerProvider(PsBillingService::class, function () use ($container) {
-            return new PsBillingService(
-                $container->get(ServicesBillingClient::class),
-                $container->get(ShopTokenRepository::class),
-                $container->get(ConfigurationRepository::class)
-            );
-        });
-        $container->registerProvider(SentryService::class, function () use ($container) {
-            return new SentryService(
-                $container->getParameter('ps_accounts.sentry_credentials'),
-                $container->getParameter('ps_accounts.environment'),
-                $container->get(LinkShop::class),
-                $container->get('ps_accounts.context')
-            );
-        });
-        // "Providers"
-        $container->registerProvider(Provider\RsaKeysProvider::class, function () use ($container) {
-            return new Provider\RsaKeysProvider(
-                $container->get(ConfigurationRepository::class)
-            );
-        });
-        $container->registerProvider(Provider\ShopProvider::class, function () use ($container) {
-            return new Provider\ShopProvider(
-                $container->get(ShopContext::class),
-                $container->get(Link::class)
-            );
-        });
-        // Context
-        $container->registerProvider(ShopContext::class, function () use ($container) {
-            return new ShopContext(
-                $container->get(ConfigurationRepository::class),
-                $container->get('ps_accounts.context')
-            );
-        });
-        // CQRS
-        $container->registerProvider(CommandBus::class, function () use ($container) {
-            return new CommandBus(
-                $container->get('ps_accounts.module')
-            );
-        });
-        // Factories
-        $container->registerProvider(CircuitBreakerFactory::class, function () use ($container) {
-            return new CircuitBreakerFactory(
-                $container->get(Configuration::class)
-            );
-        });
-        // Installer
-        $container->registerProvider(Installer::class, function () use ($container) {
-            return new Installer(
-                $container->get(ShopContext::class),
-                $container->get(Link::class)
-            );
-        });
-        // Presenter
-        $container->registerProvider(PsAccountsPresenter::class, function () use ($container) {
-            return new PsAccountsPresenter(
-                $container->get('ps_accounts.module')
-            );
-        });
-    }
-}
diff --git a/src/ServiceContainer/Provider/OAuth2Provider.php b/src/ServiceContainer/Provider/OAuth2Provider.php
deleted file mode 100644
index 7dd9c3d22..000000000
--- a/src/ServiceContainer/Provider/OAuth2Provider.php
+++ /dev/null
@@ -1,58 +0,0 @@
-<?php
-/**
- * Copyright since 2007 PrestaShop SA and Contributors
- * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License version 3.0
- * that is bundled with this package in the file LICENSE.md.
- * It is also available through the world-wide-web at this URL:
- * https://opensource.org/licenses/AFL-3.0
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@prestashop.com so we can send you a copy immediately.
- *
- * @author    PrestaShop SA and Contributors <contact@prestashop.com>
- * @copyright Since 2007 PrestaShop SA and Contributors
- * @license   https://opensource.org/licenses/AFL-3.0 Academic Free License version 3.0
- */
-
-namespace PrestaShop\Module\PsAccounts\ServiceContainer\Provider;
-
-use PrestaShop\Module\PsAccounts\Factory\PrestaShopSessionFactory;
-use PrestaShop\Module\PsAccounts\Middleware\Oauth2Middleware;
-use PrestaShop\Module\PsAccounts\Provider;
-use PrestaShop\Module\PsAccounts\Repository\ConfigurationRepository;
-use PrestaShop\Module\PsAccounts\ServiceContainer\Contract\IServiceProvider;
-use PrestaShop\Module\PsAccounts\ServiceContainer\ServiceContainer;
-
-class OAuth2Provider implements IServiceProvider
-{
-    /**
-     * @param ServiceContainer $container
-     *
-     * @return void
-     */
-    public function provide(ServiceContainer $container)
-    {
-        // OAuth2
-        $container->registerProvider(Provider\OAuth2\Oauth2Client::class, function () use ($container) {
-            return new Provider\OAuth2\Oauth2Client(
-                $container->get(ConfigurationRepository::class)
-            );
-        });
-        $container->registerProvider(Provider\OAuth2\PrestaShopSession::class, function () {
-            return PrestaShopSessionFactory::create();
-        });
-        $container->registerProvider(Provider\OAuth2\ShopProvider::class, function () {
-            return Provider\OAuth2\ShopProvider::create();
-        });
-        // Middleware
-        $container->registerProvider(Oauth2Middleware::class, function () use ($container) {
-            return new Oauth2Middleware(
-                $container->get('ps_accounts.module')
-            );
-        });
-    }
-}
diff --git a/src/ServiceContainer/Provider/RepositoryProvider.php b/src/ServiceContainer/Provider/RepositoryProvider.php
deleted file mode 100644
index 4eb9deb65..000000000
--- a/src/ServiceContainer/Provider/RepositoryProvider.php
+++ /dev/null
@@ -1,58 +0,0 @@
-<?php
-/**
- * Copyright since 2007 PrestaShop SA and Contributors
- * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License version 3.0
- * that is bundled with this package in the file LICENSE.md.
- * It is also available through the world-wide-web at this URL:
- * https://opensource.org/licenses/AFL-3.0
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@prestashop.com so we can send you a copy immediately.
- *
- * @author    PrestaShop SA and Contributors <contact@prestashop.com>
- * @copyright Since 2007 PrestaShop SA and Contributors
- * @license   https://opensource.org/licenses/AFL-3.0 Academic Free License version 3.0
- */
-
-namespace PrestaShop\Module\PsAccounts\ServiceContainer\Provider;
-
-use PrestaShop\Module\PsAccounts\Account\Session\Firebase;
-use PrestaShop\Module\PsAccounts\Account\Session\Firebase\OwnerSession;
-use PrestaShop\Module\PsAccounts\Adapter\Configuration;
-use PrestaShop\Module\PsAccounts\Repository\ConfigurationRepository;
-use PrestaShop\Module\PsAccounts\Repository\ShopTokenRepository;
-use PrestaShop\Module\PsAccounts\Repository\UserTokenRepository;
-use PrestaShop\Module\PsAccounts\ServiceContainer\Contract\IServiceProvider;
-use PrestaShop\Module\PsAccounts\ServiceContainer\ServiceContainer;
-
-class RepositoryProvider implements IServiceProvider
-{
-    /**
-     * @param ServiceContainer $container
-     *
-     * @return void
-     */
-    public function provide(ServiceContainer $container)
-    {
-        // Repositories
-        $container->registerProvider(ConfigurationRepository::class, function () use ($container) {
-            return new ConfigurationRepository(
-                $container->get(Configuration::class)
-            );
-        });
-        $container->registerProvider(ShopTokenRepository::class, function () use ($container) {
-            return new ShopTokenRepository(
-                $container->get(Firebase\ShopSession::class)
-            );
-        });
-        $container->registerProvider(UserTokenRepository::class, function () use ($container) {
-            return new UserTokenRepository(
-                $container->get(OwnerSession::class)
-            );
-        });
-    }
-}
diff --git a/src/ServiceContainer/Provider/SessionProvider.php b/src/ServiceContainer/Provider/SessionProvider.php
deleted file mode 100644
index 6870fd97d..000000000
--- a/src/ServiceContainer/Provider/SessionProvider.php
+++ /dev/null
@@ -1,63 +0,0 @@
-<?php
-/**
- * Copyright since 2007 PrestaShop SA and Contributors
- * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License version 3.0
- * that is bundled with this package in the file LICENSE.md.
- * It is also available through the world-wide-web at this URL:
- * https://opensource.org/licenses/AFL-3.0
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@prestashop.com so we can send you a copy immediately.
- *
- * @author    PrestaShop SA and Contributors <contact@prestashop.com>
- * @copyright Since 2007 PrestaShop SA and Contributors
- * @license   https://opensource.org/licenses/AFL-3.0 Academic Free License version 3.0
- */
-
-namespace PrestaShop\Module\PsAccounts\ServiceContainer\Provider;
-
-use PrestaShop\Module\PsAccounts\Account\LinkShop;
-use PrestaShop\Module\PsAccounts\Account\Session\Firebase;
-use PrestaShop\Module\PsAccounts\Account\Session\ShopSession;
-use PrestaShop\Module\PsAccounts\Cqrs\CommandBus;
-use PrestaShop\Module\PsAccounts\Provider\OAuth2\ShopProvider;
-use PrestaShop\Module\PsAccounts\Repository\ConfigurationRepository;
-use PrestaShop\Module\PsAccounts\ServiceContainer\Contract\IServiceProvider;
-use PrestaShop\Module\PsAccounts\ServiceContainer\ServiceContainer;
-
-class SessionProvider implements IServiceProvider
-{
-    /**
-     * @param ServiceContainer $container
-     *
-     * @return void
-     */
-    public function provide(ServiceContainer $container)
-    {
-        // Sessions
-        $container->registerProvider(ShopSession::class, function () use ($container) {
-            return new ShopSession(
-                $container->get(ConfigurationRepository::class),
-                $container->get(ShopProvider::class),
-                $container->get(LinkShop::class),
-                $container->get(CommandBus::class)
-            );
-        });
-        $container->registerProvider(Firebase\OwnerSession::class, function () use ($container) {
-            return new Firebase\OwnerSession(
-                $container->get(ConfigurationRepository::class),
-                $container->get(ShopSession::class)
-            );
-        });
-        $container->registerProvider(Firebase\ShopSession::class, function () use ($container) {
-            return new Firebase\ShopSession(
-                $container->get(ConfigurationRepository::class),
-                $container->get(ShopSession::class)
-            );
-        });
-    }
-}
diff --git a/src/ServiceContainer/ServiceContainer.php b/src/ServiceContainer/ServiceContainer.php
deleted file mode 100644
index c917ca566..000000000
--- a/src/ServiceContainer/ServiceContainer.php
+++ /dev/null
@@ -1,252 +0,0 @@
-<?php
-/**
- * Copyright since 2007 PrestaShop SA and Contributors
- * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License version 3.0
- * that is bundled with this package in the file LICENSE.md.
- * It is also available through the world-wide-web at this URL:
- * https://opensource.org/licenses/AFL-3.0
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@prestashop.com so we can send you a copy immediately.
- *
- * @author    PrestaShop SA and Contributors <contact@prestashop.com>
- * @copyright Since 2007 PrestaShop SA and Contributors
- * @license   https://opensource.org/licenses/AFL-3.0 Academic Free License version 3.0
- */
-
-namespace PrestaShop\Module\PsAccounts\ServiceContainer;
-
-use PrestaShop\Module\PsAccounts\ServiceContainer\Contract\IServiceContainerService;
-use PrestaShop\Module\PsAccounts\ServiceContainer\Contract\IServiceProvider;
-use PrestaShop\Module\PsAccounts\ServiceContainer\Exception\ParameterNotFoundException;
-use PrestaShop\Module\PsAccounts\ServiceContainer\Exception\ProviderNotFoundException;
-use PrestaShop\Module\PsAccounts\ServiceContainer\Exception\ServiceNotFoundException;
-use PrestaShop\Module\PsAccounts\ServiceContainer\Provider\ApiClientProvider;
-use PrestaShop\Module\PsAccounts\ServiceContainer\Provider\CommandProvider;
-use PrestaShop\Module\PsAccounts\ServiceContainer\Provider\DefaultProvider;
-use PrestaShop\Module\PsAccounts\ServiceContainer\Provider\OAuth2Provider;
-use PrestaShop\Module\PsAccounts\ServiceContainer\Provider\RepositoryProvider;
-use PrestaShop\Module\PsAccounts\ServiceContainer\Provider\SessionProvider;
-
-class ServiceContainer
-{
-    /**
-     * @var array
-     */
-    protected $config = [];
-
-    /**
-     * @var array
-     */
-    protected $services = [];
-
-    /**
-     * @var array|\Closure[]
-     */
-    protected $providers = [];
-
-    /**
-     * @var string[]
-     */
-    protected $provides = [
-        ApiClientProvider::class,
-        CommandProvider::class,
-        DefaultProvider::class,
-        OAuth2Provider::class,
-        RepositoryProvider::class,
-        SessionProvider::class,
-    ];
-
-    /**
-     * @var string
-     */
-    protected $configName = 'config';
-
-    /**
-     * @var ServiceContainer
-     */
-    private static $instance;
-
-    public function __construct()
-    {
-        $this->config = $this->loadConfig();
-
-        $this->init();
-    }
-
-    /**
-     * @return ServiceContainer
-     */
-    public static function getInstance()
-    {
-        if (null === self::$instance) {
-            self::$instance = new ServiceContainer();
-        }
-
-        return self::$instance;
-    }
-
-    /**
-     * @return mixed
-     */
-    public function loadConfig()
-    {
-        return require_once __DIR__ . '/../../' . $this->configName . '.php';
-    }
-
-    /**
-     * @return void
-     */
-    public function init()
-    {
-        foreach ($this->provides as $provider) {
-            if (is_a($provider, IServiceProvider::class, true)) {
-                (new $provider())->provide($this);
-            }
-        }
-    }
-
-    /**
-     * @param string $name
-     *
-     * @return mixed
-     *
-     * @throws ServiceNotFoundException
-     * @throws ProviderNotFoundException
-     */
-    public function get($name)
-    {
-        if ($this->has($name)) {
-            return $this->services[$name];
-        }
-
-        if ($this->hasProvider($name)) {
-            $callback = $this->getProvider($name);
-            $service = $callback();
-        } else {
-            $service = $this->provideInstanceFromClassname($name);
-        }
-
-        if (null === $service) {
-            throw new ServiceNotFoundException('Service Not Found: ' . $name);
-        }
-
-        $this->set($name, $service);
-
-        return $service;
-    }
-
-    /**
-     * @param string $name
-     *
-     * @return mixed
-     *
-     * @throws ServiceNotFoundException
-     * @throws ProviderNotFoundException
-     */
-    public function getService($name)
-    {
-        return $this->get($name);
-    }
-
-    /**
-     * @param string $name
-     * @param mixed $value
-     *
-     * @return void
-     */
-    public function set($name, $value)
-    {
-        $this->services[$name] = $value;
-    }
-
-    /**
-     * @param string $name
-     *
-     * @return bool
-     */
-    public function has($name)
-    {
-        return array_key_exists($name, $this->services);
-    }
-
-    /**
-     * @param string $name
-     *
-     * @return string
-     *
-     * @throws ParameterNotFoundException
-     */
-    public function getParameter($name)
-    {
-        if (array_key_exists($name, $this->config)) {
-            return $this->config[$name];
-        }
-        throw new ParameterNotFoundException('Configuration parameter "' . $name . '" not found.');
-    }
-
-    /**
-     * @param string $name
-     *
-     * @return bool
-     */
-    public function hasParameter($name)
-    {
-        return array_key_exists($name, $this->config);
-    }
-
-    /**
-     * @param string $name
-     *
-     * @return \Closure
-     *
-     * @throws ProviderNotFoundException
-     */
-    public function getProvider($name)
-    {
-        if (array_key_exists($name, $this->providers)) {
-            return $this->providers[$name];
-        }
-        throw new ProviderNotFoundException('Provider "' . $name . '" not found.');
-    }
-
-    /**
-     * @param string $name
-     *
-     * @return bool
-     */
-    public function hasProvider($name)
-    {
-        return array_key_exists($name, $this->providers);
-    }
-
-    /**
-     * @param string $name
-     * @param \Closure $provider
-     *
-     * @return void
-     */
-    public function registerProvider($name, \Closure $provider)
-    {
-        //echo(sprintf('Initializing "%s"', $name) . PHP_EOL);
-        $this->providers[$name] = $provider;
-    }
-
-    /**
-     * @param string $className
-     *
-     * @return mixed
-     */
-    protected function provideInstanceFromClassname($className)
-    {
-        if (is_a($className, IServiceContainerService::class, true)) {
-            return $className::getInstance($this);
-        }
-
-        return null;
-    }
-}
diff --git a/src/ServiceContainer/TODO b/src/ServiceContainer/TODO
deleted file mode 100644
index 5c37430fd..000000000
--- a/src/ServiceContainer/TODO
+++ /dev/null
@@ -1,3 +0,0 @@
-- cleanup config files -> upgrade script & TESTER LE LOGIN v8 !!!!!!!
-- use module singleton to store ServiceContainer instance
-- check logs on PHP8.1
diff --git a/src/ServiceProvider/ApiClientProvider.php b/src/ServiceProvider/ApiClientProvider.php
index 9e980536e..b7d54a5f5 100644
--- a/src/ServiceProvider/ApiClientProvider.php
+++ b/src/ServiceProvider/ApiClientProvider.php
@@ -20,7 +20,9 @@
 
 namespace PrestaShop\Module\PsAccounts\ServiceProvider;
 
+use PrestaShop\Module\PsAccounts\Adapter\Link;
 use PrestaShop\Module\PsAccounts\Api\Client\AccountsClient;
+use PrestaShop\Module\PsAccounts\Api\Client\OAuth2Client;
 use PrestaShop\Module\PsAccounts\Api\Client\ServicesBillingClient;
 use PrestaShop\Module\PsAccounts\Provider\ShopProvider;
 use PrestaShop\Module\PsAccounts\Service\PsAccountsService;
@@ -39,8 +41,18 @@ public function provide(ServiceContainer $container)
         $container->registerProvider(AccountsClient::class, static function () use ($container) {
             return new AccountsClient(
                 $container->getParameter('ps_accounts.accounts_api_url'),
-                null,
-                10
+                10,
+                $container->getParameter('ps_accounts.check_api_ssl_cert')
+            );
+        });
+        $container->registerProvider(OAuth2Client::class, static function () use ($container) {
+            return new OAuth2Client(
+                $container->getParameter('ps_accounts.oauth2_url'),
+                $container->get(\PrestaShop\Module\PsAccounts\Provider\OAuth2\Oauth2Client::class),
+                $container->get(Link::class),
+                _PS_CACHE_DIR_ . DIRECTORY_SEPARATOR . 'ps_accounts',
+                10,
+                $container->getParameter('ps_accounts.check_api_ssl_cert')
             );
         });
         $container->registerProvider(ServicesBillingClient::class, static function () use ($container) {
diff --git a/src/ServiceProvider/OAuth2Provider.php b/src/ServiceProvider/OAuth2Provider.php
index f418bedbd..89809b66b 100644
--- a/src/ServiceProvider/OAuth2Provider.php
+++ b/src/ServiceProvider/OAuth2Provider.php
@@ -45,9 +45,6 @@ public function provide(ServiceContainer $container)
         $container->registerProvider(Provider\OAuth2\PrestaShopSession::class, static function () {
             return PrestaShopSessionFactory::create();
         });
-        $container->registerProvider(Provider\OAuth2\ShopProvider::class, static function () {
-            return Provider\OAuth2\ShopProvider::create();
-        });
         // Middleware
         $container->registerProvider(Oauth2Middleware::class, static function () use ($container) {
             return new Oauth2Middleware(
diff --git a/src/ServiceProvider/SessionProvider.php b/src/ServiceProvider/SessionProvider.php
index 021d8dcf3..eac37a075 100644
--- a/src/ServiceProvider/SessionProvider.php
+++ b/src/ServiceProvider/SessionProvider.php
@@ -23,8 +23,8 @@
 use PrestaShop\Module\PsAccounts\Account\LinkShop;
 use PrestaShop\Module\PsAccounts\Account\Session\Firebase;
 use PrestaShop\Module\PsAccounts\Account\Session\ShopSession;
+use PrestaShop\Module\PsAccounts\Api\Client\OAuth2Client;
 use PrestaShop\Module\PsAccounts\Cqrs\CommandBus;
-use PrestaShop\Module\PsAccounts\Provider\OAuth2\ShopProvider;
 use PrestaShop\Module\PsAccounts\Repository\ConfigurationRepository;
 use PrestaShop\Module\PsAccounts\Vendor\PrestaShopCorp\LightweightContainer\ServiceContainer\Contract\IServiceProvider;
 use PrestaShop\Module\PsAccounts\Vendor\PrestaShopCorp\LightweightContainer\ServiceContainer\ServiceContainer;
@@ -42,7 +42,7 @@ public function provide(ServiceContainer $container)
         $container->registerProvider(ShopSession::class, static function () use ($container) {
             return new ShopSession(
                 $container->get(ConfigurationRepository::class),
-                $container->get(ShopProvider::class),
+                $container->get(OAuth2Client::class),
                 $container->get(LinkShop::class),
                 $container->get(CommandBus::class)
             );

From a25555429a8624b4c77e203f34d0ff548d0d619b Mon Sep 17 00:00:00 2001
From: hschoenenberger <herve.schoenenberger@prestashop.com>
Date: Wed, 8 Jan 2025 09:23:57 +0100
Subject: [PATCH 20/46] refactor: move exceptions classes & instantiate real
 response alike objects

---
 .../admin/AdminOAuth2PsAccountsController.php        |  6 +++---
 controllers/front/apiV1ShopLinkAccount.php           |  2 +-
 controllers/front/apiV1ShopOauth2Client.php          |  2 +-
 controllers/front/apiV1ShopToken.php                 |  2 +-
 controllers/front/apiV2ShopHealthCheck.php           |  2 +-
 src/Account/CommandHandler/DeleteUserShopHandler.php |  2 +-
 src/Account/CommandHandler/UpdateUserShopHandler.php |  2 +-
 src/Account/CommandHandler/UpgradeModuleHandler.php  |  2 +-
 .../CommandHandler/UpgradeModuleMultiHandler.php     |  2 +-
 .../Exception}/AccountLoginException.php             |  2 +-
 .../Exception}/EmailNotVerifiedException.php         |  2 +-
 .../Exception}/EmployeeNotFoundException.php         |  2 +-
 .../Exception}/Oauth2Exception.php                   |  2 +-
 .../Exception/RefreshTokenException.php              |  2 +-
 src/Account/Session/Firebase/FirebaseSession.php     |  2 +-
 src/Account/Session/Session.php                      |  2 +-
 src/Account/Session/SessionInterface.php             |  2 +-
 src/Account/Session/ShopSession.php                  |  4 ++--
 src/Api/Client/AccountsClient.php                    |  2 +-
 src/Api/Client/OAuth2Client.php                      |  2 +-
 src/Api/Client/ServicesBillingClient.php             |  2 +-
 src/Api/Controller/AbstractRestController.php        |  6 +++---
 src/Api/Controller/AbstractShopRestController.php    |  2 +-
 .../Controller/Exception}/BadRequestException.php    |  2 +-
 .../Controller/Exception}/HttpException.php          |  2 +-
 .../Exception}/InternalServerErrorException.php      |  2 +-
 .../Exception}/MethodNotAllowedException.php         |  2 +-
 .../Controller/Exception}/NotFoundException.php      |  2 +-
 .../Controller/Exception}/UnauthorizedException.php  |  2 +-
 src/Api/Controller/Request/Request.php               |  2 +-
 .../Client/Curl => Factory}/HttpClientFactory.php    |  4 +++-
 src/Http/Client/Curl/HttpClient.php                  |  5 +++--
 src/Http/Client/Curl/Response.php                    | 12 ++++++++++++
 src/Provider/OAuth2/PrestaShopLoginTrait.php         |  6 +++---
 src/Repository/TokenRepository.php                   |  2 +-
 src/Service/PsAccountsService.php                    |  2 +-
 .../Firebase/OwnerSession/GetValidTokenTest.php      |  2 +-
 .../Firebase/OwnerSession/RefreshTokenTest.php       |  2 +-
 .../Firebase/ShopSession/GetValidTokenTest.php       |  2 +-
 .../Firebase/ShopSession/RefreshTokenTest.php        |  2 +-
 .../Account/Session/ShopSession/RefreshTokenTest.php |  2 +-
 41 files changed, 63 insertions(+), 48 deletions(-)
 rename src/{Exception/AccountLogin => Account/Exception}/AccountLoginException.php (96%)
 rename src/{Exception/AccountLogin => Account/Exception}/EmailNotVerifiedException.php (95%)
 rename src/{Exception/AccountLogin => Account/Exception}/EmployeeNotFoundException.php (95%)
 rename src/{Exception/AccountLogin => Account/Exception}/Oauth2Exception.php (95%)
 rename src/{ => Account}/Exception/RefreshTokenException.php (93%)
 rename src/{Exception/Http => Api/Controller/Exception}/BadRequestException.php (94%)
 rename src/{Exception/Http => Api/Controller/Exception}/HttpException.php (94%)
 rename src/{Exception/Http => Api/Controller/Exception}/InternalServerErrorException.php (94%)
 rename src/{Exception/Http => Api/Controller/Exception}/MethodNotAllowedException.php (94%)
 rename src/{Exception/Http => Api/Controller/Exception}/NotFoundException.php (94%)
 rename src/{Exception/Http => Api/Controller/Exception}/UnauthorizedException.php (94%)
 rename src/{Http/Client/Curl => Factory}/HttpClientFactory.php (91%)

diff --git a/controllers/admin/AdminOAuth2PsAccountsController.php b/controllers/admin/AdminOAuth2PsAccountsController.php
index 959e8d961..fbff3ba3b 100644
--- a/controllers/admin/AdminOAuth2PsAccountsController.php
+++ b/controllers/admin/AdminOAuth2PsAccountsController.php
@@ -18,11 +18,11 @@
  * @license   https://opensource.org/licenses/AFL-3.0 Academic Free License version 3.0
  */
 
+use PrestaShop\Module\PsAccounts\Account\Exception\AccountLoginException;
+use PrestaShop\Module\PsAccounts\Account\Exception\EmailNotVerifiedException;
+use PrestaShop\Module\PsAccounts\Account\Exception\EmployeeNotFoundException;
 use PrestaShop\Module\PsAccounts\Api\Client\OAuth2Client;
 use PrestaShop\Module\PsAccounts\Entity\EmployeeAccount;
-use PrestaShop\Module\PsAccounts\Exception\AccountLogin\AccountLoginException;
-use PrestaShop\Module\PsAccounts\Exception\AccountLogin\EmailNotVerifiedException;
-use PrestaShop\Module\PsAccounts\Exception\AccountLogin\EmployeeNotFoundException;
 use PrestaShop\Module\PsAccounts\Polyfill\Traits\AdminController\IsAnonymousAllowed;
 use PrestaShop\Module\PsAccounts\Provider\OAuth2\PrestaShopLoginTrait;
 use PrestaShop\Module\PsAccounts\Provider\OAuth2\PrestaShopSession;
diff --git a/controllers/front/apiV1ShopLinkAccount.php b/controllers/front/apiV1ShopLinkAccount.php
index 9976a628b..a7c714c63 100644
--- a/controllers/front/apiV1ShopLinkAccount.php
+++ b/controllers/front/apiV1ShopLinkAccount.php
@@ -21,10 +21,10 @@
 use PrestaShop\Module\PsAccounts\Account\Command\LinkShopCommand;
 use PrestaShop\Module\PsAccounts\Account\Command\UnlinkShopCommand;
 use PrestaShop\Module\PsAccounts\Account\Dto\LinkShop;
+use PrestaShop\Module\PsAccounts\Account\Exception\RefreshTokenException;
 use PrestaShop\Module\PsAccounts\Api\Controller\AbstractShopRestController;
 use PrestaShop\Module\PsAccounts\Api\Controller\Request\UpdateShopLinkAccountRequest;
 use PrestaShop\Module\PsAccounts\Cqrs\CommandBus;
-use PrestaShop\Module\PsAccounts\Exception\RefreshTokenException;
 
 class ps_AccountsApiV1ShopLinkAccountModuleFrontController extends AbstractShopRestController
 {
diff --git a/controllers/front/apiV1ShopOauth2Client.php b/controllers/front/apiV1ShopOauth2Client.php
index e3102821d..894a2aaf4 100644
--- a/controllers/front/apiV1ShopOauth2Client.php
+++ b/controllers/front/apiV1ShopOauth2Client.php
@@ -18,10 +18,10 @@
  * @license   https://opensource.org/licenses/AFL-3.0 Academic Free License version 3.0
  */
 
+use PrestaShop\Module\PsAccounts\Account\Exception\RefreshTokenException;
 use PrestaShop\Module\PsAccounts\Account\Session\ShopSession;
 use PrestaShop\Module\PsAccounts\Api\Controller\AbstractShopRestController;
 use PrestaShop\Module\PsAccounts\Api\Controller\Request\UpdateShopOauth2ClientRequest;
-use PrestaShop\Module\PsAccounts\Exception\RefreshTokenException;
 use PrestaShop\Module\PsAccounts\Provider\OAuth2\Oauth2Client;
 
 class ps_AccountsApiV1ShopOauth2ClientModuleFrontController extends AbstractShopRestController
diff --git a/controllers/front/apiV1ShopToken.php b/controllers/front/apiV1ShopToken.php
index c5f297271..e0896e46c 100644
--- a/controllers/front/apiV1ShopToken.php
+++ b/controllers/front/apiV1ShopToken.php
@@ -18,9 +18,9 @@
  * @license   https://opensource.org/licenses/AFL-3.0 Academic Free License version 3.0
  */
 
+use PrestaShop\Module\PsAccounts\Account\Exception\RefreshTokenException;
 use PrestaShop\Module\PsAccounts\Account\Session\Firebase\ShopSession;
 use PrestaShop\Module\PsAccounts\Api\Controller\AbstractShopRestController;
-use PrestaShop\Module\PsAccounts\Exception\RefreshTokenException;
 
 class ps_AccountsApiV1ShopTokenModuleFrontController extends AbstractShopRestController
 {
diff --git a/controllers/front/apiV2ShopHealthCheck.php b/controllers/front/apiV2ShopHealthCheck.php
index e91bd77cb..941273a60 100644
--- a/controllers/front/apiV2ShopHealthCheck.php
+++ b/controllers/front/apiV2ShopHealthCheck.php
@@ -18,6 +18,7 @@
  * @license   https://opensource.org/licenses/AFL-3.0 Academic Free License version 3.0
  */
 
+use PrestaShop\Module\PsAccounts\Account\Exception\RefreshTokenException;
 use PrestaShop\Module\PsAccounts\Account\LinkShop;
 use PrestaShop\Module\PsAccounts\Account\Session\Firebase;
 use PrestaShop\Module\PsAccounts\Account\Session\ShopSession;
@@ -27,7 +28,6 @@
 use PrestaShop\Module\PsAccounts\Api\Client\OAuth2Client as OAuth2ApiClient;
 use PrestaShop\Module\PsAccounts\Api\Controller\AbstractShopRestController;
 use PrestaShop\Module\PsAccounts\Api\Controller\Request\ShopHealthCheckRequest;
-use PrestaShop\Module\PsAccounts\Exception\RefreshTokenException;
 use PrestaShop\Module\PsAccounts\Provider\OAuth2\Oauth2Client;
 use PrestaShop\Module\PsAccounts\Service\PsAccountsService;
 
diff --git a/src/Account/CommandHandler/DeleteUserShopHandler.php b/src/Account/CommandHandler/DeleteUserShopHandler.php
index d13c6c6eb..329d26510 100644
--- a/src/Account/CommandHandler/DeleteUserShopHandler.php
+++ b/src/Account/CommandHandler/DeleteUserShopHandler.php
@@ -21,11 +21,11 @@
 namespace PrestaShop\Module\PsAccounts\Account\CommandHandler;
 
 use PrestaShop\Module\PsAccounts\Account\Command\DeleteUserShopCommand;
+use PrestaShop\Module\PsAccounts\Account\Exception\RefreshTokenException;
 use PrestaShop\Module\PsAccounts\Account\Session\Firebase\OwnerSession;
 use PrestaShop\Module\PsAccounts\Account\Session\Firebase\ShopSession;
 use PrestaShop\Module\PsAccounts\Api\Client\AccountsClient;
 use PrestaShop\Module\PsAccounts\Context\ShopContext;
-use PrestaShop\Module\PsAccounts\Exception\RefreshTokenException;
 
 class DeleteUserShopHandler
 {
diff --git a/src/Account/CommandHandler/UpdateUserShopHandler.php b/src/Account/CommandHandler/UpdateUserShopHandler.php
index 01051ecf3..9e475c9ae 100644
--- a/src/Account/CommandHandler/UpdateUserShopHandler.php
+++ b/src/Account/CommandHandler/UpdateUserShopHandler.php
@@ -21,11 +21,11 @@
 namespace PrestaShop\Module\PsAccounts\Account\CommandHandler;
 
 use PrestaShop\Module\PsAccounts\Account\Command\UpdateUserShopCommand;
+use PrestaShop\Module\PsAccounts\Account\Exception\RefreshTokenException;
 use PrestaShop\Module\PsAccounts\Account\Session\Firebase\OwnerSession;
 use PrestaShop\Module\PsAccounts\Account\Session\Firebase\ShopSession;
 use PrestaShop\Module\PsAccounts\Api\Client\AccountsClient;
 use PrestaShop\Module\PsAccounts\Context\ShopContext;
-use PrestaShop\Module\PsAccounts\Exception\RefreshTokenException;
 
 class UpdateUserShopHandler
 {
diff --git a/src/Account/CommandHandler/UpgradeModuleHandler.php b/src/Account/CommandHandler/UpgradeModuleHandler.php
index e41d6539a..e7004f9d1 100644
--- a/src/Account/CommandHandler/UpgradeModuleHandler.php
+++ b/src/Account/CommandHandler/UpgradeModuleHandler.php
@@ -22,13 +22,13 @@
 
 use PrestaShop\Module\PsAccounts\Account\Command\UnlinkShopCommand;
 use PrestaShop\Module\PsAccounts\Account\Command\UpgradeModuleCommand;
+use PrestaShop\Module\PsAccounts\Account\Exception\RefreshTokenException;
 use PrestaShop\Module\PsAccounts\Account\LinkShop;
 use PrestaShop\Module\PsAccounts\Account\Session\Firebase\ShopSession;
 use PrestaShop\Module\PsAccounts\Account\Token\NullToken;
 use PrestaShop\Module\PsAccounts\Api\Client\AccountsClient;
 use PrestaShop\Module\PsAccounts\Context\ShopContext;
 use PrestaShop\Module\PsAccounts\Cqrs\CommandBus;
-use PrestaShop\Module\PsAccounts\Exception\RefreshTokenException;
 use PrestaShop\Module\PsAccounts\Log\Logger;
 use PrestaShop\Module\PsAccounts\Repository\ConfigurationRepository;
 
diff --git a/src/Account/CommandHandler/UpgradeModuleMultiHandler.php b/src/Account/CommandHandler/UpgradeModuleMultiHandler.php
index aa59f8025..6151fef9a 100644
--- a/src/Account/CommandHandler/UpgradeModuleMultiHandler.php
+++ b/src/Account/CommandHandler/UpgradeModuleMultiHandler.php
@@ -23,9 +23,9 @@
 use PrestaShop\Module\PsAccounts\Account\Command\UpgradeModuleCommand;
 use PrestaShop\Module\PsAccounts\Account\Command\UpgradeModuleMultiCommand;
 use PrestaShop\Module\PsAccounts\Account\Dto\UpgradeModule;
+use PrestaShop\Module\PsAccounts\Account\Exception\RefreshTokenException;
 use PrestaShop\Module\PsAccounts\Cqrs\CommandBus;
 use PrestaShop\Module\PsAccounts\Exception\DtoException;
-use PrestaShop\Module\PsAccounts\Exception\RefreshTokenException;
 use PrestaShop\Module\PsAccounts\Repository\ConfigurationRepository;
 use PrestaShopDatabaseException;
 
diff --git a/src/Exception/AccountLogin/AccountLoginException.php b/src/Account/Exception/AccountLoginException.php
similarity index 96%
rename from src/Exception/AccountLogin/AccountLoginException.php
rename to src/Account/Exception/AccountLoginException.php
index a75f14df6..bc2977ca0 100644
--- a/src/Exception/AccountLogin/AccountLoginException.php
+++ b/src/Account/Exception/AccountLoginException.php
@@ -18,7 +18,7 @@
  * @license   https://opensource.org/licenses/AFL-3.0 Academic Free License version 3.0
  */
 
-namespace PrestaShop\Module\PsAccounts\Exception\AccountLogin;
+namespace PrestaShop\Module\PsAccounts\Account\Exception;
 
 use PrestaShop\Module\PsAccounts\Provider\OAuth2\UserInfos;
 
diff --git a/src/Exception/AccountLogin/EmailNotVerifiedException.php b/src/Account/Exception/EmailNotVerifiedException.php
similarity index 95%
rename from src/Exception/AccountLogin/EmailNotVerifiedException.php
rename to src/Account/Exception/EmailNotVerifiedException.php
index 766bb0cb3..ae011f0b9 100644
--- a/src/Exception/AccountLogin/EmailNotVerifiedException.php
+++ b/src/Account/Exception/EmailNotVerifiedException.php
@@ -18,7 +18,7 @@
  * @license   https://opensource.org/licenses/AFL-3.0 Academic Free License version 3.0
  */
 
-namespace PrestaShop\Module\PsAccounts\Exception\AccountLogin;
+namespace PrestaShop\Module\PsAccounts\Account\Exception;
 
 use PrestaShop\Module\PsAccounts\Provider\OAuth2\UserInfos;
 
diff --git a/src/Exception/AccountLogin/EmployeeNotFoundException.php b/src/Account/Exception/EmployeeNotFoundException.php
similarity index 95%
rename from src/Exception/AccountLogin/EmployeeNotFoundException.php
rename to src/Account/Exception/EmployeeNotFoundException.php
index f2e72c7d9..916f22387 100644
--- a/src/Exception/AccountLogin/EmployeeNotFoundException.php
+++ b/src/Account/Exception/EmployeeNotFoundException.php
@@ -18,7 +18,7 @@
  * @license   https://opensource.org/licenses/AFL-3.0 Academic Free License version 3.0
  */
 
-namespace PrestaShop\Module\PsAccounts\Exception\AccountLogin;
+namespace PrestaShop\Module\PsAccounts\Account\Exception;
 
 use PrestaShop\Module\PsAccounts\Provider\OAuth2\UserInfos;
 
diff --git a/src/Exception/AccountLogin/Oauth2Exception.php b/src/Account/Exception/Oauth2Exception.php
similarity index 95%
rename from src/Exception/AccountLogin/Oauth2Exception.php
rename to src/Account/Exception/Oauth2Exception.php
index ae763524f..92a5d0672 100644
--- a/src/Exception/AccountLogin/Oauth2Exception.php
+++ b/src/Account/Exception/Oauth2Exception.php
@@ -18,7 +18,7 @@
  * @license   https://opensource.org/licenses/AFL-3.0 Academic Free License version 3.0
  */
 
-namespace PrestaShop\Module\PsAccounts\Exception\AccountLogin;
+namespace PrestaShop\Module\PsAccounts\Account\Exception;
 
 use PrestaShop\Module\PsAccounts\Provider\OAuth2\UserInfos;
 
diff --git a/src/Exception/RefreshTokenException.php b/src/Account/Exception/RefreshTokenException.php
similarity index 93%
rename from src/Exception/RefreshTokenException.php
rename to src/Account/Exception/RefreshTokenException.php
index e3f635dd7..44ed137f0 100644
--- a/src/Exception/RefreshTokenException.php
+++ b/src/Account/Exception/RefreshTokenException.php
@@ -18,7 +18,7 @@
  * @license   https://opensource.org/licenses/AFL-3.0 Academic Free License version 3.0
  */
 
-namespace PrestaShop\Module\PsAccounts\Exception;
+namespace PrestaShop\Module\PsAccounts\Account\Exception;
 
 class RefreshTokenException extends \Exception
 {
diff --git a/src/Account/Session/Firebase/FirebaseSession.php b/src/Account/Session/Firebase/FirebaseSession.php
index b9ea37b3a..86e525d17 100644
--- a/src/Account/Session/Firebase/FirebaseSession.php
+++ b/src/Account/Session/Firebase/FirebaseSession.php
@@ -20,13 +20,13 @@
 
 namespace PrestaShop\Module\PsAccounts\Account\Session\Firebase;
 
+use PrestaShop\Module\PsAccounts\Account\Exception\RefreshTokenException;
 use PrestaShop\Module\PsAccounts\Account\Session\Firebase;
 use PrestaShop\Module\PsAccounts\Account\Session\Session;
 use PrestaShop\Module\PsAccounts\Account\Session\SessionInterface;
 use PrestaShop\Module\PsAccounts\Account\Session\ShopSession;
 use PrestaShop\Module\PsAccounts\Account\Token\Token;
 use PrestaShop\Module\PsAccounts\Api\Client\AccountsClient;
-use PrestaShop\Module\PsAccounts\Exception\RefreshTokenException;
 use PrestaShop\Module\PsAccounts\Log\Logger;
 
 abstract class FirebaseSession extends Session implements SessionInterface
diff --git a/src/Account/Session/Session.php b/src/Account/Session/Session.php
index 21e30c9d5..2173ae5d7 100644
--- a/src/Account/Session/Session.php
+++ b/src/Account/Session/Session.php
@@ -20,9 +20,9 @@
 
 namespace PrestaShop\Module\PsAccounts\Account\Session;
 
+use PrestaShop\Module\PsAccounts\Account\Exception\RefreshTokenException;
 use PrestaShop\Module\PsAccounts\Account\Token\NullToken;
 use PrestaShop\Module\PsAccounts\Account\Token\Token;
-use PrestaShop\Module\PsAccounts\Exception\RefreshTokenException;
 use PrestaShop\Module\PsAccounts\Log\Logger;
 
 abstract class Session implements SessionInterface
diff --git a/src/Account/Session/SessionInterface.php b/src/Account/Session/SessionInterface.php
index 76901dcda..2dc459bc5 100644
--- a/src/Account/Session/SessionInterface.php
+++ b/src/Account/Session/SessionInterface.php
@@ -20,8 +20,8 @@
 
 namespace PrestaShop\Module\PsAccounts\Account\Session;
 
+use PrestaShop\Module\PsAccounts\Account\Exception\RefreshTokenException;
 use PrestaShop\Module\PsAccounts\Account\Token\Token;
-use PrestaShop\Module\PsAccounts\Exception\RefreshTokenException;
 
 interface SessionInterface
 {
diff --git a/src/Account/Session/ShopSession.php b/src/Account/Session/ShopSession.php
index 9854451b8..b5eeb3f23 100644
--- a/src/Account/Session/ShopSession.php
+++ b/src/Account/Session/ShopSession.php
@@ -22,11 +22,11 @@
 
 use PrestaShop\Module\PsAccounts\Account\Command\UnlinkShopCommand;
 use PrestaShop\Module\PsAccounts\Account\Exception\InconsistentAssociationStateException;
+use PrestaShop\Module\PsAccounts\Account\Exception\RefreshTokenException;
 use PrestaShop\Module\PsAccounts\Account\LinkShop;
 use PrestaShop\Module\PsAccounts\Account\Token\Token;
 use PrestaShop\Module\PsAccounts\Api\Client\OAuth2Client;
 use PrestaShop\Module\PsAccounts\Cqrs\CommandBus;
-use PrestaShop\Module\PsAccounts\Exception\RefreshTokenException;
 use PrestaShop\Module\PsAccounts\Hook\ActionShopAccessTokenRefreshAfter;
 use PrestaShop\Module\PsAccounts\Provider\OAuth2\AccessToken;
 use PrestaShop\Module\PsAccounts\Repository\ConfigurationRepository;
@@ -106,7 +106,7 @@ public function refreshToken($refreshToken = null)
                 $this->configurationRepository->getShopId(),
                 $e->getMessage()
             ));
-        //} catch (IdentityProviderException $e) {
+            //} catch (IdentityProviderException $e) {
         } catch (\Throwable $e) {
             /* @phpstan-ignore-next-line */
         } catch (\Exception $e) {
diff --git a/src/Api/Client/AccountsClient.php b/src/Api/Client/AccountsClient.php
index 92835d9cd..9dd67fc6d 100644
--- a/src/Api/Client/AccountsClient.php
+++ b/src/Api/Client/AccountsClient.php
@@ -22,8 +22,8 @@
 
 use PrestaShop\Module\PsAccounts\Account\Dto\UpdateShop;
 use PrestaShop\Module\PsAccounts\Account\Dto\UpgradeModule;
+use PrestaShop\Module\PsAccounts\Factory\HttpClientFactory;
 use PrestaShop\Module\PsAccounts\Http\Client\Curl\HttpClient;
-use PrestaShop\Module\PsAccounts\Http\Client\Curl\HttpClientFactory;
 use PrestaShop\Module\PsAccounts\Vendor\Ramsey\Uuid\Uuid;
 
 class AccountsClient
diff --git a/src/Api/Client/OAuth2Client.php b/src/Api/Client/OAuth2Client.php
index af204e14f..41b23efb9 100644
--- a/src/Api/Client/OAuth2Client.php
+++ b/src/Api/Client/OAuth2Client.php
@@ -21,8 +21,8 @@
 namespace PrestaShop\Module\PsAccounts\Api\Client;
 
 use PrestaShop\Module\PsAccounts\Adapter\Link;
+use PrestaShop\Module\PsAccounts\Factory\HttpClientFactory;
 use PrestaShop\Module\PsAccounts\Http\Client\Curl\HttpClient;
-use PrestaShop\Module\PsAccounts\Http\Client\Curl\HttpClientFactory;
 use PrestaShop\Module\PsAccounts\Provider\OAuth2\AccessToken;
 use PrestaShop\Module\PsAccounts\Provider\OAuth2\CachedFile;
 use PrestaShop\Module\PsAccounts\Provider\OAuth2\Oauth2Client as OauthClient;
diff --git a/src/Api/Client/ServicesBillingClient.php b/src/Api/Client/ServicesBillingClient.php
index 0809203e1..3324eeca3 100644
--- a/src/Api/Client/ServicesBillingClient.php
+++ b/src/Api/Client/ServicesBillingClient.php
@@ -20,8 +20,8 @@
 
 namespace PrestaShop\Module\PsAccounts\Api\Client;
 
+use PrestaShop\Module\PsAccounts\Factory\HttpClientFactory;
 use PrestaShop\Module\PsAccounts\Http\Client\Curl\HttpClient;
-use PrestaShop\Module\PsAccounts\Http\Client\Curl\HttpClientFactory;
 use PrestaShop\Module\PsAccounts\Provider\ShopProvider;
 use PrestaShop\Module\PsAccounts\Service\PsAccountsService;
 
diff --git a/src/Api/Controller/AbstractRestController.php b/src/Api/Controller/AbstractRestController.php
index 61a6d7253..cb4149111 100644
--- a/src/Api/Controller/AbstractRestController.php
+++ b/src/Api/Controller/AbstractRestController.php
@@ -22,9 +22,9 @@
 
 use Context;
 use ModuleFrontController;
-use PrestaShop\Module\PsAccounts\Exception\Http\HttpException;
-use PrestaShop\Module\PsAccounts\Exception\Http\MethodNotAllowedException;
-use PrestaShop\Module\PsAccounts\Exception\Http\UnauthorizedException;
+use PrestaShop\Module\PsAccounts\Api\Controller\Exception\HttpException;
+use PrestaShop\Module\PsAccounts\Api\Controller\Exception\MethodNotAllowedException;
+use PrestaShop\Module\PsAccounts\Api\Controller\Exception\UnauthorizedException;
 use PrestaShop\Module\PsAccounts\Polyfill\Traits\Controller\AjaxRender;
 use PrestaShop\Module\PsAccounts\Provider\RsaKeysProvider;
 use PrestaShop\Module\PsAccounts\Repository\ConfigurationRepository;
diff --git a/src/Api/Controller/AbstractShopRestController.php b/src/Api/Controller/AbstractShopRestController.php
index 842295e51..3c40b7060 100644
--- a/src/Api/Controller/AbstractShopRestController.php
+++ b/src/Api/Controller/AbstractShopRestController.php
@@ -20,7 +20,7 @@
 
 namespace PrestaShop\Module\PsAccounts\Api\Controller;
 
-use PrestaShop\Module\PsAccounts\Exception\Http\NotFoundException;
+use PrestaShop\Module\PsAccounts\Api\Controller\Exception\NotFoundException;
 use Shop;
 
 class AbstractShopRestController extends AbstractRestController
diff --git a/src/Exception/Http/BadRequestException.php b/src/Api/Controller/Exception/BadRequestException.php
similarity index 94%
rename from src/Exception/Http/BadRequestException.php
rename to src/Api/Controller/Exception/BadRequestException.php
index 703f83cdb..356fa0ab0 100644
--- a/src/Exception/Http/BadRequestException.php
+++ b/src/Api/Controller/Exception/BadRequestException.php
@@ -18,7 +18,7 @@
  * @license   https://opensource.org/licenses/AFL-3.0 Academic Free License version 3.0
  */
 
-namespace PrestaShop\Module\PsAccounts\Exception\Http;
+namespace PrestaShop\Module\PsAccounts\Api\Controller\Exception;
 
 class BadRequestException extends HttpException
 {
diff --git a/src/Exception/Http/HttpException.php b/src/Api/Controller/Exception/HttpException.php
similarity index 94%
rename from src/Exception/Http/HttpException.php
rename to src/Api/Controller/Exception/HttpException.php
index ef45dcb60..24a15c552 100644
--- a/src/Exception/Http/HttpException.php
+++ b/src/Api/Controller/Exception/HttpException.php
@@ -18,7 +18,7 @@
  * @license   https://opensource.org/licenses/AFL-3.0 Academic Free License version 3.0
  */
 
-namespace PrestaShop\Module\PsAccounts\Exception\Http;
+namespace PrestaShop\Module\PsAccounts\Api\Controller\Exception;
 
 class HttpException extends \RuntimeException
 {
diff --git a/src/Exception/Http/InternalServerErrorException.php b/src/Api/Controller/Exception/InternalServerErrorException.php
similarity index 94%
rename from src/Exception/Http/InternalServerErrorException.php
rename to src/Api/Controller/Exception/InternalServerErrorException.php
index 4f3a9f7dc..6a235ead3 100644
--- a/src/Exception/Http/InternalServerErrorException.php
+++ b/src/Api/Controller/Exception/InternalServerErrorException.php
@@ -18,7 +18,7 @@
  * @license   https://opensource.org/licenses/AFL-3.0 Academic Free License version 3.0
  */
 
-namespace PrestaShop\Module\PsAccounts\Exception\Http;
+namespace PrestaShop\Module\PsAccounts\Api\Controller\Exception;
 
 class InternalServerErrorException extends HttpException
 {
diff --git a/src/Exception/Http/MethodNotAllowedException.php b/src/Api/Controller/Exception/MethodNotAllowedException.php
similarity index 94%
rename from src/Exception/Http/MethodNotAllowedException.php
rename to src/Api/Controller/Exception/MethodNotAllowedException.php
index ab0f0b6a7..13148420f 100644
--- a/src/Exception/Http/MethodNotAllowedException.php
+++ b/src/Api/Controller/Exception/MethodNotAllowedException.php
@@ -18,7 +18,7 @@
  * @license   https://opensource.org/licenses/AFL-3.0 Academic Free License version 3.0
  */
 
-namespace PrestaShop\Module\PsAccounts\Exception\Http;
+namespace PrestaShop\Module\PsAccounts\Api\Controller\Exception;
 
 class MethodNotAllowedException extends HttpException
 {
diff --git a/src/Exception/Http/NotFoundException.php b/src/Api/Controller/Exception/NotFoundException.php
similarity index 94%
rename from src/Exception/Http/NotFoundException.php
rename to src/Api/Controller/Exception/NotFoundException.php
index e2771a551..48c112ca2 100644
--- a/src/Exception/Http/NotFoundException.php
+++ b/src/Api/Controller/Exception/NotFoundException.php
@@ -18,7 +18,7 @@
  * @license   https://opensource.org/licenses/AFL-3.0 Academic Free License version 3.0
  */
 
-namespace PrestaShop\Module\PsAccounts\Exception\Http;
+namespace PrestaShop\Module\PsAccounts\Api\Controller\Exception;
 
 class NotFoundException extends HttpException
 {
diff --git a/src/Exception/Http/UnauthorizedException.php b/src/Api/Controller/Exception/UnauthorizedException.php
similarity index 94%
rename from src/Exception/Http/UnauthorizedException.php
rename to src/Api/Controller/Exception/UnauthorizedException.php
index fb3f035c6..b63ecf098 100644
--- a/src/Exception/Http/UnauthorizedException.php
+++ b/src/Api/Controller/Exception/UnauthorizedException.php
@@ -18,7 +18,7 @@
  * @license   https://opensource.org/licenses/AFL-3.0 Academic Free License version 3.0
  */
 
-namespace PrestaShop\Module\PsAccounts\Exception\Http;
+namespace PrestaShop\Module\PsAccounts\Api\Controller\Exception;
 
 class UnauthorizedException extends HttpException
 {
diff --git a/src/Api/Controller/Request/Request.php b/src/Api/Controller/Request/Request.php
index 3bdd01df3..8db6fb54f 100644
--- a/src/Api/Controller/Request/Request.php
+++ b/src/Api/Controller/Request/Request.php
@@ -20,8 +20,8 @@
 
 namespace PrestaShop\Module\PsAccounts\Api\Controller\Request;
 
+use PrestaShop\Module\PsAccounts\Api\Controller\Exception\BadRequestException;
 use PrestaShop\Module\PsAccounts\Exception\DtoException;
-use PrestaShop\Module\PsAccounts\Exception\Http\BadRequestException;
 use PrestaShop\Module\PsAccounts\Type\Dto;
 
 abstract class Request extends Dto
diff --git a/src/Http/Client/Curl/HttpClientFactory.php b/src/Factory/HttpClientFactory.php
similarity index 91%
rename from src/Http/Client/Curl/HttpClientFactory.php
rename to src/Factory/HttpClientFactory.php
index b59104435..f58e62361 100644
--- a/src/Http/Client/Curl/HttpClientFactory.php
+++ b/src/Factory/HttpClientFactory.php
@@ -18,7 +18,9 @@
  * @license   https://opensource.org/licenses/AFL-3.0 Academic Free License version 3.0
  */
 
-namespace PrestaShop\Module\PsAccounts\Http\Client\Curl;
+namespace PrestaShop\Module\PsAccounts\Factory;
+
+use PrestaShop\Module\PsAccounts\Http\Client\Curl\HttpClient;
 
 /**
  * Construct the guzzle client depending on PrestaShop version
diff --git a/src/Http/Client/Curl/HttpClient.php b/src/Http/Client/Curl/HttpClient.php
index c3a798c1c..9d6e7868a 100644
--- a/src/Http/Client/Curl/HttpClient.php
+++ b/src/Http/Client/Curl/HttpClient.php
@@ -203,6 +203,8 @@ public function setRoute($route)
      * @param mixed $response
      *
      * @return Response|array
+     *
+     * @throws CircuitBreakerException
      */
     public function getResponse($ch, $response)
     {
@@ -223,8 +225,7 @@ public function getResponse($ch, $response)
         $this->logResponse($res, $ch);
 
         if ($this->objectResponse) {
-            /** @var Response $res */
-            $res = (object) $res;
+            return new Response($res);
         }
 
         return $res;
diff --git a/src/Http/Client/Curl/Response.php b/src/Http/Client/Curl/Response.php
index 0d126a694..05121ee07 100644
--- a/src/Http/Client/Curl/Response.php
+++ b/src/Http/Client/Curl/Response.php
@@ -18,4 +18,16 @@ class Response
      * @var bool
      */
     public $status;
+
+    /**
+     * @param array $data
+     */
+    public function __construct(array $data = [])
+    {
+        foreach ($data as $key => $value) {
+            if (property_exists($this, $key)) {
+                $this->$key = $value;
+            }
+        }
+    }
 }
diff --git a/src/Provider/OAuth2/PrestaShopLoginTrait.php b/src/Provider/OAuth2/PrestaShopLoginTrait.php
index 2c7ce7366..ff108934a 100644
--- a/src/Provider/OAuth2/PrestaShopLoginTrait.php
+++ b/src/Provider/OAuth2/PrestaShopLoginTrait.php
@@ -20,10 +20,10 @@
 
 namespace PrestaShop\Module\PsAccounts\Provider\OAuth2;
 
+use PrestaShop\Module\PsAccounts\Account\Exception\EmailNotVerifiedException;
+use PrestaShop\Module\PsAccounts\Account\Exception\EmployeeNotFoundException;
+use PrestaShop\Module\PsAccounts\Account\Exception\Oauth2Exception;
 use PrestaShop\Module\PsAccounts\Api\Client\OAuth2Client;
-use PrestaShop\Module\PsAccounts\Exception\AccountLogin\EmailNotVerifiedException;
-use PrestaShop\Module\PsAccounts\Exception\AccountLogin\EmployeeNotFoundException;
-use PrestaShop\Module\PsAccounts\Exception\AccountLogin\Oauth2Exception;
 use PrestaShop\Module\PsAccounts\Log\Logger;
 use Symfony\Component\HttpFoundation\Session\SessionInterface;
 use Tools;
diff --git a/src/Repository/TokenRepository.php b/src/Repository/TokenRepository.php
index b94144535..e0d6ba06d 100644
--- a/src/Repository/TokenRepository.php
+++ b/src/Repository/TokenRepository.php
@@ -21,9 +21,9 @@
 namespace PrestaShop\Module\PsAccounts\Repository;
 
 use Exception;
+use PrestaShop\Module\PsAccounts\Account\Exception\RefreshTokenException;
 use PrestaShop\Module\PsAccounts\Account\Session\Session;
 use PrestaShop\Module\PsAccounts\Account\Token\NullToken;
-use PrestaShop\Module\PsAccounts\Exception\RefreshTokenException;
 use PrestaShop\Module\PsAccounts\Vendor\Lcobucci\JWT\Token;
 
 /**
diff --git a/src/Service/PsAccountsService.php b/src/Service/PsAccountsService.php
index bfce1ccdf..bed8c1a46 100644
--- a/src/Service/PsAccountsService.php
+++ b/src/Service/PsAccountsService.php
@@ -20,12 +20,12 @@
 
 namespace PrestaShop\Module\PsAccounts\Service;
 
+use PrestaShop\Module\PsAccounts\Account\Exception\RefreshTokenException;
 use PrestaShop\Module\PsAccounts\Account\LinkShop;
 use PrestaShop\Module\PsAccounts\Account\Session\Firebase\OwnerSession;
 use PrestaShop\Module\PsAccounts\Account\Session\Firebase\ShopSession;
 use PrestaShop\Module\PsAccounts\Adapter\Link;
 use PrestaShop\Module\PsAccounts\Entity\EmployeeAccount;
-use PrestaShop\Module\PsAccounts\Exception\RefreshTokenException;
 use PrestaShop\Module\PsAccounts\Repository\ConfigurationRepository;
 use PrestaShop\Module\PsAccounts\Repository\EmployeeAccountRepository;
 
diff --git a/tests/Unit/Account/Session/Firebase/OwnerSession/GetValidTokenTest.php b/tests/Unit/Account/Session/Firebase/OwnerSession/GetValidTokenTest.php
index 19d665d32..6e65a93b7 100644
--- a/tests/Unit/Account/Session/Firebase/OwnerSession/GetValidTokenTest.php
+++ b/tests/Unit/Account/Session/Firebase/OwnerSession/GetValidTokenTest.php
@@ -7,7 +7,7 @@
 use PrestaShop\Module\PsAccounts\Account\Token\NullToken;
 use PrestaShop\Module\PsAccounts\Account\Token\Token;
 use PrestaShop\Module\PsAccounts\Api\Client\AccountsClient;
-use PrestaShop\Module\PsAccounts\Exception\RefreshTokenException;
+use PrestaShop\Module\PsAccounts\Account\Exception\RefreshTokenException;
 use PrestaShop\Module\PsAccounts\Provider\OAuth2\ShopProvider;
 use PrestaShop\Module\PsAccounts\Tests\TestCase;
 
diff --git a/tests/Unit/Account/Session/Firebase/OwnerSession/RefreshTokenTest.php b/tests/Unit/Account/Session/Firebase/OwnerSession/RefreshTokenTest.php
index 3ad227e9c..93a32f4a3 100644
--- a/tests/Unit/Account/Session/Firebase/OwnerSession/RefreshTokenTest.php
+++ b/tests/Unit/Account/Session/Firebase/OwnerSession/RefreshTokenTest.php
@@ -23,7 +23,7 @@
 use PrestaShop\Module\PsAccounts\Account\Session\Firebase;
 use PrestaShop\Module\PsAccounts\Account\Session\ShopSession;
 use PrestaShop\Module\PsAccounts\Account\Token\Token;
-use PrestaShop\Module\PsAccounts\Exception\RefreshTokenException;
+use PrestaShop\Module\PsAccounts\Account\Exception\RefreshTokenException;
 use PrestaShop\Module\PsAccounts\Provider\OAuth2\ShopProvider;
 use PrestaShop\Module\PsAccounts\Tests\TestCase;
 
diff --git a/tests/Unit/Account/Session/Firebase/ShopSession/GetValidTokenTest.php b/tests/Unit/Account/Session/Firebase/ShopSession/GetValidTokenTest.php
index 23fdd0d9c..60b856ebd 100644
--- a/tests/Unit/Account/Session/Firebase/ShopSession/GetValidTokenTest.php
+++ b/tests/Unit/Account/Session/Firebase/ShopSession/GetValidTokenTest.php
@@ -5,7 +5,7 @@
 use PrestaShop\Module\PsAccounts\Account\Session\Firebase;
 use PrestaShop\Module\PsAccounts\Account\Token\NullToken;
 use PrestaShop\Module\PsAccounts\Account\Token\Token;
-use PrestaShop\Module\PsAccounts\Exception\RefreshTokenException;
+use PrestaShop\Module\PsAccounts\Account\Exception\RefreshTokenException;
 use PrestaShop\Module\PsAccounts\Provider\OAuth2\ShopProvider;
 use PrestaShop\Module\PsAccounts\Tests\TestCase;
 
diff --git a/tests/Unit/Account/Session/Firebase/ShopSession/RefreshTokenTest.php b/tests/Unit/Account/Session/Firebase/ShopSession/RefreshTokenTest.php
index b1835b705..95e36a919 100644
--- a/tests/Unit/Account/Session/Firebase/ShopSession/RefreshTokenTest.php
+++ b/tests/Unit/Account/Session/Firebase/ShopSession/RefreshTokenTest.php
@@ -23,7 +23,7 @@
 use PrestaShop\Module\PsAccounts\Account\Session\Firebase;
 use PrestaShop\Module\PsAccounts\Account\Session\ShopSession;
 use PrestaShop\Module\PsAccounts\Account\Token\Token;
-use PrestaShop\Module\PsAccounts\Exception\RefreshTokenException;
+use PrestaShop\Module\PsAccounts\Account\Exception\RefreshTokenException;
 use PrestaShop\Module\PsAccounts\Provider\OAuth2\ShopProvider;
 use PrestaShop\Module\PsAccounts\Tests\TestCase;
 
diff --git a/tests/Unit/Account/Session/ShopSession/RefreshTokenTest.php b/tests/Unit/Account/Session/ShopSession/RefreshTokenTest.php
index 0072bedb3..813d0b9a6 100644
--- a/tests/Unit/Account/Session/ShopSession/RefreshTokenTest.php
+++ b/tests/Unit/Account/Session/ShopSession/RefreshTokenTest.php
@@ -6,7 +6,7 @@
 use PrestaShop\Module\PsAccounts\Account\Session\ShopSession;
 use PrestaShop\Module\PsAccounts\Account\Token\Token;
 use PrestaShop\Module\PsAccounts\Cqrs\CommandBus;
-use PrestaShop\Module\PsAccounts\Exception\RefreshTokenException;
+use PrestaShop\Module\PsAccounts\Account\Exception\RefreshTokenException;
 use PrestaShop\Module\PsAccounts\Provider\OAuth2\Oauth2Client;
 use PrestaShop\Module\PsAccounts\Provider\OAuth2\ShopProvider;
 use PrestaShop\Module\PsAccounts\Tests\TestCase;

From 3696f0a6f24111dc4e554af4d4676b1b12678f9a Mon Sep 17 00:00:00 2001
From: hschoenenberger <herve.schoenenberger@prestashop.com>
Date: Wed, 8 Jan 2025 11:15:47 +0100
Subject: [PATCH 21/46] refactor: move exceptions classes & instantiate real
 response alike objects

---
 .../admin/AdminAjaxPsAccountsController.php   |  2 +-
 .../admin/AdminLoginPsAccountsController.php  |  6 +--
 .../admin/AdminOAuth2PsAccountsController.php | 12 ++---
 controllers/front/apiV1ShopOauth2Client.php   |  6 +--
 controllers/front/apiV2ShopHealthCheck.php    |  8 ++--
 ps_accounts.php                               |  4 +-
 .../Exception/AccountLoginException.php       |  2 +-
 .../Exception/EmailNotVerifiedException.php   |  2 +-
 .../Exception/EmployeeNotFoundException.php   |  2 +-
 ...Exception.php => Oauth2LoginException.php} |  4 +-
 src/Account/Session/ShopSession.php           | 10 ++---
 src/Api/Client/AccountsClient.php             | 10 ++---
 .../Client}/OAuth2/AccessToken.php            | 14 +++++-
 .../Client}/OAuth2/CachedFile.php             |  2 +-
 .../OAuth2ApiClient.php}                      | 42 +++++++++++------
 .../Client/OAuth2/OAuth2Client.php}           |  4 +-
 src/Api/Client/OAuth2/OAuth2Exception.php     |  7 +++
 .../Client}/OAuth2/PrestaShopLoginTrait.php   | 14 +++---
 .../Client}/OAuth2/PrestaShopLogoutTrait.php  |  6 +--
 .../Client}/OAuth2/PrestaShopSession.php      | 26 +++--------
 .../Client}/OAuth2/ShopProvider.php           |  8 ++--
 .../Client}/OAuth2/UserInfos.php              |  2 +-
 .../Client}/OAuth2/WellKnown.php              |  2 +-
 src/Api/Client/ServicesBillingClient.php      | 12 ++---
 src/Factory/PrestaShopSessionFactory.php      | 45 -------------------
 src/Hook/ActionShopAccountUnlinkAfter.php     |  6 +--
 .../Client/CircuitBreaker/CircuitBreaker.php  |  8 ++++
 .../Client/CircuitBreaker/Factory.php}        | 12 ++---
 .../Curl/{HttpClient.php => Client.php}       | 28 ++++++++----
 .../Client/Factory.php}                       | 13 +++---
 src/Http/Client/{Curl => }/Response.php       |  2 +-
 src/Middleware/Oauth2Middleware.php           | 10 ++---
 src/ServiceProvider/ApiClientProvider.php     |  8 ++--
 src/ServiceProvider/DefaultProvider.php       |  6 +--
 src/ServiceProvider/OAuth2Provider.php        | 17 ++++---
 src/ServiceProvider/SessionProvider.php       |  4 +-
 .../Api/v1/ShopOauth2Client/DeleteTest.php    |  4 +-
 .../Api/v1/ShopOauth2Client/StoreTest.php     |  4 +-
 .../OwnerSession/GetValidTokenTest.php        |  2 +-
 .../OwnerSession/RefreshTokenTest.php         |  2 +-
 .../ShopSession/GetValidTokenTest.php         |  2 +-
 .../Firebase/ShopSession/RefreshTokenTest.php |  2 +-
 .../Session/ShopSession/RefreshTokenTest.php  |  6 +--
 .../CircuitBreaker/CircuitBreakerTest.php     |  4 +-
 .../GetOrRefreshTokenTest.php                 |  4 +-
 45 files changed, 194 insertions(+), 202 deletions(-)
 rename src/Account/Exception/{Oauth2Exception.php => Oauth2LoginException.php} (91%)
 rename src/{Provider => Api/Client}/OAuth2/AccessToken.php (73%)
 rename src/{Provider => Api/Client}/OAuth2/CachedFile.php (97%)
 rename src/Api/Client/{OAuth2Client.php => OAuth2/OAuth2ApiClient.php} (91%)
 rename src/{Provider/OAuth2/Oauth2Client.php => Api/Client/OAuth2/OAuth2Client.php} (96%)
 create mode 100644 src/Api/Client/OAuth2/OAuth2Exception.php
 rename src/{Provider => Api/Client}/OAuth2/PrestaShopLoginTrait.php (92%)
 rename src/{Provider => Api/Client}/OAuth2/PrestaShopLogoutTrait.php (93%)
 rename src/{Provider => Api/Client}/OAuth2/PrestaShopSession.php (82%)
 rename src/{Provider => Api/Client}/OAuth2/ShopProvider.php (96%)
 rename src/{Provider => Api/Client}/OAuth2/UserInfos.php (96%)
 rename src/{Provider => Api/Client}/OAuth2/WellKnown.php (98%)
 delete mode 100644 src/Factory/PrestaShopSessionFactory.php
 rename src/{Factory/CircuitBreakerFactory.php => Http/Client/CircuitBreaker/Factory.php} (89%)
 rename src/Http/Client/Curl/{HttpClient.php => Client.php} (90%)
 rename src/{Factory/HttpClientFactory.php => Http/Client/Factory.php} (78%)
 rename src/Http/Client/{Curl => }/Response.php (88%)

diff --git a/controllers/admin/AdminAjaxPsAccountsController.php b/controllers/admin/AdminAjaxPsAccountsController.php
index 238c8edf3..707e0f519 100644
--- a/controllers/admin/AdminAjaxPsAccountsController.php
+++ b/controllers/admin/AdminAjaxPsAccountsController.php
@@ -22,10 +22,10 @@
 use PrestaShop\Module\PsAccounts\Account\Command\DeleteUserShopCommand;
 use PrestaShop\Module\PsAccounts\Account\Command\UnlinkShopCommand;
 use PrestaShop\Module\PsAccounts\Account\Session\Firebase\ShopSession;
+use PrestaShop\Module\PsAccounts\Api\Client\OAuth2\PrestaShopSession;
 use PrestaShop\Module\PsAccounts\Cqrs\CommandBus;
 use PrestaShop\Module\PsAccounts\Polyfill\Traits\Controller\AjaxRender;
 use PrestaShop\Module\PsAccounts\Presenter\PsAccountsPresenter;
-use PrestaShop\Module\PsAccounts\Provider\OAuth2\PrestaShopSession;
 use PrestaShop\Module\PsAccounts\Repository\ConfigurationRepository;
 use PrestaShop\Module\PsAccounts\Service\SentryService;
 
diff --git a/controllers/admin/AdminLoginPsAccountsController.php b/controllers/admin/AdminLoginPsAccountsController.php
index 1e8609b72..874ddbee4 100644
--- a/controllers/admin/AdminLoginPsAccountsController.php
+++ b/controllers/admin/AdminLoginPsAccountsController.php
@@ -18,7 +18,7 @@
  * @license   https://opensource.org/licenses/AFL-3.0 Academic Free License version 3.0
  */
 
-use PrestaShop\Module\PsAccounts\Api\Client\OAuth2Client;
+use PrestaShop\Module\PsAccounts\Api\Client\OAuth2\OAuth2ApiClient;
 use PrestaShop\Module\PsAccounts\Polyfill\Traits\AdminController\IsAnonymousAllowed;
 
 class AdminLoginPsAccountsController extends \AdminController
@@ -121,8 +121,8 @@ public function setMedia($isNewTheme = false)
      */
     public function createTemplate($tpl_name)
     {
-        /** @var OAuth2Client $provider */
-        $provider = $this->psAccounts->getService(OAuth2Client::class);
+        /** @var OAuth2ApiClient $provider */
+        $provider = $this->psAccounts->getService(OAuth2ApiClient::class);
 
         $testimonials = $this->getTestimonials();
 
diff --git a/controllers/admin/AdminOAuth2PsAccountsController.php b/controllers/admin/AdminOAuth2PsAccountsController.php
index fbff3ba3b..0eb522abc 100644
--- a/controllers/admin/AdminOAuth2PsAccountsController.php
+++ b/controllers/admin/AdminOAuth2PsAccountsController.php
@@ -21,12 +21,12 @@
 use PrestaShop\Module\PsAccounts\Account\Exception\AccountLoginException;
 use PrestaShop\Module\PsAccounts\Account\Exception\EmailNotVerifiedException;
 use PrestaShop\Module\PsAccounts\Account\Exception\EmployeeNotFoundException;
-use PrestaShop\Module\PsAccounts\Api\Client\OAuth2Client;
+use PrestaShop\Module\PsAccounts\Api\Client\OAuth2\OAuth2ApiClient;
+use PrestaShop\Module\PsAccounts\Api\Client\OAuth2\PrestaShopLoginTrait;
+use PrestaShop\Module\PsAccounts\Api\Client\OAuth2\PrestaShopSession;
+use PrestaShop\Module\PsAccounts\Api\Client\OAuth2\UserInfos;
 use PrestaShop\Module\PsAccounts\Entity\EmployeeAccount;
 use PrestaShop\Module\PsAccounts\Polyfill\Traits\AdminController\IsAnonymousAllowed;
-use PrestaShop\Module\PsAccounts\Provider\OAuth2\PrestaShopLoginTrait;
-use PrestaShop\Module\PsAccounts\Provider\OAuth2\PrestaShopSession;
-use PrestaShop\Module\PsAccounts\Provider\OAuth2\UserInfos;
 use PrestaShop\Module\PsAccounts\Repository\EmployeeAccountRepository;
 use PrestaShop\Module\PsAccounts\Service\AnalyticsService;
 use PrestaShop\Module\PsAccounts\Service\PsAccountsService;
@@ -193,13 +193,13 @@ private function onLoginFailed(AccountLoginException $e)
     }
 
     /**
-     * @return OAuth2Client
+     * @return OAuth2ApiClient
      *
      * @throws Exception
      */
     private function getOAuth2Client()
     {
-        return $this->module->getService(OAuth2Client::class);
+        return $this->module->getService(OAuth2ApiClient::class);
     }
 
     /**
diff --git a/controllers/front/apiV1ShopOauth2Client.php b/controllers/front/apiV1ShopOauth2Client.php
index 894a2aaf4..5d47bc4c6 100644
--- a/controllers/front/apiV1ShopOauth2Client.php
+++ b/controllers/front/apiV1ShopOauth2Client.php
@@ -20,14 +20,14 @@
 
 use PrestaShop\Module\PsAccounts\Account\Exception\RefreshTokenException;
 use PrestaShop\Module\PsAccounts\Account\Session\ShopSession;
+use PrestaShop\Module\PsAccounts\Api\Client\OAuth2\OAuth2Client;
 use PrestaShop\Module\PsAccounts\Api\Controller\AbstractShopRestController;
 use PrestaShop\Module\PsAccounts\Api\Controller\Request\UpdateShopOauth2ClientRequest;
-use PrestaShop\Module\PsAccounts\Provider\OAuth2\Oauth2Client;
 
 class ps_AccountsApiV1ShopOauth2ClientModuleFrontController extends AbstractShopRestController
 {
     /**
-     * @var Oauth2Client
+     * @var OAuth2Client
      */
     private $oauth2Client;
 
@@ -45,7 +45,7 @@ public function __construct()
     {
         parent::__construct();
 
-        $this->oauth2Client = $this->module->getService(Oauth2Client::class);
+        $this->oauth2Client = $this->module->getService(OAuth2Client::class);
         $this->session = $this->module->getService(ShopSession::class);
     }
 
diff --git a/controllers/front/apiV2ShopHealthCheck.php b/controllers/front/apiV2ShopHealthCheck.php
index 941273a60..93420255f 100644
--- a/controllers/front/apiV2ShopHealthCheck.php
+++ b/controllers/front/apiV2ShopHealthCheck.php
@@ -25,10 +25,10 @@
 use PrestaShop\Module\PsAccounts\Account\Token\NullToken;
 use PrestaShop\Module\PsAccounts\Account\Token\Token;
 use PrestaShop\Module\PsAccounts\Api\Client\AccountsClient;
-use PrestaShop\Module\PsAccounts\Api\Client\OAuth2Client as OAuth2ApiClient;
+use PrestaShop\Module\PsAccounts\Api\Client\OAuth2\OAuth2ApiClient;
+use PrestaShop\Module\PsAccounts\Api\Client\OAuth2\OAuth2Client;
 use PrestaShop\Module\PsAccounts\Api\Controller\AbstractShopRestController;
 use PrestaShop\Module\PsAccounts\Api\Controller\Request\ShopHealthCheckRequest;
-use PrestaShop\Module\PsAccounts\Provider\OAuth2\Oauth2Client;
 use PrestaShop\Module\PsAccounts\Service\PsAccountsService;
 
 class ps_AccountsApiV2ShopHealthCheckModuleFrontController extends AbstractShopRestController
@@ -39,7 +39,7 @@ class ps_AccountsApiV2ShopHealthCheckModuleFrontController extends AbstractShopR
     private $linkShop;
 
     /**
-     * @var Oauth2Client
+     * @var OAuth2Client
      */
     private $oauth2Client;
 
@@ -81,7 +81,7 @@ public function __construct()
         $this->authenticated = false;
 
         $this->linkShop = $this->module->getService(LinkShop::class);
-        $this->oauth2Client = $this->module->getService(Oauth2Client::class);
+        $this->oauth2Client = $this->module->getService(OAuth2Client::class);
         $this->shopSession = $this->module->getService(ShopSession::class);
         $this->firebaseShopSession = $this->module->getService(Firebase\ShopSession::class);
         $this->firebaseOwnerSession = $this->module->getService(Firebase\OwnerSession::class);
diff --git a/ps_accounts.php b/ps_accounts.php
index 32c4ea7fe..8d0c0b02c 100644
--- a/ps_accounts.php
+++ b/ps_accounts.php
@@ -449,8 +449,8 @@ public function getSession()
      */
     public function onModuleReset()
     {
-        /** @var \PrestaShop\Module\PsAccounts\Factory\CircuitBreakerFactory $circuitBreakerFactory */
-        $circuitBreakerFactory = $this->getService(\PrestaShop\Module\PsAccounts\Factory\CircuitBreakerFactory::class);
+        /** @var \PrestaShop\Module\PsAccounts\Http\Client\CircuitBreaker\Factory $circuitBreakerFactory */
+        $circuitBreakerFactory = $this->getService(\PrestaShop\Module\PsAccounts\Http\Client\CircuitBreaker\Factory::class);
         $circuitBreakerFactory->resetAll();
 
         /** @var \PrestaShop\Module\PsAccounts\Repository\ConfigurationRepository $configurationRepository */
diff --git a/src/Account/Exception/AccountLoginException.php b/src/Account/Exception/AccountLoginException.php
index bc2977ca0..2073c4704 100644
--- a/src/Account/Exception/AccountLoginException.php
+++ b/src/Account/Exception/AccountLoginException.php
@@ -20,7 +20,7 @@
 
 namespace PrestaShop\Module\PsAccounts\Account\Exception;
 
-use PrestaShop\Module\PsAccounts\Provider\OAuth2\UserInfos;
+use PrestaShop\Module\PsAccounts\Api\Client\OAuth2\UserInfos;
 
 class AccountLoginException extends \Exception
 {
diff --git a/src/Account/Exception/EmailNotVerifiedException.php b/src/Account/Exception/EmailNotVerifiedException.php
index ae011f0b9..b05b98fa6 100644
--- a/src/Account/Exception/EmailNotVerifiedException.php
+++ b/src/Account/Exception/EmailNotVerifiedException.php
@@ -20,7 +20,7 @@
 
 namespace PrestaShop\Module\PsAccounts\Account\Exception;
 
-use PrestaShop\Module\PsAccounts\Provider\OAuth2\UserInfos;
+use PrestaShop\Module\PsAccounts\Api\Client\OAuth2\UserInfos;
 
 class EmailNotVerifiedException extends AccountLoginException
 {
diff --git a/src/Account/Exception/EmployeeNotFoundException.php b/src/Account/Exception/EmployeeNotFoundException.php
index 916f22387..0fc03e41a 100644
--- a/src/Account/Exception/EmployeeNotFoundException.php
+++ b/src/Account/Exception/EmployeeNotFoundException.php
@@ -20,7 +20,7 @@
 
 namespace PrestaShop\Module\PsAccounts\Account\Exception;
 
-use PrestaShop\Module\PsAccounts\Provider\OAuth2\UserInfos;
+use PrestaShop\Module\PsAccounts\Api\Client\OAuth2\UserInfos;
 
 class EmployeeNotFoundException extends AccountLoginException
 {
diff --git a/src/Account/Exception/Oauth2Exception.php b/src/Account/Exception/Oauth2LoginException.php
similarity index 91%
rename from src/Account/Exception/Oauth2Exception.php
rename to src/Account/Exception/Oauth2LoginException.php
index 92a5d0672..c516abedd 100644
--- a/src/Account/Exception/Oauth2Exception.php
+++ b/src/Account/Exception/Oauth2LoginException.php
@@ -20,9 +20,9 @@
 
 namespace PrestaShop\Module\PsAccounts\Account\Exception;
 
-use PrestaShop\Module\PsAccounts\Provider\OAuth2\UserInfos;
+use PrestaShop\Module\PsAccounts\Api\Client\OAuth2\UserInfos;
 
-class Oauth2Exception extends AccountLoginException
+class Oauth2LoginException extends AccountLoginException
 {
     /**
      * @param string $message
diff --git a/src/Account/Session/ShopSession.php b/src/Account/Session/ShopSession.php
index b5eeb3f23..05eafdd04 100644
--- a/src/Account/Session/ShopSession.php
+++ b/src/Account/Session/ShopSession.php
@@ -25,10 +25,10 @@
 use PrestaShop\Module\PsAccounts\Account\Exception\RefreshTokenException;
 use PrestaShop\Module\PsAccounts\Account\LinkShop;
 use PrestaShop\Module\PsAccounts\Account\Token\Token;
-use PrestaShop\Module\PsAccounts\Api\Client\OAuth2Client;
+use PrestaShop\Module\PsAccounts\Api\Client\OAuth2\AccessToken;
+use PrestaShop\Module\PsAccounts\Api\Client\OAuth2\OAuth2ApiClient;
 use PrestaShop\Module\PsAccounts\Cqrs\CommandBus;
 use PrestaShop\Module\PsAccounts\Hook\ActionShopAccessTokenRefreshAfter;
-use PrestaShop\Module\PsAccounts\Provider\OAuth2\AccessToken;
 use PrestaShop\Module\PsAccounts\Repository\ConfigurationRepository;
 
 class ShopSession extends Session implements SessionInterface
@@ -44,7 +44,7 @@ class ShopSession extends Session implements SessionInterface
     protected $configurationRepository;
 
     /**
-     * @var OAuth2Client
+     * @var OAuth2ApiClient
      */
     protected $oauth2ApiClient;
 
@@ -60,13 +60,13 @@ class ShopSession extends Session implements SessionInterface
 
     /**
      * @param ConfigurationRepository $configurationRepository
-     * @param OAuth2Client $oauth2ApiClient
+     * @param OAuth2ApiClient $oauth2ApiClient
      * @param LinkShop $linkShop
      * @param CommandBus $commandBus
      */
     public function __construct(
         ConfigurationRepository $configurationRepository,
-        OAuth2Client $oauth2ApiClient,
+        OAuth2ApiClient $oauth2ApiClient,
         LinkShop $linkShop,
         CommandBus $commandBus
     ) {
diff --git a/src/Api/Client/AccountsClient.php b/src/Api/Client/AccountsClient.php
index 9dd67fc6d..dff85bde6 100644
--- a/src/Api/Client/AccountsClient.php
+++ b/src/Api/Client/AccountsClient.php
@@ -22,8 +22,8 @@
 
 use PrestaShop\Module\PsAccounts\Account\Dto\UpdateShop;
 use PrestaShop\Module\PsAccounts\Account\Dto\UpgradeModule;
-use PrestaShop\Module\PsAccounts\Factory\HttpClientFactory;
-use PrestaShop\Module\PsAccounts\Http\Client\Curl\HttpClient;
+use PrestaShop\Module\PsAccounts\Http\Client\Curl\Client;
+use PrestaShop\Module\PsAccounts\Http\Client\Factory;
 use PrestaShop\Module\PsAccounts\Vendor\Ramsey\Uuid\Uuid;
 
 class AccountsClient
@@ -34,7 +34,7 @@ class AccountsClient
     private $baseUri;
 
     /**
-     * @var HttpClient
+     * @var Client
      */
     private $client;
 
@@ -67,12 +67,12 @@ public function __construct(
     }
 
     /**
-     * @return HttpClient
+     * @return Client
      */
     private function getClient()
     {
         if (null === $this->client) {
-            $this->client = (new HttpClientFactory())->create([
+            $this->client = (new Factory())->create([
                 'name' => static::class,
                 'baseUri' => $this->baseUri,
                 'headers' => $this->getHeaders(),
diff --git a/src/Provider/OAuth2/AccessToken.php b/src/Api/Client/OAuth2/AccessToken.php
similarity index 73%
rename from src/Provider/OAuth2/AccessToken.php
rename to src/Api/Client/OAuth2/AccessToken.php
index 3b98e98a7..cfde3a1ab 100644
--- a/src/Provider/OAuth2/AccessToken.php
+++ b/src/Api/Client/OAuth2/AccessToken.php
@@ -1,6 +1,8 @@
 <?php
 
-namespace PrestaShop\Module\PsAccounts\Provider\OAuth2;
+namespace PrestaShop\Module\PsAccounts\Api\Client\OAuth2;
+
+use PrestaShop\Module\PsAccounts\Account\Token\Token;
 
 class AccessToken
 {
@@ -55,4 +57,14 @@ public function __construct(array $data = [])
             }
         }
     }
+
+    /**
+     * @return bool
+     */
+    public function hasExpired()
+    {
+        $token = new Token($this->access_token);
+
+        return $token->isExpired();
+    }
 }
diff --git a/src/Provider/OAuth2/CachedFile.php b/src/Api/Client/OAuth2/CachedFile.php
similarity index 97%
rename from src/Provider/OAuth2/CachedFile.php
rename to src/Api/Client/OAuth2/CachedFile.php
index aa365a358..2d2b7f848 100644
--- a/src/Provider/OAuth2/CachedFile.php
+++ b/src/Api/Client/OAuth2/CachedFile.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace PrestaShop\Module\PsAccounts\Provider\OAuth2;
+namespace PrestaShop\Module\PsAccounts\Api\Client\OAuth2;
 
 class CachedFile
 {
diff --git a/src/Api/Client/OAuth2Client.php b/src/Api/Client/OAuth2/OAuth2ApiClient.php
similarity index 91%
rename from src/Api/Client/OAuth2Client.php
rename to src/Api/Client/OAuth2/OAuth2ApiClient.php
index 41b23efb9..20ece84bc 100644
--- a/src/Api/Client/OAuth2Client.php
+++ b/src/Api/Client/OAuth2/OAuth2ApiClient.php
@@ -18,20 +18,15 @@
  * @license   https://opensource.org/licenses/AFL-3.0 Academic Free License version 3.0
  */
 
-namespace PrestaShop\Module\PsAccounts\Api\Client;
+namespace PrestaShop\Module\PsAccounts\Api\Client\OAuth2;
 
 use PrestaShop\Module\PsAccounts\Adapter\Link;
-use PrestaShop\Module\PsAccounts\Factory\HttpClientFactory;
-use PrestaShop\Module\PsAccounts\Http\Client\Curl\HttpClient;
-use PrestaShop\Module\PsAccounts\Provider\OAuth2\AccessToken;
-use PrestaShop\Module\PsAccounts\Provider\OAuth2\CachedFile;
-use PrestaShop\Module\PsAccounts\Provider\OAuth2\Oauth2Client as OauthClient;
-use PrestaShop\Module\PsAccounts\Provider\OAuth2\PrestaShopLogoutTrait;
-use PrestaShop\Module\PsAccounts\Provider\OAuth2\UserInfos;
-use PrestaShop\Module\PsAccounts\Provider\OAuth2\WellKnown;
+use PrestaShop\Module\PsAccounts\Api\Client\OAuth2\OAuth2Client as OauthClient;
+use PrestaShop\Module\PsAccounts\Http\Client\Curl\Client;
+use PrestaShop\Module\PsAccounts\Http\Client\Factory;
 use PrestaShop\Module\PsAccounts\Vendor\Ramsey\Uuid\Uuid;
 
-class OAuth2Client
+class OAuth2ApiClient
 {
     /**
      * @var string
@@ -39,7 +34,7 @@ class OAuth2Client
     private $baseUri;
 
     /**
-     * @var HttpClient
+     * @var Client
      */
     private $client;
 
@@ -105,12 +100,12 @@ public function __construct(
     }
 
     /**
-     * @return HttpClient
+     * @return Client
      */
     private function getClient()
     {
         if (null === $this->client) {
-            $this->client = (new HttpClientFactory())->create([
+            $this->client = (new Factory())->create([
                 'name' => static::class,
                 'baseUri' => $this->baseUri,
                 'headers' => $this->getHeaders(),
@@ -226,6 +221,10 @@ public function getAccessTokenByClientCredentials(array $scope = [], array $audi
             ],
         ]);
 
+        if (!$response->status) {
+            throw new OAuth2Exception('Unable to get access token');
+        }
+
         return new AccessToken($response->body);
     }
 
@@ -326,6 +325,10 @@ public function getAccessTokenByAuthorizationCode(
             ] : []),
         ]);
 
+        if (!$response->status) {
+            throw new OAuth2Exception('Unable to get access token');
+        }
+
         return new AccessToken($response->body);
     }
 
@@ -346,6 +349,10 @@ public function refreshAccessToken($refreshToken)
             ],
         ]);
 
+        if (!$response->status) {
+            throw new OAuth2Exception('Unable to refresh access token');
+        }
+
         return new AccessToken($response->body);
     }
 
@@ -364,6 +371,10 @@ public function getUserInfos($accessToken)
             ]),
         ]);
 
+        if (!$response->status) {
+            throw new OAuth2Exception('Unable to get user infos');
+        }
+
         return new UserInfos($response->body);
     }
 
@@ -398,4 +409,9 @@ public function getPostLogoutRedirectUri()
     // TODO: remove Lcobucci (use firebase/jwt)
     // TODO: instantiate real response types (and throw exceptions)
     // TODO: check response types (HTTPClient)
+
+    // TODO: move Token class
+    // TODO: move Exception classes
+    // TODO: throw Exceptions -> and catch them in Login Trait
+    // TODO: log client errors (onError)
 }
diff --git a/src/Provider/OAuth2/Oauth2Client.php b/src/Api/Client/OAuth2/OAuth2Client.php
similarity index 96%
rename from src/Provider/OAuth2/Oauth2Client.php
rename to src/Api/Client/OAuth2/OAuth2Client.php
index 8b0f07623..06ebc9098 100644
--- a/src/Provider/OAuth2/Oauth2Client.php
+++ b/src/Api/Client/OAuth2/OAuth2Client.php
@@ -18,11 +18,11 @@
  * @license   https://opensource.org/licenses/AFL-3.0 Academic Free License version 3.0
  */
 
-namespace PrestaShop\Module\PsAccounts\Provider\OAuth2;
+namespace PrestaShop\Module\PsAccounts\Api\Client\OAuth2;
 
 use PrestaShop\Module\PsAccounts\Repository\ConfigurationRepository;
 
-class Oauth2Client
+class OAuth2Client
 {
     /**
      * @var ConfigurationRepository
diff --git a/src/Api/Client/OAuth2/OAuth2Exception.php b/src/Api/Client/OAuth2/OAuth2Exception.php
new file mode 100644
index 000000000..d0a0ade39
--- /dev/null
+++ b/src/Api/Client/OAuth2/OAuth2Exception.php
@@ -0,0 +1,7 @@
+<?php
+
+namespace PrestaShop\Module\PsAccounts\Api\Client\OAuth2;
+
+class OAuth2Exception extends \Exception
+{
+}
diff --git a/src/Provider/OAuth2/PrestaShopLoginTrait.php b/src/Api/Client/OAuth2/PrestaShopLoginTrait.php
similarity index 92%
rename from src/Provider/OAuth2/PrestaShopLoginTrait.php
rename to src/Api/Client/OAuth2/PrestaShopLoginTrait.php
index ff108934a..b708aaec1 100644
--- a/src/Provider/OAuth2/PrestaShopLoginTrait.php
+++ b/src/Api/Client/OAuth2/PrestaShopLoginTrait.php
@@ -18,12 +18,11 @@
  * @license   https://opensource.org/licenses/AFL-3.0 Academic Free License version 3.0
  */
 
-namespace PrestaShop\Module\PsAccounts\Provider\OAuth2;
+namespace PrestaShop\Module\PsAccounts\Api\Client\OAuth2;
 
 use PrestaShop\Module\PsAccounts\Account\Exception\EmailNotVerifiedException;
 use PrestaShop\Module\PsAccounts\Account\Exception\EmployeeNotFoundException;
-use PrestaShop\Module\PsAccounts\Account\Exception\Oauth2Exception;
-use PrestaShop\Module\PsAccounts\Api\Client\OAuth2Client;
+use PrestaShop\Module\PsAccounts\Account\Exception\Oauth2LoginException;
 use PrestaShop\Module\PsAccounts\Log\Logger;
 use Symfony\Component\HttpFoundation\Session\SessionInterface;
 use Tools;
@@ -31,7 +30,7 @@
 trait PrestaShopLoginTrait
 {
     /**
-     * @return OAuth2Client
+     * @return OAuth2ApiClient
      */
     abstract protected function getOAuth2Client();
 
@@ -62,7 +61,7 @@ abstract protected function getOauth2Session();
      *
      * @throws EmailNotVerifiedException
      * @throws EmployeeNotFoundException
-     * @throws Oauth2Exception
+     * @throws Oauth2LoginException
      * @throws \Exception
      */
     public function oauth2Login()
@@ -97,9 +96,8 @@ public function oauth2Login()
                     $this->getSession()->get('oauth2pkceCode'),
                     $apiClient->getAuthRedirectUri()
                 );
-            } catch (IdentityProviderException $e) {
-                // FIXME
-                throw new Oauth2Exception($e->getMessage(), null, $e);
+            } catch (OAuth2Exception $e) {
+                throw new Oauth2LoginException($e->getMessage(), null, $e);
             }
 
             $oauth2Session->setTokenProvider($accessToken);
diff --git a/src/Provider/OAuth2/PrestaShopLogoutTrait.php b/src/Api/Client/OAuth2/PrestaShopLogoutTrait.php
similarity index 93%
rename from src/Provider/OAuth2/PrestaShopLogoutTrait.php
rename to src/Api/Client/OAuth2/PrestaShopLogoutTrait.php
index 3789c690a..682dea20a 100644
--- a/src/Provider/OAuth2/PrestaShopLogoutTrait.php
+++ b/src/Api/Client/OAuth2/PrestaShopLogoutTrait.php
@@ -18,14 +18,12 @@
  * @license   https://opensource.org/licenses/AFL-3.0 Academic Free License version 3.0
  */
 
-namespace PrestaShop\Module\PsAccounts\Provider\OAuth2;
-
-use PrestaShop\Module\PsAccounts\Api\Client\OAuth2Client;
+namespace PrestaShop\Module\PsAccounts\Api\Client\OAuth2;
 
 trait PrestaShopLogoutTrait
 {
     /**
-     * @return OAuth2Client
+     * @return OAuth2ApiClient
      */
     abstract protected function getOAuth2Client();
 
diff --git a/src/Provider/OAuth2/PrestaShopSession.php b/src/Api/Client/OAuth2/PrestaShopSession.php
similarity index 82%
rename from src/Provider/OAuth2/PrestaShopSession.php
rename to src/Api/Client/OAuth2/PrestaShopSession.php
index 100636d2a..f8aefd1fc 100644
--- a/src/Provider/OAuth2/PrestaShopSession.php
+++ b/src/Api/Client/OAuth2/PrestaShopSession.php
@@ -18,10 +18,8 @@
  * @license   https://opensource.org/licenses/AFL-3.0 Academic Free License version 3.0
  */
 
-namespace PrestaShop\Module\PsAccounts\Provider\OAuth2;
+namespace PrestaShop\Module\PsAccounts\Api\Client\OAuth2;
 
-use PrestaShop\Module\PsAccounts\Account\Token\Token;
-use PrestaShop\Module\PsAccounts\Api\Client\OAuth2Client as Oauth2ApiClient;
 use Symfony\Component\HttpFoundation\Session\SessionInterface;
 
 class PrestaShopSession
@@ -39,16 +37,16 @@ class PrestaShopSession
     private $oauth2ApiClient;
 
     /**
-     * @var Oauth2Client
+     * @var OAuth2Client
      */
     private $oauth2Client;
 
     /**
      * @param mixed $session
-     * @param Oauth2ApiClient $oauth2ApiClient
-     * @param Oauth2Client $oauth2Client
+     * @param OAuth2ApiClient $oauth2ApiClient
+     * @param OAuth2Client $oauth2Client
      */
-    public function __construct($session, Oauth2ApiClient $oauth2ApiClient, Oauth2Client $oauth2Client)
+    public function __construct($session, Oauth2ApiClient $oauth2ApiClient, OAuth2Client $oauth2Client)
     {
         $this->session = $session;
         $this->oauth2ApiClient = $oauth2ApiClient;
@@ -61,7 +59,7 @@ public function __construct($session, Oauth2ApiClient $oauth2ApiClient, Oauth2Cl
     public function getOrRefreshAccessToken()
     {
         $token = $this->getTokenProvider();
-        if (($token instanceof AccessToken) && $this->hasExpired($token)) {
+        if (($token instanceof AccessToken) && $token->hasExpired()) {
             $token = $this->oauth2ApiClient->refreshAccessToken($token->refresh_token);
             $this->setTokenProvider($token);
         }
@@ -69,18 +67,6 @@ public function getOrRefreshAccessToken()
         return $this->getAccessToken();
     }
 
-    /**
-     * @param AccessToken $accessToken
-     *
-     * @return bool
-     */
-    protected function hasExpired(AccessToken $accessToken)
-    {
-        $token = new Token($accessToken->access_token);
-
-        return $token->isExpired();
-    }
-
     /**
      * @return string|null
      */
diff --git a/src/Provider/OAuth2/ShopProvider.php b/src/Api/Client/OAuth2/ShopProvider.php
similarity index 96%
rename from src/Provider/OAuth2/ShopProvider.php
rename to src/Api/Client/OAuth2/ShopProvider.php
index ff07ce9ff..f916f2f97 100644
--- a/src/Provider/OAuth2/ShopProvider.php
+++ b/src/Api/Client/OAuth2/ShopProvider.php
@@ -18,7 +18,7 @@
  * @license   https://opensource.org/licenses/AFL-3.0 Academic Free License version 3.0
  */
 
-namespace PrestaShop\Module\PsAccounts\Provider\OAuth2;
+namespace PrestaShop\Module\PsAccounts\Api\Client\OAuth2;
 
 use PrestaShop\Module\PsAccounts\Adapter\Link;
 use PrestaShop\Module\PsAccounts\Vendor\League\OAuth2\Client\Provider\AbstractProvider;
@@ -37,7 +37,7 @@ class ShopProvider extends PrestaShop
     private $module;
 
     /**
-     * @var Oauth2Client
+     * @var OAuth2Client
      */
     private $oauth2Client;
 
@@ -52,7 +52,7 @@ public function __construct(array $options = [], array $collaborators = [])
         /** @var \Ps_accounts $module */
         $module = \Module::getInstanceByName('ps_accounts');
         $this->module = $module;
-        $this->oauth2Client = $module->getService(Oauth2Client::class);
+        $this->oauth2Client = $module->getService(OAuth2Client::class);
 
         // Disable certificate verification from local configuration
         $options['verify'] = (bool) $this->module->getParameter(
@@ -136,7 +136,7 @@ public function getPostLogoutRedirectUri()
     }
 
     /**
-     * @return Oauth2Client
+     * @return OAuth2Client
      */
     public function getOauth2Client()
     {
diff --git a/src/Provider/OAuth2/UserInfos.php b/src/Api/Client/OAuth2/UserInfos.php
similarity index 96%
rename from src/Provider/OAuth2/UserInfos.php
rename to src/Api/Client/OAuth2/UserInfos.php
index 606c70e11..6467ebbd3 100644
--- a/src/Provider/OAuth2/UserInfos.php
+++ b/src/Api/Client/OAuth2/UserInfos.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace PrestaShop\Module\PsAccounts\Provider\OAuth2;
+namespace PrestaShop\Module\PsAccounts\Api\Client\OAuth2;
 
 // [OAuth2] stdClass Object (
 //     [amr] => Array
diff --git a/src/Provider/OAuth2/WellKnown.php b/src/Api/Client/OAuth2/WellKnown.php
similarity index 98%
rename from src/Provider/OAuth2/WellKnown.php
rename to src/Api/Client/OAuth2/WellKnown.php
index f9f6adebc..dfc3f023a 100644
--- a/src/Provider/OAuth2/WellKnown.php
+++ b/src/Api/Client/OAuth2/WellKnown.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace PrestaShop\Module\PsAccounts\Provider\OAuth2;
+namespace PrestaShop\Module\PsAccounts\Api\Client\OAuth2;
 
 /**
  * {
diff --git a/src/Api/Client/ServicesBillingClient.php b/src/Api/Client/ServicesBillingClient.php
index 3324eeca3..ce4e4b420 100644
--- a/src/Api/Client/ServicesBillingClient.php
+++ b/src/Api/Client/ServicesBillingClient.php
@@ -20,8 +20,8 @@
 
 namespace PrestaShop\Module\PsAccounts\Api\Client;
 
-use PrestaShop\Module\PsAccounts\Factory\HttpClientFactory;
-use PrestaShop\Module\PsAccounts\Http\Client\Curl\HttpClient;
+use PrestaShop\Module\PsAccounts\Http\Client\Curl\Client;
+use PrestaShop\Module\PsAccounts\Http\Client\Factory;
 use PrestaShop\Module\PsAccounts\Provider\ShopProvider;
 use PrestaShop\Module\PsAccounts\Service\PsAccountsService;
 
@@ -31,7 +31,7 @@
 class ServicesBillingClient
 {
     /**
-     * @var HttpClient
+     * @var Client
      */
     private $client;
 
@@ -41,7 +41,7 @@ class ServicesBillingClient
      * @param string $apiUrl
      * @param PsAccountsService $psAccountsService
      * @param ShopProvider $shopProvider
-     * @param HttpClient|null $client
+     * @param Client|null $client
      *
      * @throws \PrestaShopException
      * @throws \Exception
@@ -50,7 +50,7 @@ public function __construct(
         $apiUrl,
         PsAccountsService $psAccountsService,
         ShopProvider $shopProvider,
-        HttpClient $client = null
+        Client $client = null
     ) {
         $shopId = $shopProvider->getCurrentShop()['id'];
 
@@ -58,7 +58,7 @@ public function __construct(
 
         // Client can be provided for tests
         if (null === $client) {
-            $client = (new HttpClientFactory())->create([
+            $client = (new Factory())->create([
                 'baseUri' => $apiUrl,
                 'headers' => [
                     // Commented, else does not work anymore with API.
diff --git a/src/Factory/PrestaShopSessionFactory.php b/src/Factory/PrestaShopSessionFactory.php
deleted file mode 100644
index 2abf6c49c..000000000
--- a/src/Factory/PrestaShopSessionFactory.php
+++ /dev/null
@@ -1,45 +0,0 @@
-<?php
-/**
- * Copyright since 2007 PrestaShop SA and Contributors
- * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License version 3.0
- * that is bundled with this package in the file LICENSE.md.
- * It is also available through the world-wide-web at this URL:
- * https://opensource.org/licenses/AFL-3.0
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@prestashop.com so we can send you a copy immediately.
- *
- * @author    PrestaShop SA and Contributors <contact@prestashop.com>
- * @copyright Since 2007 PrestaShop SA and Contributors
- * @license   https://opensource.org/licenses/AFL-3.0 Academic Free License version 3.0
- */
-
-namespace PrestaShop\Module\PsAccounts\Factory;
-
-use PrestaShop\Module\PsAccounts\Api\Client\OAuth2Client as Oauth2ApiClient;
-use PrestaShop\Module\PsAccounts\Provider\OAuth2\Oauth2Client;
-use PrestaShop\Module\PsAccounts\Provider\OAuth2\PrestaShopSession;
-
-class PrestaShopSessionFactory
-{
-    /**
-     * @return PrestaShopSession
-     *
-     * @throws \Exception
-     */
-    public static function create()
-    {
-        /** @var \Ps_accounts $module */
-        $module = \Module::getInstanceByName('ps_accounts');
-
-        return new PrestaShopSession(
-            $module->getSession(),
-            $module->getService(Oauth2ApiClient::class),
-            $module->getService(OAuth2Client::class)
-        );
-    }
-}
diff --git a/src/Hook/ActionShopAccountUnlinkAfter.php b/src/Hook/ActionShopAccountUnlinkAfter.php
index 06e78cbee..df3979654 100644
--- a/src/Hook/ActionShopAccountUnlinkAfter.php
+++ b/src/Hook/ActionShopAccountUnlinkAfter.php
@@ -22,7 +22,7 @@
 
 use PrestaShop\Module\PsAccounts\Account\Session\Firebase;
 use PrestaShop\Module\PsAccounts\Account\Session\ShopSession;
-use PrestaShop\Module\PsAccounts\Provider\OAuth2\Oauth2Client;
+use PrestaShop\Module\PsAccounts\Api\Client\OAuth2\OAuth2Client;
 use PrestaShop\Module\PsAccounts\Provider\RsaKeysProvider;
 
 class ActionShopAccountUnlinkAfter extends Hook
@@ -36,8 +36,8 @@ class ActionShopAccountUnlinkAfter extends Hook
      */
     public function execute(array $params = [])
     {
-        /** @var Oauth2Client $oauth2Client */
-        $oauth2Client = $this->module->getService(Oauth2Client::class);
+        /** @var OAuth2Client $oauth2Client */
+        $oauth2Client = $this->module->getService(OAuth2Client::class);
         $oauth2Client->delete();
 
         /** @var Firebase\ShopSession $shopSession */
diff --git a/src/Http/Client/CircuitBreaker/CircuitBreaker.php b/src/Http/Client/CircuitBreaker/CircuitBreaker.php
index 7e54549b0..65c1c06ee 100644
--- a/src/Http/Client/CircuitBreaker/CircuitBreaker.php
+++ b/src/Http/Client/CircuitBreaker/CircuitBreaker.php
@@ -82,6 +82,14 @@ public function reset()
         $this->setLastFailureTime(null);
     }
 
+    /**
+     * @return mixed
+     */
+    public function getDefaultFallbackResponse()
+    {
+        return $this->defaultFallbackResponse;
+    }
+
     /**
      * @param mixed $defaultFallbackResponse
      *
diff --git a/src/Factory/CircuitBreakerFactory.php b/src/Http/Client/CircuitBreaker/Factory.php
similarity index 89%
rename from src/Factory/CircuitBreakerFactory.php
rename to src/Http/Client/CircuitBreaker/Factory.php
index 42924ffba..e1585b38f 100644
--- a/src/Factory/CircuitBreakerFactory.php
+++ b/src/Http/Client/CircuitBreaker/Factory.php
@@ -18,20 +18,20 @@
  * @license   https://opensource.org/licenses/AFL-3.0 Academic Free License version 3.0
  */
 
-namespace PrestaShop\Module\PsAccounts\Factory;
+namespace PrestaShop\Module\PsAccounts\Http\Client\CircuitBreaker;
 
 use PrestaShop\Module\PsAccounts\Adapter\Configuration;
 use PrestaShop\Module\PsAccounts\Api\Client\AccountsClient;
-use PrestaShop\Module\PsAccounts\Http\Client\CircuitBreaker\CircuitBreaker;
-use PrestaShop\Module\PsAccounts\Http\Client\CircuitBreaker\PersistentCircuitBreaker;
+use PrestaShop\Module\PsAccounts\Api\Client\OAuth2\OAuth2ApiClient;
 
-class CircuitBreakerFactory
+class Factory
 {
     /**
      * @var array
      */
     private $provides = [
         AccountsClient::class,
+        OAuth2ApiClient::class,
     ];
 
     /**
@@ -117,8 +117,8 @@ public static function create($resourceId)
         /** @var \Ps_accounts $module */
         $module = \Module::getInstanceByName('ps_accounts');
 
-        /** @var CircuitBreakerFactory $factory */
-        $factory = $module->getService(CircuitBreakerFactory::class);
+        /** @var Factory $factory */
+        $factory = $module->getService(Factory::class);
 
         return $factory->createInstance($resourceId);
     }
diff --git a/src/Http/Client/Curl/HttpClient.php b/src/Http/Client/Curl/Client.php
similarity index 90%
rename from src/Http/Client/Curl/HttpClient.php
rename to src/Http/Client/Curl/Client.php
index 9d6e7868a..cdc88290e 100644
--- a/src/Http/Client/Curl/HttpClient.php
+++ b/src/Http/Client/Curl/Client.php
@@ -20,12 +20,11 @@
 
 namespace PrestaShop\Module\PsAccounts\Http\Client\Curl;
 
-use PrestaShop\Module\PsAccounts\Factory\CircuitBreakerFactory;
-use PrestaShop\Module\PsAccounts\Http\Client\CircuitBreaker\CircuitBreaker;
-use PrestaShop\Module\PsAccounts\Http\Client\CircuitBreaker\CircuitBreakerException;
+use PrestaShop\Module\PsAccounts\Http\Client\CircuitBreaker;
+use PrestaShop\Module\PsAccounts\Http\Client\Response;
 use PrestaShop\Module\PsAccounts\Log\Logger;
 
-class HttpClient
+class Client
 {
     /**
      * @var string
@@ -50,7 +49,7 @@ class HttpClient
     protected $catchExceptions = false;
 
     /**
-     * @var CircuitBreaker
+     * @var CircuitBreaker\CircuitBreaker
      *
      * TODO: implement circuit breaker
      */
@@ -73,9 +72,16 @@ class HttpClient
      */
     public function __construct($options)
     {
-        $this->circuitBreaker = CircuitBreakerFactory::create(
+        $this->circuitBreaker = CircuitBreaker\Factory::create(
             isset($options['name']) ? $options['name'] : static::class
         );
+
+        if ($this->objectResponse) {
+            $this->circuitBreaker->setDefaultFallbackResponse(
+                new Response($this->circuitBreaker->getDefaultFallbackResponse())
+            );
+        }
+
         unset($options['name']);
 //        \Tools::refreshCACertFile();
 
@@ -204,14 +210,14 @@ public function setRoute($route)
      *
      * @return Response|array
      *
-     * @throws CircuitBreakerException
+     * @throws CircuitBreaker\CircuitBreakerException
      */
     public function getResponse($ch, $response)
     {
         switch (curl_errno($ch)) {
             case CURLE_OPERATION_TIMEDOUT:
             case CURLE_COULDNT_CONNECT:
-                throw new CircuitBreakerException('Curl error: ' . curl_error($ch));
+                throw new CircuitBreaker\CircuitBreakerException('Curl error: ' . curl_error($ch));
         }
 
         $statusCode = curl_getinfo($ch, CURLINFO_HTTP_CODE);
@@ -239,7 +245,11 @@ public function getResponse($ch, $response)
      */
     private function logResponse($response, $ch)
     {
-        Logger::getInstance()->info('response ' . var_export($response, true));
+        if (!$response['status']) {
+            Logger::getInstance()->error('response ' . var_export($response, true));
+        } else {
+            Logger::getInstance()->info('response ' . var_export($response, true));
+        }
     }
 
     /**
diff --git a/src/Factory/HttpClientFactory.php b/src/Http/Client/Factory.php
similarity index 78%
rename from src/Factory/HttpClientFactory.php
rename to src/Http/Client/Factory.php
index f58e62361..92d273ad6 100644
--- a/src/Factory/HttpClientFactory.php
+++ b/src/Http/Client/Factory.php
@@ -18,24 +18,21 @@
  * @license   https://opensource.org/licenses/AFL-3.0 Academic Free License version 3.0
  */
 
-namespace PrestaShop\Module\PsAccounts\Factory;
+namespace PrestaShop\Module\PsAccounts\Http\Client;
 
-use PrestaShop\Module\PsAccounts\Http\Client\Curl\HttpClient;
+use PrestaShop\Module\PsAccounts\Http\Client\Curl\Client;
 
-/**
- * Construct the guzzle client depending on PrestaShop version
- */
-class HttpClientFactory
+class Factory
 {
     /**
      * @param array $options
      *
-     * @return HttpClient
+     * @return Client
      *
      * @throws \Exception
      */
     public function create($options)
     {
-        return new HttpClient($options);
+        return new Client($options);
     }
 }
diff --git a/src/Http/Client/Curl/Response.php b/src/Http/Client/Response.php
similarity index 88%
rename from src/Http/Client/Curl/Response.php
rename to src/Http/Client/Response.php
index 05121ee07..2dd742cb7 100644
--- a/src/Http/Client/Curl/Response.php
+++ b/src/Http/Client/Response.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace PrestaShop\Module\PsAccounts\Http\Client\Curl;
+namespace PrestaShop\Module\PsAccounts\Http\Client;
 
 class Response
 {
diff --git a/src/Middleware/Oauth2Middleware.php b/src/Middleware/Oauth2Middleware.php
index 358ca40d6..893fd3164 100644
--- a/src/Middleware/Oauth2Middleware.php
+++ b/src/Middleware/Oauth2Middleware.php
@@ -21,9 +21,9 @@
 namespace PrestaShop\Module\PsAccounts\Middleware;
 
 use Exception;
-use PrestaShop\Module\PsAccounts\Api\Client\OAuth2Client;
-use PrestaShop\Module\PsAccounts\Provider\OAuth2\PrestaShopLogoutTrait;
-use PrestaShop\Module\PsAccounts\Provider\OAuth2\PrestaShopSession;
+use PrestaShop\Module\PsAccounts\Api\Client\OAuth2\OAuth2ApiClient;
+use PrestaShop\Module\PsAccounts\Api\Client\OAuth2\PrestaShopLogoutTrait;
+use PrestaShop\Module\PsAccounts\Api\Client\OAuth2\PrestaShopSession;
 use PrestaShop\Module\PsAccounts\Service\PsAccountsService;
 use Ps_accounts;
 
@@ -78,11 +78,11 @@ public function execute()
     }
 
     /**
-     * @return OAuth2Client
+     * @return OAuth2ApiClient
      */
     protected function getOAuth2Client()
     {
-        return $this->module->getService(OAuth2Client::class);
+        return $this->module->getService(OAuth2ApiClient::class);
     }
 
     /**
diff --git a/src/ServiceProvider/ApiClientProvider.php b/src/ServiceProvider/ApiClientProvider.php
index b7d54a5f5..039b9b9b1 100644
--- a/src/ServiceProvider/ApiClientProvider.php
+++ b/src/ServiceProvider/ApiClientProvider.php
@@ -22,7 +22,7 @@
 
 use PrestaShop\Module\PsAccounts\Adapter\Link;
 use PrestaShop\Module\PsAccounts\Api\Client\AccountsClient;
-use PrestaShop\Module\PsAccounts\Api\Client\OAuth2Client;
+use PrestaShop\Module\PsAccounts\Api\Client\OAuth2\OAuth2ApiClient;
 use PrestaShop\Module\PsAccounts\Api\Client\ServicesBillingClient;
 use PrestaShop\Module\PsAccounts\Provider\ShopProvider;
 use PrestaShop\Module\PsAccounts\Service\PsAccountsService;
@@ -45,10 +45,10 @@ public function provide(ServiceContainer $container)
                 $container->getParameter('ps_accounts.check_api_ssl_cert')
             );
         });
-        $container->registerProvider(OAuth2Client::class, static function () use ($container) {
-            return new OAuth2Client(
+        $container->registerProvider(OAuth2ApiClient::class, static function () use ($container) {
+            return new OAuth2ApiClient(
                 $container->getParameter('ps_accounts.oauth2_url'),
-                $container->get(\PrestaShop\Module\PsAccounts\Provider\OAuth2\Oauth2Client::class),
+                $container->get(\PrestaShop\Module\PsAccounts\Api\Client\OAuth2\OAuth2Client::class),
                 $container->get(Link::class),
                 _PS_CACHE_DIR_ . DIRECTORY_SEPARATOR . 'ps_accounts',
                 10,
diff --git a/src/ServiceProvider/DefaultProvider.php b/src/ServiceProvider/DefaultProvider.php
index d5f8cc774..b200e3df9 100644
--- a/src/ServiceProvider/DefaultProvider.php
+++ b/src/ServiceProvider/DefaultProvider.php
@@ -27,7 +27,7 @@
 use PrestaShop\Module\PsAccounts\Api\Client\ServicesBillingClient;
 use PrestaShop\Module\PsAccounts\Context\ShopContext;
 use PrestaShop\Module\PsAccounts\Cqrs\CommandBus;
-use PrestaShop\Module\PsAccounts\Factory\CircuitBreakerFactory;
+use PrestaShop\Module\PsAccounts\Http\Client\CircuitBreaker;
 use PrestaShop\Module\PsAccounts\Installer\Installer;
 use PrestaShop\Module\PsAccounts\Presenter\PsAccountsPresenter;
 use PrestaShop\Module\PsAccounts\Provider;
@@ -127,8 +127,8 @@ public function provide(ServiceContainer $container)
             );
         });
         // Factories
-        $container->registerProvider(CircuitBreakerFactory::class, static function () use ($container) {
-            return new CircuitBreakerFactory(
+        $container->registerProvider(CircuitBreaker\Factory::class, static function () use ($container) {
+            return new CircuitBreaker\Factory(
                 $container->get(Configuration::class)
             );
         });
diff --git a/src/ServiceProvider/OAuth2Provider.php b/src/ServiceProvider/OAuth2Provider.php
index 89809b66b..607cc6bf8 100644
--- a/src/ServiceProvider/OAuth2Provider.php
+++ b/src/ServiceProvider/OAuth2Provider.php
@@ -20,9 +20,10 @@
 
 namespace PrestaShop\Module\PsAccounts\ServiceProvider;
 
-use PrestaShop\Module\PsAccounts\Factory\PrestaShopSessionFactory;
+use PrestaShop\Module\PsAccounts\Api\Client\OAuth2\OAuth2ApiClient;
+use PrestaShop\Module\PsAccounts\Api\Client\OAuth2\OAuth2Client;
+use PrestaShop\Module\PsAccounts\Api\Client\OAuth2\PrestaShopSession;
 use PrestaShop\Module\PsAccounts\Middleware\Oauth2Middleware;
-use PrestaShop\Module\PsAccounts\Provider;
 use PrestaShop\Module\PsAccounts\Repository\ConfigurationRepository;
 use PrestaShop\Module\PsAccounts\Vendor\PrestaShopCorp\LightweightContainer\ServiceContainer\Contract\IServiceProvider;
 use PrestaShop\Module\PsAccounts\Vendor\PrestaShopCorp\LightweightContainer\ServiceContainer\ServiceContainer;
@@ -37,13 +38,17 @@ class OAuth2Provider implements IServiceProvider
     public function provide(ServiceContainer $container)
     {
         // OAuth2
-        $container->registerProvider(Provider\OAuth2\Oauth2Client::class, static function () use ($container) {
-            return new Provider\OAuth2\Oauth2Client(
+        $container->registerProvider(OAuth2Client::class, static function () use ($container) {
+            return new OAuth2Client(
                 $container->get(ConfigurationRepository::class)
             );
         });
-        $container->registerProvider(Provider\OAuth2\PrestaShopSession::class, static function () {
-            return PrestaShopSessionFactory::create();
+        $container->registerProvider(PrestaShopSession::class, static function () use ($container) {
+            return new PrestaShopSession(
+                $container->get('ps_accounts.module')->getSession(),
+                $container->getService(OAuth2ApiClient::class),
+                $container->getService(OAuth2Client::class)
+            );
         });
         // Middleware
         $container->registerProvider(Oauth2Middleware::class, static function () use ($container) {
diff --git a/src/ServiceProvider/SessionProvider.php b/src/ServiceProvider/SessionProvider.php
index eac37a075..0f416c730 100644
--- a/src/ServiceProvider/SessionProvider.php
+++ b/src/ServiceProvider/SessionProvider.php
@@ -23,7 +23,7 @@
 use PrestaShop\Module\PsAccounts\Account\LinkShop;
 use PrestaShop\Module\PsAccounts\Account\Session\Firebase;
 use PrestaShop\Module\PsAccounts\Account\Session\ShopSession;
-use PrestaShop\Module\PsAccounts\Api\Client\OAuth2Client;
+use PrestaShop\Module\PsAccounts\Api\Client\OAuth2\OAuth2ApiClient;
 use PrestaShop\Module\PsAccounts\Cqrs\CommandBus;
 use PrestaShop\Module\PsAccounts\Repository\ConfigurationRepository;
 use PrestaShop\Module\PsAccounts\Vendor\PrestaShopCorp\LightweightContainer\ServiceContainer\Contract\IServiceProvider;
@@ -42,7 +42,7 @@ public function provide(ServiceContainer $container)
         $container->registerProvider(ShopSession::class, static function () use ($container) {
             return new ShopSession(
                 $container->get(ConfigurationRepository::class),
-                $container->get(OAuth2Client::class),
+                $container->get(OAuth2ApiClient::class),
                 $container->get(LinkShop::class),
                 $container->get(CommandBus::class)
             );
diff --git a/tests/Feature/Api/v1/ShopOauth2Client/DeleteTest.php b/tests/Feature/Api/v1/ShopOauth2Client/DeleteTest.php
index 3cef65b87..52486ba21 100644
--- a/tests/Feature/Api/v1/ShopOauth2Client/DeleteTest.php
+++ b/tests/Feature/Api/v1/ShopOauth2Client/DeleteTest.php
@@ -2,7 +2,7 @@
 
 namespace PrestaShop\Module\PsAccounts\Tests\Feature\Api\v1\ShopOauth2Client;
 
-use PrestaShop\Module\PsAccounts\Provider\OAuth2\Oauth2Client;
+use PrestaShop\Module\PsAccounts\Api\Client\OAuth2\OAuth2Client;
 use PrestaShop\Module\PsAccounts\Api\Controller\AbstractRestController;
 use PrestaShop\Module\PsAccounts\Tests\Feature\FeatureTestCase;
 
@@ -11,7 +11,7 @@ class DeleteTest extends FeatureTestCase
     /**
      * @inject
      *
-     * @var Oauth2Client
+     * @var OAuth2Client
      */
     protected $oauth2Client;
 
diff --git a/tests/Feature/Api/v1/ShopOauth2Client/StoreTest.php b/tests/Feature/Api/v1/ShopOauth2Client/StoreTest.php
index 4a94f9da2..df2e2e4c9 100644
--- a/tests/Feature/Api/v1/ShopOauth2Client/StoreTest.php
+++ b/tests/Feature/Api/v1/ShopOauth2Client/StoreTest.php
@@ -4,7 +4,7 @@
 
 use PrestaShop\Module\PsAccounts\Account\Session\Firebase\OwnerSession;
 use PrestaShop\Module\PsAccounts\Account\Session\Firebase\ShopSession;
-use PrestaShop\Module\PsAccounts\Provider\OAuth2\Oauth2Client;
+use PrestaShop\Module\PsAccounts\Api\Client\OAuth2\OAuth2Client;
 use PrestaShop\Module\PsAccounts\Api\Controller\AbstractRestController;
 use PrestaShop\Module\PsAccounts\Adapter\ConfigurationKeys;
 use PrestaShop\Module\PsAccounts\Tests\Feature\FeatureTestCase;
@@ -15,7 +15,7 @@ class StoreTest extends FeatureTestCase
     /**
      * @inject
      *
-     * @var Oauth2Client
+     * @var OAuth2Client
      */
     protected $oauth2Client;
 
diff --git a/tests/Unit/Account/Session/Firebase/OwnerSession/GetValidTokenTest.php b/tests/Unit/Account/Session/Firebase/OwnerSession/GetValidTokenTest.php
index 6e65a93b7..5b6b8a9a5 100644
--- a/tests/Unit/Account/Session/Firebase/OwnerSession/GetValidTokenTest.php
+++ b/tests/Unit/Account/Session/Firebase/OwnerSession/GetValidTokenTest.php
@@ -8,7 +8,7 @@
 use PrestaShop\Module\PsAccounts\Account\Token\Token;
 use PrestaShop\Module\PsAccounts\Api\Client\AccountsClient;
 use PrestaShop\Module\PsAccounts\Account\Exception\RefreshTokenException;
-use PrestaShop\Module\PsAccounts\Provider\OAuth2\ShopProvider;
+use PrestaShop\Module\PsAccounts\Api\Client\OAuth2\ShopProvider;
 use PrestaShop\Module\PsAccounts\Tests\TestCase;
 
 class GetValidTokenTest extends TestCase
diff --git a/tests/Unit/Account/Session/Firebase/OwnerSession/RefreshTokenTest.php b/tests/Unit/Account/Session/Firebase/OwnerSession/RefreshTokenTest.php
index 93a32f4a3..e2079a1b1 100644
--- a/tests/Unit/Account/Session/Firebase/OwnerSession/RefreshTokenTest.php
+++ b/tests/Unit/Account/Session/Firebase/OwnerSession/RefreshTokenTest.php
@@ -24,7 +24,7 @@
 use PrestaShop\Module\PsAccounts\Account\Session\ShopSession;
 use PrestaShop\Module\PsAccounts\Account\Token\Token;
 use PrestaShop\Module\PsAccounts\Account\Exception\RefreshTokenException;
-use PrestaShop\Module\PsAccounts\Provider\OAuth2\ShopProvider;
+use PrestaShop\Module\PsAccounts\Api\Client\OAuth2\ShopProvider;
 use PrestaShop\Module\PsAccounts\Tests\TestCase;
 
 class RefreshTokenTest extends TestCase
diff --git a/tests/Unit/Account/Session/Firebase/ShopSession/GetValidTokenTest.php b/tests/Unit/Account/Session/Firebase/ShopSession/GetValidTokenTest.php
index 60b856ebd..85a1be3ab 100644
--- a/tests/Unit/Account/Session/Firebase/ShopSession/GetValidTokenTest.php
+++ b/tests/Unit/Account/Session/Firebase/ShopSession/GetValidTokenTest.php
@@ -6,7 +6,7 @@
 use PrestaShop\Module\PsAccounts\Account\Token\NullToken;
 use PrestaShop\Module\PsAccounts\Account\Token\Token;
 use PrestaShop\Module\PsAccounts\Account\Exception\RefreshTokenException;
-use PrestaShop\Module\PsAccounts\Provider\OAuth2\ShopProvider;
+use PrestaShop\Module\PsAccounts\Api\Client\OAuth2\ShopProvider;
 use PrestaShop\Module\PsAccounts\Tests\TestCase;
 
 class GetValidTokenTest extends TestCase
diff --git a/tests/Unit/Account/Session/Firebase/ShopSession/RefreshTokenTest.php b/tests/Unit/Account/Session/Firebase/ShopSession/RefreshTokenTest.php
index 95e36a919..9965f26d3 100644
--- a/tests/Unit/Account/Session/Firebase/ShopSession/RefreshTokenTest.php
+++ b/tests/Unit/Account/Session/Firebase/ShopSession/RefreshTokenTest.php
@@ -24,7 +24,7 @@
 use PrestaShop\Module\PsAccounts\Account\Session\ShopSession;
 use PrestaShop\Module\PsAccounts\Account\Token\Token;
 use PrestaShop\Module\PsAccounts\Account\Exception\RefreshTokenException;
-use PrestaShop\Module\PsAccounts\Provider\OAuth2\ShopProvider;
+use PrestaShop\Module\PsAccounts\Api\Client\OAuth2\ShopProvider;
 use PrestaShop\Module\PsAccounts\Tests\TestCase;
 
 class RefreshTokenTest extends TestCase
diff --git a/tests/Unit/Account/Session/ShopSession/RefreshTokenTest.php b/tests/Unit/Account/Session/ShopSession/RefreshTokenTest.php
index 813d0b9a6..cd5ac5a2d 100644
--- a/tests/Unit/Account/Session/ShopSession/RefreshTokenTest.php
+++ b/tests/Unit/Account/Session/ShopSession/RefreshTokenTest.php
@@ -7,8 +7,8 @@
 use PrestaShop\Module\PsAccounts\Account\Token\Token;
 use PrestaShop\Module\PsAccounts\Cqrs\CommandBus;
 use PrestaShop\Module\PsAccounts\Account\Exception\RefreshTokenException;
-use PrestaShop\Module\PsAccounts\Provider\OAuth2\Oauth2Client;
-use PrestaShop\Module\PsAccounts\Provider\OAuth2\ShopProvider;
+use PrestaShop\Module\PsAccounts\Api\Client\OAuth2\OAuth2Client;
+use PrestaShop\Module\PsAccounts\Api\Client\OAuth2\ShopProvider;
 use PrestaShop\Module\PsAccounts\Tests\TestCase;
 use PrestaShop\Module\PsAccounts\Vendor\League\OAuth2\Client\Token\AccessToken;
 
@@ -26,7 +26,7 @@ class RefreshTokenTest extends TestCase
     /**
      * @inject
      *
-     * @var Oauth2Client
+     * @var OAuth2Client
      */
     protected $oauth2Client;
 
diff --git a/tests/Unit/Http/Client/CircuitBreaker/CircuitBreakerTest.php b/tests/Unit/Http/Client/CircuitBreaker/CircuitBreakerTest.php
index 3046bccb0..605bcca53 100644
--- a/tests/Unit/Http/Client/CircuitBreaker/CircuitBreakerTest.php
+++ b/tests/Unit/Http/Client/CircuitBreaker/CircuitBreakerTest.php
@@ -2,7 +2,7 @@
 namespace PrestaShop\Module\PsAccounts\Tests\Unit\Http\Client\CircuitBreaker;
 
 use PHPUnit\Framework\TestCase;
-use PrestaShop\Module\PsAccounts\Factory\CircuitBreakerFactory;
+use PrestaShop\Module\PsAccounts\Http\Client\CircuitBreaker\Factory;
 use PrestaShop\Module\PsAccounts\Http\Client\CircuitBreaker\CircuitBreaker;
 use PrestaShop\Module\PsAccounts\Http\Client\CircuitBreaker\State;
 use PrestaShop\Module\PsAccounts\Vendor\GuzzleHttp\Exception\ConnectException;
@@ -170,7 +170,7 @@ private function createCircuitBreaker(
         $resetTimeoutMs
     ) {
         //$circuitBreaker = new InMemoryCircuitBreaker($resourceId);
-        $circuitBreaker = CircuitBreakerFactory::create($resourceId);
+        $circuitBreaker = Factory::create($resourceId);
         $circuitBreaker->setResetTimeoutMs($resetTimeoutMs);
         $circuitBreaker->setThreshold($threshold);
         $circuitBreaker->setDefaultFallbackResponse($defaultResponse);
diff --git a/tests/Unit/Service/PsAccountsService/GetOrRefreshTokenTest.php b/tests/Unit/Service/PsAccountsService/GetOrRefreshTokenTest.php
index a63ee0cf2..d4e782041 100644
--- a/tests/Unit/Service/PsAccountsService/GetOrRefreshTokenTest.php
+++ b/tests/Unit/Service/PsAccountsService/GetOrRefreshTokenTest.php
@@ -3,7 +3,7 @@
 namespace PrestaShop\Module\PsAccounts\Tests\Unit\Service\PsAccountsService;
 
 use PrestaShop\Module\PsAccounts\Account\Session\Firebase\ShopSession;
-use PrestaShop\Module\PsAccounts\Provider\OAuth2\Oauth2Client;
+use PrestaShop\Module\PsAccounts\Api\Client\OAuth2\OAuth2Client;
 use PrestaShop\Module\PsAccounts\Service\PsAccountsService;
 use PrestaShop\Module\PsAccounts\Tests\TestCase;
 
@@ -26,7 +26,7 @@ class GetOrRefreshTokenTest extends TestCase
     /**
      * @inject
      *
-     * @var Oauth2Client
+     * @var OAuth2Client
      */
     protected $oauthClient;
 

From afcecc4be61920e8b961b6569e819492ff04a325 Mon Sep 17 00:00:00 2001
From: hschoenenberger <herve.schoenenberger@prestashop.com>
Date: Wed, 8 Jan 2025 12:53:14 +0100
Subject: [PATCH 22/46] refactor: phpstan & php-cs-fixer

---
 .../Exception/SshKeysNotFoundException.php    |   2 +-
 src/Api/Client/AccountsClient.php             |  41 ++++-
 src/Api/Client/OAuth2/AccessToken.php         |   2 +-
 src/Api/Client/OAuth2/OAuth2ApiClient.php     |  40 ++--
 src/Api/Client/OAuth2/PrestaShopSession.php   |   4 +-
 src/Api/Client/OAuth2/ShopProvider.php        | 174 ------------------
 src/Api/Client/ServicesBillingClient.php      |  11 +-
 src/Http/Client/Curl/Client.php               |  22 ++-
 src/Middleware/Oauth2Middleware.php           |   2 +-
 src/Provider/RsaKeysProvider.php              |   2 +-
 src/Service/PsBillingService.php              |   4 +
 .../RsaKeysProvider/GenerateKeysTest.php      |   2 +-
 12 files changed, 86 insertions(+), 220 deletions(-)
 rename src/{ => Account}/Exception/SshKeysNotFoundException.php (93%)
 delete mode 100644 src/Api/Client/OAuth2/ShopProvider.php

diff --git a/src/Exception/SshKeysNotFoundException.php b/src/Account/Exception/SshKeysNotFoundException.php
similarity index 93%
rename from src/Exception/SshKeysNotFoundException.php
rename to src/Account/Exception/SshKeysNotFoundException.php
index 798cdcbf0..07899dc5e 100644
--- a/src/Exception/SshKeysNotFoundException.php
+++ b/src/Account/Exception/SshKeysNotFoundException.php
@@ -18,7 +18,7 @@
  * @license   https://opensource.org/licenses/AFL-3.0 Academic Free License version 3.0
  */
 
-namespace PrestaShop\Module\PsAccounts\Exception;
+namespace PrestaShop\Module\PsAccounts\Account\Exception;
 
 class SshKeysNotFoundException extends \Exception
 {
diff --git a/src/Api/Client/AccountsClient.php b/src/Api/Client/AccountsClient.php
index dff85bde6..816dfc981 100644
--- a/src/Api/Client/AccountsClient.php
+++ b/src/Api/Client/AccountsClient.php
@@ -24,6 +24,7 @@
 use PrestaShop\Module\PsAccounts\Account\Dto\UpgradeModule;
 use PrestaShop\Module\PsAccounts\Http\Client\Curl\Client;
 use PrestaShop\Module\PsAccounts\Http\Client\Factory;
+use PrestaShop\Module\PsAccounts\Http\Client\Response;
 use PrestaShop\Module\PsAccounts\Vendor\Ramsey\Uuid\Uuid;
 
 class AccountsClient
@@ -53,6 +54,7 @@ class AccountsClient
      *
      * @param string $baseUri
      * @param int $defaultTimeout
+     * @param bool $sslCheck
      *
      * @throws \Exception
      */
@@ -111,24 +113,28 @@ public function firebaseTokens($accessToken)
     {
         $this->getClient()->setRoute('v2/shop/firebase/tokens');
 
-        return $this->getClient()->get([
+        /** @var array $res */
+        $res =  $this->getClient()->get([
             'headers' => $this->getHeaders([
                 'Authorization' => 'Bearer ' . $accessToken,
             ]),
         ]);
+
+        return $res;
     }
 
     /**
      * @param string $refreshToken
      * @param string $shopUuid
      *
-     * @return array response
+     * @return array
      */
     public function refreshShopToken($refreshToken, $shopUuid)
     {
         $this->getClient()->setRoute('v1/shop/token/refresh');
 
-        return $this->getClient()->post([
+        /** @var array $res */
+        $res = $this->getClient()->post([
             'headers' => $this->getHeaders([
                 'X-Shop-Id' => $shopUuid,
             ]),
@@ -136,6 +142,8 @@ public function refreshShopToken($refreshToken, $shopUuid)
                 'token' => $refreshToken,
             ],
         ]);
+
+        return $res;
     }
 
     /**
@@ -149,12 +157,15 @@ public function deleteUserShop($ownerUid, $shopUid, $ownerToken)
     {
         $this->getClient()->setRoute('v1/user/' . $ownerUid . '/shop/' . $shopUid);
 
-        return $this->getClient()->delete([
+        /** @var array $res */
+        $res = $this->getClient()->delete([
             'headers' => $this->getHeaders([
                 'Authorization' => 'Bearer ' . $ownerToken,
                 'X-Shop-Id' => $shopUid,
             ]),
         ]);
+
+        return $res;
     }
 
     /**
@@ -169,13 +180,16 @@ public function updateUserShop($ownerUid, $shopUid, $ownerToken, UpdateShop $sho
     {
         $this->getClient()->setRoute('v1/user/' . $ownerUid . '/shop/' . $shopUid);
 
-        return $this->getClient()->patch([
+        /** @var array $res */
+        $res =  $this->getClient()->patch([
             'headers' => $this->getHeaders([
                 'Authorization' => 'Bearer ' . $ownerToken,
                 'X-Shop-Id' => $shopUid,
             ]),
             'json' => $shop->jsonSerialize(),
         ]);
+
+        return $res;
     }
 
     /**
@@ -189,13 +203,16 @@ public function upgradeShopModule($shopUid, $shopToken, UpgradeModule $data)
     {
         $this->getClient()->setRoute('/v2/shop/module/update');
 
-        return $this->getClient()->post([
+        /** @var array $res */
+        $res =  $this->getClient()->post([
             'headers' => $this->getHeaders([
                 'Authorization' => 'Bearer ' . $shopToken,
                 'X-Shop-Id' => $shopUid,
             ]),
             'json' => $data->jsonSerialize(),
         ]);
+
+        return $res;
     }
 
     /**
@@ -203,18 +220,21 @@ public function upgradeShopModule($shopUid, $shopToken, UpgradeModule $data)
      *
      * @param string $idToken
      *
-     * @return array response
+     * @return array
      */
     public function verifyToken($idToken)
     {
         $this->getClient()->setRoute('/v1/shop/token/verify');
 
-        return $this->getClient()->post([
+        /** @var array $res */
+        $res = $this->getClient()->post([
             'headers' => $this->getHeaders(),
             'json' => [
                 'token' => $idToken,
             ],
         ]);
+
+        return $res;
     }
 
     /**
@@ -224,6 +244,9 @@ public function healthCheck()
     {
         $this->getClient()->setRoute('/healthcheck');
 
-        return $this->getClient()->get();
+        /** @var array $res */
+        $res = $this->getClient()->get();
+
+        return $res;
     }
 }
diff --git a/src/Api/Client/OAuth2/AccessToken.php b/src/Api/Client/OAuth2/AccessToken.php
index cfde3a1ab..a827cfde8 100644
--- a/src/Api/Client/OAuth2/AccessToken.php
+++ b/src/Api/Client/OAuth2/AccessToken.php
@@ -27,7 +27,7 @@ class AccessToken
     public $scope;
 
     /**
-     * @var string;
+     * @var string
      */
     public $token_type;
 
diff --git a/src/Api/Client/OAuth2/OAuth2ApiClient.php b/src/Api/Client/OAuth2/OAuth2ApiClient.php
index 20ece84bc..06d54ecd7 100644
--- a/src/Api/Client/OAuth2/OAuth2ApiClient.php
+++ b/src/Api/Client/OAuth2/OAuth2ApiClient.php
@@ -24,6 +24,7 @@
 use PrestaShop\Module\PsAccounts\Api\Client\OAuth2\OAuth2Client as OauthClient;
 use PrestaShop\Module\PsAccounts\Http\Client\Curl\Client;
 use PrestaShop\Module\PsAccounts\Http\Client\Factory;
+use PrestaShop\Module\PsAccounts\Http\Client\Response;
 use PrestaShop\Module\PsAccounts\Vendor\Ramsey\Uuid\Uuid;
 
 class OAuth2ApiClient
@@ -141,14 +142,7 @@ public function getWellKnown()
         /* @phpstan-ignore-next-line */
         if (!isset($this->wellKnown) || $this->cachedWellKnown->isExpired()) {
             try {
-                $this->wellKnown = new WellKnown(
-                    json_decode(
-                        ($this->cachedWellKnown !== null) ?
-                            $this->getCachedWellKnown() :
-                            $this->fetchWellKnown($this->getOauth2Url()),
-                        true
-                    )
-                );
+                $this->wellKnown = new WellKnown(json_decode($this->getCachedWellKnown(), true));
             } catch (\Throwable $e) {
                 /* @phpstan-ignore-next-line */
             } catch (\Exception $e) {
@@ -180,11 +174,11 @@ protected function getCachedWellKnown($forceRefresh = false)
             );
         }
 
-        return $this->cachedWellKnown->read();
+        return (string) $this->cachedWellKnown->read();
     }
 
     /**
-     * @param string|null $url
+     * @param string $url
      *
      * @return array
      */
@@ -196,6 +190,8 @@ protected function fetchWellKnown($url = null)
         }
 
         $this->getClient()->setRoute($wellKnownUrl);
+
+        /** @var Response $response */
         $response = $this->getClient()->get();
 
         return $response->body;
@@ -211,6 +207,7 @@ public function getAccessTokenByClientCredentials(array $scope = [], array $audi
     {
         $this->getClient()->setRoute($this->getWellKnown()->token_endpoint);
 
+        /** @var Response $response */
         $response = $this->getClient()->post([
             'body' => [
                 'grant_type' => 'client_credentials',
@@ -273,24 +270,22 @@ public function getAuthRedirectUri()
      * @param int $length
      *
      * @return string
-     *
-     * @throws \Random\RandomException
      */
     public function getRandomState($length = 32)
     {
-        return bin2hex(random_bytes($length / 2));
+        /* @phpstan-ignore-next-line */
+        return bin2hex(random_bytes((int) ($length / 2)));
     }
 
     /**
      * @param int $length
      *
-     * @return false|string
-     *
-     * @throws \Random\RandomException
+     * @return string
      */
     public function getRandomPkceCode($length = 64)
     {
-        return substr(strtr(base64_encode(random_bytes($length)), '+/', '-_'), 0, $length);
+        /* @phpstan-ignore-next-line */
+        return (string) substr(strtr(base64_encode(random_bytes($length)), '+/', '-_'), 0, $length);
     }
 
     /**
@@ -311,6 +306,7 @@ public function getAccessTokenByAuthorizationCode(
     ) {
         $this->getClient()->setRoute($this->getWellKnown()->token_endpoint);
 
+        /** @var Response $response */
         $response = $this->getClient()->post([
             'body' => array_merge([
                 'grant_type' => 'authorization_code',
@@ -341,6 +337,7 @@ public function refreshAccessToken($refreshToken)
     {
         $this->getClient()->setRoute($this->getWellKnown()->token_endpoint);
 
+        /** @var Response $response */
         $response = $this->getClient()->post([
             'body' => [
                 'grant_type' => 'refresh_token',
@@ -365,6 +362,7 @@ public function getUserInfos($accessToken)
     {
         $this->getClient()->setRoute($this->getWellKnown()->userinfo_endpoint);
 
+        /** @var Response $response */
         $response = $this->getClient()->get([
             'headers' => $this->getHeaders([
                 'Authorization' => 'Bearer ' . $accessToken,
@@ -406,6 +404,14 @@ public function getPostLogoutRedirectUri()
         ]);
     }
 
+    /**
+     * @return OAuth2Client
+     */
+    public function getOauth2Client()
+    {
+        return $this->oauth2Client;
+    }
+
     // TODO: remove Lcobucci (use firebase/jwt)
     // TODO: instantiate real response types (and throw exceptions)
     // TODO: check response types (HTTPClient)
diff --git a/src/Api/Client/OAuth2/PrestaShopSession.php b/src/Api/Client/OAuth2/PrestaShopSession.php
index f8aefd1fc..0a37a04a8 100644
--- a/src/Api/Client/OAuth2/PrestaShopSession.php
+++ b/src/Api/Client/OAuth2/PrestaShopSession.php
@@ -32,7 +32,7 @@ class PrestaShopSession
     private $session;
 
     /**
-     * @var Oauth2ApiClient
+     * @var OAuth2ApiClient
      */
     private $oauth2ApiClient;
 
@@ -46,7 +46,7 @@ class PrestaShopSession
      * @param OAuth2ApiClient $oauth2ApiClient
      * @param OAuth2Client $oauth2Client
      */
-    public function __construct($session, Oauth2ApiClient $oauth2ApiClient, OAuth2Client $oauth2Client)
+    public function __construct($session, OAuth2ApiClient $oauth2ApiClient, OAuth2Client $oauth2Client)
     {
         $this->session = $session;
         $this->oauth2ApiClient = $oauth2ApiClient;
diff --git a/src/Api/Client/OAuth2/ShopProvider.php b/src/Api/Client/OAuth2/ShopProvider.php
deleted file mode 100644
index f916f2f97..000000000
--- a/src/Api/Client/OAuth2/ShopProvider.php
+++ /dev/null
@@ -1,174 +0,0 @@
-<?php
-/**
- * Copyright since 2007 PrestaShop SA and Contributors
- * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License version 3.0
- * that is bundled with this package in the file LICENSE.md.
- * It is also available through the world-wide-web at this URL:
- * https://opensource.org/licenses/AFL-3.0
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@prestashop.com so we can send you a copy immediately.
- *
- * @author    PrestaShop SA and Contributors <contact@prestashop.com>
- * @copyright Since 2007 PrestaShop SA and Contributors
- * @license   https://opensource.org/licenses/AFL-3.0 Academic Free License version 3.0
- */
-
-namespace PrestaShop\Module\PsAccounts\Api\Client\OAuth2;
-
-use PrestaShop\Module\PsAccounts\Adapter\Link;
-use PrestaShop\Module\PsAccounts\Vendor\League\OAuth2\Client\Provider\AbstractProvider;
-use PrestaShop\Module\PsAccounts\Vendor\PrestaShop\OAuth2\Client\Provider\PrestaShop;
-
-/**
- * @deprecated
- */
-class ShopProvider extends PrestaShop
-{
-    const QUERY_LOGOUT_CALLBACK_PARAM = 'oauth2Callback';
-
-    /**
-     * @var \Ps_accounts
-     */
-    private $module;
-
-    /**
-     * @var OAuth2Client
-     */
-    private $oauth2Client;
-
-    /**
-     * @param array $options
-     * @param array $collaborators
-     *
-     * @throws \Exception
-     */
-    public function __construct(array $options = [], array $collaborators = [])
-    {
-        /** @var \Ps_accounts $module */
-        $module = \Module::getInstanceByName('ps_accounts');
-        $this->module = $module;
-        $this->oauth2Client = $module->getService(OAuth2Client::class);
-
-        // Disable certificate verification from local configuration
-        $options['verify'] = (bool) $this->module->getParameter(
-            'ps_accounts.check_api_ssl_cert'
-        );
-
-        if (method_exists($this, 'buildHttpClient')) {
-            $collaborators['httpClient'] = $this->buildHttpClient($options);
-        }
-
-        parent::__construct(array_merge([
-            'clientId' => $this->oauth2Client->getClientId(),
-            'clientSecret' => $this->oauth2Client->getClientSecret(),
-            'redirectUri' => $this->getRedirectUri(),
-            'postLogoutCallbackUri' => $this->getPostLogoutRedirectUri(),
-            'pkceMethod' => AbstractProvider::PKCE_METHOD_S256,
-        ], $options), $collaborators);
-    }
-
-    /**
-     * @return PrestaShop
-     */
-    public static function create()
-    {
-        return new self();
-    }
-
-    /**
-     * @return string
-     *
-     * @throws \Exception
-     */
-    public function getOauth2Url()
-    {
-        return $this->module->getParameter('ps_accounts.oauth2_url');
-    }
-
-    /**
-     * @param array $options
-     *
-     * @return array|string[]
-     */
-    protected function getAllowedClientOptions(array $options)
-    {
-        return array_merge(parent::getAllowedClientOptions($options), [
-            'verify',
-        ]);
-    }
-
-    /**
-     * @example  http://my-shop.mydomain/admin-path/index.php?controller=AdminOAuth2PsAccounts
-     *
-     * @return string
-     *
-     * @throws \Exception
-     */
-    public function getRedirectUri()
-    {
-        /** @var Link $link */
-        $link = $this->module->getService(Link::class);
-
-        return $link->getAdminLink('AdminOAuth2PsAccounts', false);
-    }
-
-    /**
-     * @example http://my-shop.mydomain/admin-path/index.php?controller=AdminLogin&logout=1&oauth2Callback=1
-     *
-     * @return string
-     *
-     * @throws \PrestaShopException
-     */
-    public function getPostLogoutRedirectUri()
-    {
-        /** @var Link $link */
-        $link = $this->module->getService(Link::class);
-
-        return $link->getAdminLink('AdminLogin', false, [], [
-            'logout' => 1,
-            self::QUERY_LOGOUT_CALLBACK_PARAM => 1,
-        ]);
-    }
-
-    /**
-     * @return OAuth2Client
-     */
-    public function getOauth2Client()
-    {
-        return $this->oauth2Client;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function getAccessToken($grant, array $options = [])
-    {
-        $this->syncOauth2ClientProps();
-
-        return parent::getAccessToken($grant, $options);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    protected function getAuthorizationParameters(array $options)
-    {
-        $this->syncOauth2ClientProps();
-
-        return parent::getAuthorizationParameters($options);
-    }
-
-    /**
-     * @return void
-     */
-    private function syncOauth2ClientProps()
-    {
-        $this->clientId = $this->getOauth2Client()->getClientId();
-        $this->clientSecret = $this->getOauth2Client()->getClientSecret();
-    }
-}
diff --git a/src/Api/Client/ServicesBillingClient.php b/src/Api/Client/ServicesBillingClient.php
index ce4e4b420..51e170e7d 100644
--- a/src/Api/Client/ServicesBillingClient.php
+++ b/src/Api/Client/ServicesBillingClient.php
@@ -22,11 +22,14 @@
 
 use PrestaShop\Module\PsAccounts\Http\Client\Curl\Client;
 use PrestaShop\Module\PsAccounts\Http\Client\Factory;
+use PrestaShop\Module\PsAccounts\Http\Client\Response;
 use PrestaShop\Module\PsAccounts\Provider\ShopProvider;
 use PrestaShop\Module\PsAccounts\Service\PsAccountsService;
 
 /**
  * Handle call api Services
+ *
+ * @deprecated since v7.0.0
  */
 class ServicesBillingClient
 {
@@ -78,7 +81,7 @@ public function __construct(
     /**
      * @param mixed $shopUuidV4
      *
-     * @return array|false
+     * @return Response|array
      */
     public function getBillingCustomer($shopUuidV4)
     {
@@ -91,7 +94,7 @@ public function getBillingCustomer($shopUuidV4)
      * @param mixed $shopUuidV4
      * @param array $bodyHttp
      *
-     * @return array|false
+     * @return Response|array
      */
     public function createBillingCustomer($shopUuidV4, $bodyHttp)
     {
@@ -106,7 +109,7 @@ public function createBillingCustomer($shopUuidV4, $bodyHttp)
      * @param mixed $shopUuidV4
      * @param string $module
      *
-     * @return array|false
+     * @return Response|array
      */
     public function getBillingSubscriptions($shopUuidV4, $module)
     {
@@ -120,7 +123,7 @@ public function getBillingSubscriptions($shopUuidV4, $module)
      * @param string $module
      * @param array $bodyHttp
      *
-     * @return array|false
+     * @return Response|array
      */
     public function createBillingSubscriptions($shopUuidV4, $module, $bodyHttp)
     {
diff --git a/src/Http/Client/Curl/Client.php b/src/Http/Client/Curl/Client.php
index cdc88290e..a37c7b53b 100644
--- a/src/Http/Client/Curl/Client.php
+++ b/src/Http/Client/Curl/Client.php
@@ -205,7 +205,7 @@ public function setRoute($route)
     }
 
     /**
-     * @param resource $ch
+     * @param mixed $ch
      * @param mixed $response
      *
      * @return Response|array
@@ -239,7 +239,7 @@ public function getResponse($ch, $response)
 
     /**
      * @param array $response
-     * @param resource $ch
+     * @param mixed $ch
      *
      * @return void
      */
@@ -254,7 +254,7 @@ private function logResponse($response, $ch)
 
     /**
      * @param array $options
-     * @param resource $ch
+     * @param mixed $ch
      *
      * @return void
      */
@@ -271,7 +271,7 @@ public function initHeaders(array $options, $ch)
     }
 
     /**
-     * @return resource
+     * @return mixed
      */
     public function initRoute()
     {
@@ -280,6 +280,10 @@ public function initRoute()
             $absRoute = preg_replace('/\/$/', '', $this->baseUri) . preg_replace('/\/+/', '/', '/' . $absRoute);
         }
 
+        if (empty($absRoute)) {
+            throw new \InvalidArgumentException('Route must be set before initRoute()');
+        }
+
         $ch = curl_init();
 
         curl_setopt($ch, CURLOPT_URL, $absRoute);
@@ -292,20 +296,20 @@ public function initRoute()
     }
 
     /**
-     * @param resource $ch
+     * @param mixed $ch
      *
      * @return void
      */
     public function initSsl($ch)
     {
         $checkSsl = $this->getVerify();
-        curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, $checkSsl);
+        curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, $checkSsl ? 2 : 0);
         curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, $checkSsl);
     }
 
     /**
      * @param array $options
-     * @param resource $ch
+     * @param mixed $ch
      *
      * @return void
      */
@@ -313,7 +317,7 @@ public function initPayload(array $options, $ch)
     {
         if (array_key_exists('json', $options)) {
             Logger::getInstance()->info('payload ' . var_export($options['json'], true));
-            curl_setopt($ch, CURLOPT_POSTFIELDS, json_encode($options['json']));
+            curl_setopt($ch, CURLOPT_POSTFIELDS, json_encode($options['json']) ?: '');
             curl_setopt($ch, CURLOPT_HTTPHEADER, ['Content-Type: application/json']);
         } elseif (array_key_exists('body', $options)) {
             Logger::getInstance()->info('payload ' . var_export($options['body'], true));
@@ -336,7 +340,7 @@ protected function getVerify()
     /**
      * @param array $options
      *
-     * @return resource
+     * @return mixed
      */
     public function initCurl(array $options)
     {
diff --git a/src/Middleware/Oauth2Middleware.php b/src/Middleware/Oauth2Middleware.php
index 893fd3164..1c921d250 100644
--- a/src/Middleware/Oauth2Middleware.php
+++ b/src/Middleware/Oauth2Middleware.php
@@ -115,7 +115,7 @@ protected function isOauth2LogoutEnabled()
     protected function onLogoutCallback()
     {
         if ($this->bypassLoginPage) {
-            \Tools::redirectLink($this->getOAuth2Client()->getRedirectUri());
+            \Tools::redirectLink($this->getOAuth2Client()->getAuthRedirectUri());
         }
     }
 }
diff --git a/src/Provider/RsaKeysProvider.php b/src/Provider/RsaKeysProvider.php
index d2ef123f8..c69569583 100644
--- a/src/Provider/RsaKeysProvider.php
+++ b/src/Provider/RsaKeysProvider.php
@@ -20,7 +20,7 @@
 
 namespace PrestaShop\Module\PsAccounts\Provider;
 
-use PrestaShop\Module\PsAccounts\Exception\SshKeysNotFoundException;
+use PrestaShop\Module\PsAccounts\Account\Exception\SshKeysNotFoundException;
 use PrestaShop\Module\PsAccounts\Repository\ConfigurationRepository;
 use PrestaShop\Module\PsAccounts\Vendor\phpseclib\Crypt\RSA;
 
diff --git a/src/Service/PsBillingService.php b/src/Service/PsBillingService.php
index 1d238088d..eb48bc2da 100644
--- a/src/Service/PsBillingService.php
+++ b/src/Service/PsBillingService.php
@@ -92,12 +92,14 @@ public function subscribeToFreePlan($module, $planName, $shopId = false, $custom
         if (strlen($uuid) > 0) {
             $billingClient = $this->servicesBillingClient;
 
+            /** @var array $response */
             $response = $billingClient->getBillingCustomer($uuid);
 
             if (!$response || !array_key_exists('httpCode', $response)) {
                 throw new BillingException('Billing customer request failed.', 50);
             }
             if ($response['httpCode'] === 404) {
+                /** @var array $response */
                 $response = $billingClient->createBillingCustomer(
                     $uuid,
                     $customerIp ? ['created_from_ip' => $customerIp] : []
@@ -108,12 +110,14 @@ public function subscribeToFreePlan($module, $planName, $shopId = false, $custom
             }
             $toReturn['customerId'] = $response['body']['customer']['id'];
 
+            /** @var array $response */
             $response = $billingClient->getBillingSubscriptions($uuid, $module);
             if (!$response || !array_key_exists('httpCode', $response) || $response['httpCode'] >= 500) {
                 throw new BillingException('Billing subscriptions request failed.', 51);
             }
 
             if ($response['httpCode'] === 404) {
+                /** @var array $response */
                 $response = $billingClient->createBillingSubscriptions($uuid, $module, ['plan_id' => $planName, 'module' => $module]);
                 if (!$response || !array_key_exists('httpCode', $response) || $response['httpCode'] >= 400) {
                     if ($response && array_key_exists('body', $response)
diff --git a/tests/Unit/Provider/RsaKeysProvider/GenerateKeysTest.php b/tests/Unit/Provider/RsaKeysProvider/GenerateKeysTest.php
index 68bee3091..aab061024 100644
--- a/tests/Unit/Provider/RsaKeysProvider/GenerateKeysTest.php
+++ b/tests/Unit/Provider/RsaKeysProvider/GenerateKeysTest.php
@@ -2,7 +2,7 @@
 
 namespace PrestaShop\Module\PsAccounts\Tests\Unit\Provider\RsaKeysProvider;
 
-use PrestaShop\Module\PsAccounts\Exception\SshKeysNotFoundException;
+use PrestaShop\Module\PsAccounts\Account\Exception\SshKeysNotFoundException;
 use PrestaShop\Module\PsAccounts\Provider\RsaKeysProvider;
 use PrestaShop\Module\PsAccounts\Tests\TestCase;
 

From ca208054503769619617d69e4df49af7a8823420 Mon Sep 17 00:00:00 2001
From: hschoenenberger <herve.schoenenberger@prestashop.com>
Date: Wed, 8 Jan 2025 17:47:41 +0100
Subject: [PATCH 23/46] fix: tests

---
 src/Api/Client/AccountsClient.php             | 112 +++++++++---------
 src/Api/Client/OAuth2/OAuth2ApiClient.php     |  88 +++++++-------
 src/Api/Client/ServicesBillingClient.php      |  30 +++--
 src/Http/Client/Curl/Client.php               |  52 +++++---
 src/Http/Client/Response.php                  |  16 +++
 .../UpgradeModuleHandlerTest.php              |   2 +
 .../Api/v1/ShopLinkAccount/DeleteTest.php     |   2 +-
 tests/Feature/FeatureTestCase.php             |  51 ++++----
 ...uzzleTestClient.php => HttpTestClient.php} |  29 +++--
 .../OwnerSession/GetValidTokenTest.php        |   8 +-
 .../OwnerSession/RefreshTokenTest.php         |   6 +-
 .../ShopSession/GetValidTokenTest.php         |   6 +-
 .../Firebase/ShopSession/RefreshTokenTest.php |   6 +-
 tests/Unit/Account/Session/SessionHelpers.php |   2 +-
 .../Session/ShopSession/RefreshTokenTest.php  |  13 +-
 .../CircuitBreaker/CircuitBreakerTest.php     |  26 +---
 16 files changed, 243 insertions(+), 206 deletions(-)
 rename tests/{GuzzleTestClient.php => HttpTestClient.php} (74%)

diff --git a/src/Api/Client/AccountsClient.php b/src/Api/Client/AccountsClient.php
index 816dfc981..46e93239b 100644
--- a/src/Api/Client/AccountsClient.php
+++ b/src/Api/Client/AccountsClient.php
@@ -24,7 +24,6 @@
 use PrestaShop\Module\PsAccounts\Account\Dto\UpgradeModule;
 use PrestaShop\Module\PsAccounts\Http\Client\Curl\Client;
 use PrestaShop\Module\PsAccounts\Http\Client\Factory;
-use PrestaShop\Module\PsAccounts\Http\Client\Response;
 use PrestaShop\Module\PsAccounts\Vendor\Ramsey\Uuid\Uuid;
 
 class AccountsClient
@@ -111,14 +110,14 @@ private function getHeaders($additionalHeaders = [])
      */
     public function firebaseTokens($accessToken)
     {
-        $this->getClient()->setRoute('v2/shop/firebase/tokens');
-
         /** @var array $res */
-        $res =  $this->getClient()->get([
-            'headers' => $this->getHeaders([
-                'Authorization' => 'Bearer ' . $accessToken,
-            ]),
-        ]);
+        $res = $this->getClient()->get(
+            'v2/shop/firebase/tokens',
+            [
+                'headers' => $this->getHeaders([
+                    'Authorization' => 'Bearer ' . $accessToken,
+                ]),
+            ]);
 
         return $res;
     }
@@ -131,17 +130,18 @@ public function firebaseTokens($accessToken)
      */
     public function refreshShopToken($refreshToken, $shopUuid)
     {
-        $this->getClient()->setRoute('v1/shop/token/refresh');
-
         /** @var array $res */
-        $res = $this->getClient()->post([
-            'headers' => $this->getHeaders([
-                'X-Shop-Id' => $shopUuid,
-            ]),
-            'json' => [
-                'token' => $refreshToken,
-            ],
-        ]);
+        $res = $this->getClient()->post(
+            'v1/shop/token/refresh',
+            [
+                'headers' => $this->getHeaders([
+                    'X-Shop-Id' => $shopUuid,
+                ]),
+                'json' => [
+                    'token' => $refreshToken,
+                ],
+            ]
+        );
 
         return $res;
     }
@@ -155,15 +155,16 @@ public function refreshShopToken($refreshToken, $shopUuid)
      */
     public function deleteUserShop($ownerUid, $shopUid, $ownerToken)
     {
-        $this->getClient()->setRoute('v1/user/' . $ownerUid . '/shop/' . $shopUid);
-
         /** @var array $res */
-        $res = $this->getClient()->delete([
-            'headers' => $this->getHeaders([
-                'Authorization' => 'Bearer ' . $ownerToken,
-                'X-Shop-Id' => $shopUid,
-            ]),
-        ]);
+        $res = $this->getClient()->delete(
+            'v1/user/' . $ownerUid . '/shop/' . $shopUid,
+            [
+                'headers' => $this->getHeaders([
+                    'Authorization' => 'Bearer ' . $ownerToken,
+                    'X-Shop-Id' => $shopUid,
+                ]),
+            ]
+        );
 
         return $res;
     }
@@ -178,16 +179,17 @@ public function deleteUserShop($ownerUid, $shopUid, $ownerToken)
      */
     public function updateUserShop($ownerUid, $shopUid, $ownerToken, UpdateShop $shop)
     {
-        $this->getClient()->setRoute('v1/user/' . $ownerUid . '/shop/' . $shopUid);
-
         /** @var array $res */
-        $res =  $this->getClient()->patch([
-            'headers' => $this->getHeaders([
-                'Authorization' => 'Bearer ' . $ownerToken,
-                'X-Shop-Id' => $shopUid,
-            ]),
-            'json' => $shop->jsonSerialize(),
-        ]);
+        $res = $this->getClient()->patch(
+            'v1/user/' . $ownerUid . '/shop/' . $shopUid,
+            [
+                'headers' => $this->getHeaders([
+                    'Authorization' => 'Bearer ' . $ownerToken,
+                    'X-Shop-Id' => $shopUid,
+                ]),
+                'json' => $shop->jsonSerialize(),
+            ]
+        );
 
         return $res;
     }
@@ -201,16 +203,17 @@ public function updateUserShop($ownerUid, $shopUid, $ownerToken, UpdateShop $sho
      */
     public function upgradeShopModule($shopUid, $shopToken, UpgradeModule $data)
     {
-        $this->getClient()->setRoute('/v2/shop/module/update');
-
         /** @var array $res */
-        $res =  $this->getClient()->post([
-            'headers' => $this->getHeaders([
-                'Authorization' => 'Bearer ' . $shopToken,
-                'X-Shop-Id' => $shopUid,
-            ]),
-            'json' => $data->jsonSerialize(),
-        ]);
+        $res = $this->getClient()->post(
+            '/v2/shop/module/update',
+            [
+                'headers' => $this->getHeaders([
+                    'Authorization' => 'Bearer ' . $shopToken,
+                    'X-Shop-Id' => $shopUid,
+                ]),
+                'json' => $data->jsonSerialize(),
+            ]
+        );
 
         return $res;
     }
@@ -224,15 +227,16 @@ public function upgradeShopModule($shopUid, $shopToken, UpgradeModule $data)
      */
     public function verifyToken($idToken)
     {
-        $this->getClient()->setRoute('/v1/shop/token/verify');
-
         /** @var array $res */
-        $res = $this->getClient()->post([
-            'headers' => $this->getHeaders(),
-            'json' => [
-                'token' => $idToken,
-            ],
-        ]);
+        $res = $this->getClient()->post(
+            '/v1/shop/token/verify',
+            [
+                'headers' => $this->getHeaders(),
+                'json' => [
+                    'token' => $idToken,
+                ],
+            ]
+        );
 
         return $res;
     }
@@ -242,10 +246,8 @@ public function verifyToken($idToken)
      */
     public function healthCheck()
     {
-        $this->getClient()->setRoute('/healthcheck');
-
         /** @var array $res */
-        $res = $this->getClient()->get();
+        $res = $this->getClient()->get('/healthcheck');
 
         return $res;
     }
diff --git a/src/Api/Client/OAuth2/OAuth2ApiClient.php b/src/Api/Client/OAuth2/OAuth2ApiClient.php
index 06d54ecd7..b974b3a23 100644
--- a/src/Api/Client/OAuth2/OAuth2ApiClient.php
+++ b/src/Api/Client/OAuth2/OAuth2ApiClient.php
@@ -205,18 +205,19 @@ protected function fetchWellKnown($url = null)
      */
     public function getAccessTokenByClientCredentials(array $scope = [], array $audience = [])
     {
-        $this->getClient()->setRoute($this->getWellKnown()->token_endpoint);
-
         /** @var Response $response */
-        $response = $this->getClient()->post([
-            'body' => [
-                'grant_type' => 'client_credentials',
-                'client_id' => $this->oauth2Client->getClientId(),
-                'client_secret' => $this->oauth2Client->getClientSecret(),
-                'scope' => implode(' ', $scope),
-                'audience' => implode(' ', $audience),
-            ],
-        ]);
+        $response = $this->getClient()->post(
+            $this->getWellKnown()->token_endpoint,
+            [
+                'query' => [
+                    'grant_type' => 'client_credentials',
+                    'client_id' => $this->oauth2Client->getClientId(),
+                    'client_secret' => $this->oauth2Client->getClientSecret(),
+                    'scope' => implode(' ', $scope),
+                    'audience' => implode(' ', $audience),
+                ],
+            ]
+        );
 
         if (!$response->status) {
             throw new OAuth2Exception('Unable to get access token');
@@ -304,22 +305,23 @@ public function getAccessTokenByAuthorizationCode(
         array $scope = [],
         array $audience = []
     ) {
-        $this->getClient()->setRoute($this->getWellKnown()->token_endpoint);
-
         /** @var Response $response */
-        $response = $this->getClient()->post([
-            'body' => array_merge([
-                'grant_type' => 'authorization_code',
-                'client_id' => $this->oauth2Client->getClientId(),
-                'client_secret' => $this->oauth2Client->getClientSecret(),
-                'code' => $code,
-                'scope' => implode(' ', $scope),
-                'audience' => implode(' ', $audience),
-            ], $pkceCode ? [
-                'code_verifier' => $pkceCode,
-                'redirect_uri' => $redirectUri,
-            ] : []),
-        ]);
+        $response = $this->getClient()->post(
+            $this->getWellKnown()->token_endpoint,
+            [
+                'query' => array_merge([
+                    'grant_type' => 'authorization_code',
+                    'client_id' => $this->oauth2Client->getClientId(),
+                    'client_secret' => $this->oauth2Client->getClientSecret(),
+                    'code' => $code,
+                    'scope' => implode(' ', $scope),
+                    'audience' => implode(' ', $audience),
+                ], $pkceCode ? [
+                    'code_verifier' => $pkceCode,
+                    'redirect_uri' => $redirectUri,
+                ] : []),
+            ]
+        );
 
         if (!$response->status) {
             throw new OAuth2Exception('Unable to get access token');
@@ -335,16 +337,17 @@ public function getAccessTokenByAuthorizationCode(
      */
     public function refreshAccessToken($refreshToken)
     {
-        $this->getClient()->setRoute($this->getWellKnown()->token_endpoint);
-
         /** @var Response $response */
-        $response = $this->getClient()->post([
-            'body' => [
-                'grant_type' => 'refresh_token',
-                'client_id' => $this->oauth2Client->getClientId(),
-                'refresh_token' => $refreshToken,
-            ],
-        ]);
+        $response = $this->getClient()->post(
+            $this->getWellKnown()->token_endpoint,
+            [
+                'query' => [
+                    'grant_type' => 'refresh_token',
+                    'client_id' => $this->oauth2Client->getClientId(),
+                    'refresh_token' => $refreshToken,
+                ],
+            ]
+        );
 
         if (!$response->status) {
             throw new OAuth2Exception('Unable to refresh access token');
@@ -360,14 +363,15 @@ public function refreshAccessToken($refreshToken)
      */
     public function getUserInfos($accessToken)
     {
-        $this->getClient()->setRoute($this->getWellKnown()->userinfo_endpoint);
-
         /** @var Response $response */
-        $response = $this->getClient()->get([
-            'headers' => $this->getHeaders([
-                'Authorization' => 'Bearer ' . $accessToken,
-            ]),
-        ]);
+        $response = $this->getClient()->get(
+            $this->getWellKnown()->userinfo_endpoint,
+            [
+                'headers' => $this->getHeaders([
+                    'Authorization' => 'Bearer ' . $accessToken,
+                ]),
+            ]
+        );
 
         if (!$response->status) {
             throw new OAuth2Exception('Unable to get user infos');
diff --git a/src/Api/Client/ServicesBillingClient.php b/src/Api/Client/ServicesBillingClient.php
index 51e170e7d..991717866 100644
--- a/src/Api/Client/ServicesBillingClient.php
+++ b/src/Api/Client/ServicesBillingClient.php
@@ -85,9 +85,7 @@ public function __construct(
      */
     public function getBillingCustomer($shopUuidV4)
     {
-        $this->client->setRoute('/shops/' . $shopUuidV4);
-
-        return $this->client->get();
+        return $this->client->get('/shops/' . $shopUuidV4);
     }
 
     /**
@@ -98,11 +96,12 @@ public function getBillingCustomer($shopUuidV4)
      */
     public function createBillingCustomer($shopUuidV4, $bodyHttp)
     {
-        $this->client->setRoute('/shops/' . $shopUuidV4);
-
-        return $this->client->post([
-            'body' => $bodyHttp,
-        ]);
+        return $this->client->post(
+            '/shops/' . $shopUuidV4,
+            [
+                'query' => $bodyHttp,
+            ]
+        );
     }
 
     /**
@@ -113,9 +112,7 @@ public function createBillingCustomer($shopUuidV4, $bodyHttp)
      */
     public function getBillingSubscriptions($shopUuidV4, $module)
     {
-        $this->client->setRoute('/shops/' . $shopUuidV4 . '/subscriptions/' . $module);
-
-        return $this->client->get();
+        return $this->client->get('/shops/' . $shopUuidV4 . '/subscriptions/' . $module);
     }
 
     /**
@@ -127,10 +124,11 @@ public function getBillingSubscriptions($shopUuidV4, $module)
      */
     public function createBillingSubscriptions($shopUuidV4, $module, $bodyHttp)
     {
-        $this->client->setRoute('/shops/' . $shopUuidV4 . '/subscriptions/' . $module);
-
-        return $this->client->post([
-            'body' => $bodyHttp,
-        ]);
+        return $this->client->post(
+            '/shops/' . $shopUuidV4 . '/subscriptions/' . $module,
+            [
+                'query' => $bodyHttp,
+            ]
+        );
     }
 }
diff --git a/src/Http/Client/Curl/Client.php b/src/Http/Client/Curl/Client.php
index a37c7b53b..05cbd1060 100644
--- a/src/Http/Client/Curl/Client.php
+++ b/src/Http/Client/Curl/Client.php
@@ -65,6 +65,11 @@ class Client
      */
     protected $sslCheck = true;
 
+    /**
+     * @var bool
+     */
+    protected $allowRedirects;
+
     /**
      * @param array $options
      *
@@ -86,7 +91,7 @@ public function __construct($options)
 //        \Tools::refreshCACertFile();
 
         // FIXME headers
-        foreach (['baseUri', 'timeout', 'objectResponse', 'sslCheck'] as $option) {
+        foreach (['baseUri', 'timeout', 'objectResponse', 'sslCheck', 'allowRedirects'] as $option) {
             if (isset($options[$option])) {
                 $this->$option = $options[$option];
             }
@@ -94,16 +99,19 @@ public function __construct($options)
     }
 
     /**
+     * @param string $route
      * @param array $options payload
      *
      * @return Response|array return response or false if no response
      */
-    public function post(array $options = [])
+    public function post($route, array $options = [])
     {
-        return $this->circuitBreaker->call(function () use ($options) {
+        return $this->circuitBreaker->call(function () use ($route, $options) {
+            $this->setRoute($route);
+
             $ch = $this->initCurl($options);
 
-            curl_setopt($ch, CURLOPT_POST, true);
+            curl_setopt($ch, CURLOPT_CUSTOMREQUEST, 'POST');
 
             $this->initPayload($options, $ch);
 
@@ -116,13 +124,16 @@ public function post(array $options = [])
     }
 
     /**
+     * @param string $route
      * @param array $options payload
      *
      * @return Response|array return response or false if no response
      */
-    public function patch(array $options = [])
+    public function patch($route, array $options = [])
     {
-        return $this->circuitBreaker->call(function () use ($options) {
+        return $this->circuitBreaker->call(function () use ($route, $options) {
+            $this->setRoute($route);
+
             $ch = $this->initCurl($options);
 
             curl_setopt($ch, CURLOPT_CUSTOMREQUEST, 'PATCH');
@@ -138,13 +149,16 @@ public function patch(array $options = [])
     }
 
     /**
+     * @param string $route
      * @param array $options payload
      *
      * @return Response|array return response or false if no response
      */
-    public function get(array $options = [])
+    public function get($route, array $options = [])
     {
-        return $this->circuitBreaker->call(function () use ($options) {
+        return $this->circuitBreaker->call(function () use ($route, $options) {
+            $this->setRoute($route);
+
             $ch = $this->initCurl($options);
 
             $response = $this->getResponse($ch, curl_exec($ch));
@@ -156,13 +170,16 @@ public function get(array $options = [])
     }
 
     /**
+     * @param string $route
      * @param array $options payload
      *
      * @return Response|array return response array
      */
-    public function delete(array $options = [])
+    public function delete($route, array $options = [])
     {
-        return $this->circuitBreaker->call(function () use ($options) {
+        return $this->circuitBreaker->call(function () use ($route, $options) {
+            $this->setRoute($route);
+
             $ch = $this->initCurl($options);
 
             curl_setopt($ch, CURLOPT_CUSTOMREQUEST, 'DELETE');
@@ -220,7 +237,7 @@ public function getResponse($ch, $response)
                 throw new CircuitBreaker\CircuitBreakerException('Curl error: ' . curl_error($ch));
         }
 
-        $statusCode = curl_getinfo($ch, CURLINFO_HTTP_CODE);
+        $statusCode = curl_getinfo($ch, CURLINFO_RESPONSE_CODE);
         $res = [
             'status' => $this->responseIsSuccessful([], $statusCode),
             'httpCode' => $statusCode,
@@ -287,9 +304,13 @@ public function initRoute()
         $ch = curl_init();
 
         curl_setopt($ch, CURLOPT_URL, $absRoute);
-        curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, $this->timeout);
         curl_setopt($ch, CURLOPT_TIMEOUT, $this->timeout);
         curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
+
+        curl_setopt($ch, CURLOPT_FOLLOWLOCATION, $this->allowRedirects);
+        curl_setopt($ch, CURLOPT_POSTREDIR, $this->allowRedirects ? 3 : 0);
+
+        curl_setopt($ch, CURLOPT_USERAGENT, 'Ps_accounts/' . \Ps_accounts::VERSION);
         //curl_setopt($ch, CURLOPT_VERBOSE, true);
 
         return $ch;
@@ -319,9 +340,10 @@ public function initPayload(array $options, $ch)
             Logger::getInstance()->info('payload ' . var_export($options['json'], true));
             curl_setopt($ch, CURLOPT_POSTFIELDS, json_encode($options['json']) ?: '');
             curl_setopt($ch, CURLOPT_HTTPHEADER, ['Content-Type: application/json']);
-        } elseif (array_key_exists('body', $options)) {
-            Logger::getInstance()->info('payload ' . var_export($options['body'], true));
-            curl_setopt($ch, CURLOPT_POSTFIELDS, http_build_query($options['body']));
+
+        } elseif (array_key_exists('query', $options)) {
+            Logger::getInstance()->info('payload ' . var_export($options['query'], true));
+            curl_setopt($ch, CURLOPT_POSTFIELDS, http_build_query($options['query']));
         }
     }
 
diff --git a/src/Http/Client/Response.php b/src/Http/Client/Response.php
index 2dd742cb7..dc767073b 100644
--- a/src/Http/Client/Response.php
+++ b/src/Http/Client/Response.php
@@ -30,4 +30,20 @@ public function __construct(array $data = [])
             }
         }
     }
+
+    /**
+     * @return int
+     */
+    public function getStatusCode()
+    {
+        return $this->httpCode;
+    }
+
+    /**
+     * @return array
+     */
+    public function getBody()
+    {
+        return $this->body;
+    }
 }
diff --git a/tests/Feature/Account/CommandHandler/UpgradeModuleHandlerTest.php b/tests/Feature/Account/CommandHandler/UpgradeModuleHandlerTest.php
index da7e8e164..66a6ab03f 100644
--- a/tests/Feature/Account/CommandHandler/UpgradeModuleHandlerTest.php
+++ b/tests/Feature/Account/CommandHandler/UpgradeModuleHandlerTest.php
@@ -25,6 +25,8 @@ public function setUp(): void
     {
         parent::setUp();
 
+        $this->markTestSkipped('Implement cookie management with cURL');
+
         if (version_compare(_PS_VERSION_, '1.7.0.0', '<') ||
             version_compare(_PS_VERSION_, '9', '>=')) {
             $this->markTestSkipped('Login test compatible with 1.7 & 8 only');
diff --git a/tests/Feature/Api/v1/ShopLinkAccount/DeleteTest.php b/tests/Feature/Api/v1/ShopLinkAccount/DeleteTest.php
index 781ff99ff..513da060f 100644
--- a/tests/Feature/Api/v1/ShopLinkAccount/DeleteTest.php
+++ b/tests/Feature/Api/v1/ShopLinkAccount/DeleteTest.php
@@ -66,7 +66,7 @@ public function itShouldSucceed()
         $this->assertResponseDeleted($response);
 
         // FIXME: empty response
-        // $this->assertArraySubset(['success' => true], $json);
+        //$this->assertArraySubset(['success' => true], $json);
 
         \Configuration::clearConfigurationCacheForTesting();
         \Configuration::loadConfiguration();
diff --git a/tests/Feature/FeatureTestCase.php b/tests/Feature/FeatureTestCase.php
index bba0d06d9..b38f8b4fa 100644
--- a/tests/Feature/FeatureTestCase.php
+++ b/tests/Feature/FeatureTestCase.php
@@ -3,16 +3,15 @@
 namespace PrestaShop\Module\PsAccounts\Tests\Feature;
 
 use Db;
+use PrestaShop\Module\PsAccounts\Http\Client\Response;
 use PrestaShop\Module\PsAccounts\Provider\RsaKeysProvider;
 use PrestaShop\Module\PsAccounts\Repository\UserTokenRepository;
-use PrestaShop\Module\PsAccounts\Tests\GuzzleTestClient;
+use PrestaShop\Module\PsAccounts\Tests\HttpTestClient;
 use PrestaShop\Module\PsAccounts\Tests\TestCase;
-use PrestaShop\Module\PsAccounts\Vendor\GuzzleHttp\Client;
 use PrestaShop\Module\PsAccounts\Vendor\Lcobucci\JWT\Builder;
 use PrestaShop\Module\PsAccounts\Vendor\Lcobucci\JWT\Signer\Hmac\Sha256;
 use PrestaShop\Module\PsAccounts\Vendor\Lcobucci\JWT\Signer\Key;
 use PrestaShop\Module\PsAccounts\Vendor\Lcobucci\JWT\Token;
-use Psr\Http\Message\ResponseInterface;
 
 class FeatureTestCase extends TestCase
 {
@@ -49,17 +48,26 @@ public function setUp(): void
         $domain = $this->configuration->get('PS_SHOP_DOMAIN');
         $baseUrl = $scheme . $domain . '/';
 
-        $this->client = new GuzzleTestClient([
-            'base_uri' => $baseUrl,
+        $this->client = new HttpTestClient([
+            'baseUri' => $baseUrl,
             'headers' => [
                 'Accept' => 'application/json',
             ],
-            'verify' => $this->module->getParameter('ps_accounts.check_api_ssl_cert'),
+            'sslCheck' => $this->module->getParameter('ps_accounts.check_api_ssl_cert'),
             'timeout' => 60,
-            'http_errors' => false,
-            //
-            'allow_redirects' => true,
-            'query' => [],
+            'objectResponse' => true,
+            'allowRedirects' => true,
+
+//            'base_uri' => $baseUrl,
+//            'headers' => [
+//                'Accept' => 'application/json',
+//            ],
+//            'verify' => $this->module->getParameter('ps_accounts.check_api_ssl_cert'),
+//            'timeout' => 60,
+//            'http_errors' => false,
+//            //
+//            'allow_redirects' => true,
+//            'query' => [],
         ], true);
 
         // FIXME: Link::getModuleLink
@@ -97,7 +105,7 @@ public function encodePayload(array $payload)
     }
 
     /**
-     * @param ResponseInterface $response
+     * @param Response $response
      *
      * @return void
      */
@@ -107,7 +115,7 @@ public function assertResponseOk($response)
     }
 
     /**
-     * @param ResponseInterface $response
+     * @param Response $response
      *
      * @return void
      */
@@ -117,7 +125,7 @@ public function assertResponseCreated($response)
     }
 
     /**
-     * @param ResponseInterface $response
+     * @param Response $response
      *
      * @return void
      */
@@ -127,7 +135,7 @@ public function assertResponseDeleted($response)
     }
 
     /**
-     * @param ResponseInterface $response
+     * @param Response $response
      *
      * @return void
      */
@@ -137,7 +145,7 @@ public function assertResponseUnauthorized($response)
     }
 
     /**
-     * @param ResponseInterface $response
+     * @param Response $response
      *
      * @return void
      */
@@ -147,7 +155,7 @@ public function assertResponseNotFound($response)
     }
 
     /**
-     * @param ResponseInterface $response
+     * @param Response $response
      *
      * @return void
      */
@@ -157,7 +165,7 @@ public function assertResponseBadRequest($response)
     }
 
     /**
-     * @param ResponseInterface $response
+     * @param Response $response
      *
      * @return void
      */
@@ -173,10 +181,13 @@ public function assertResponseError($response)
      */
     public function getResponseJson($response)
     {
-        $ary = json_decode($response->getBody()->getContents(), true);
-        $response->getBody()->rewind();
+// FIXME
+//        $ary = json_decode($response->getBody()->getContents(), true);
+//        $response->getBody()->rewind();
+//
+//        return $ary;
 
-        return $ary;
+        return $response->getBody();
     }
 
     /**
diff --git a/tests/GuzzleTestClient.php b/tests/HttpTestClient.php
similarity index 74%
rename from tests/GuzzleTestClient.php
rename to tests/HttpTestClient.php
index f8b44ca36..acbcbad7c 100644
--- a/tests/GuzzleTestClient.php
+++ b/tests/HttpTestClient.php
@@ -2,12 +2,11 @@
 
 namespace PrestaShop\Module\PsAccounts\Tests;
 
+use PrestaShop\Module\PsAccounts\Http\Client\Curl\Client;
+use PrestaShop\Module\PsAccounts\Http\Client\Response;
 use PrestaShop\Module\PsAccounts\Log\Logger;
-use PrestaShop\Module\PsAccounts\Vendor\GuzzleHttp\Client;
-use Psr\Http\Message\ResponseInterface;
-use Psr\Http\Message\UriInterface;
 
-class GuzzleTestClient extends Client
+class HttpTestClient extends Client
 {
     /**
      * @var bool
@@ -28,10 +27,10 @@ public function __construct(array $config = [], $fixModuleRoutes = false)
     }
 
     /**
-     * @param string|UriInterface $uri
+     * @param string $uri
      * @param array $options
      *
-     * @return ResponseInterface
+     * @return Response
      */
     public function get($uri, array $options = [])
     {
@@ -41,10 +40,10 @@ public function get($uri, array $options = [])
     }
 
     /**
-     * @param string|UriInterface $uri
+     * @param string $uri
      * @param array $options
      *
-     * @return ResponseInterface
+     * @return Response
      */
     public function post($uri, array $options = [])
     {
@@ -55,10 +54,10 @@ public function post($uri, array $options = [])
 
 
     /**
-     * @param string|UriInterface $uri
+     * @param string $uri
      * @param array $options
      *
-     * @return ResponseInterface
+     * @return Response
      */
     public function patch($uri, array $options = [])
     {
@@ -68,10 +67,10 @@ public function patch($uri, array $options = [])
     }
 
     /**
-     * @param string|UriInterface $uri
+     * @param string $uri
      * @param array $options
      *
-     * @return ResponseInterface
+     * @return Response
      */
     public function delete($uri, array $options = [])
     {
@@ -91,13 +90,13 @@ public function parameterizeModuleRoute(&$route, array &$options)
         if ($this->fixModuleRoutes && preg_match(
                 '/^.*\/(module)\/(ps_accounts)\/([a-zA-Z0-9]+)$/', $route, $matches
             )) {
-            $route = '/index.php';
-            $options['query'] = isset($options['query']) ? $options['query'] : [];
-            $options['query'] = array_merge($options['query'], [
+            $query = isset($options['query']) ? $options['query'] : [];
+            $query = array_merge($query, [
                 'fc' => $matches[1],
                 'module' => $matches[2],
                 'controller' => $matches[3],
             ]);
+            $route = '/index.php?' . http_build_query($query);
         }
     }
 }
diff --git a/tests/Unit/Account/Session/Firebase/OwnerSession/GetValidTokenTest.php b/tests/Unit/Account/Session/Firebase/OwnerSession/GetValidTokenTest.php
index 5b6b8a9a5..ee65ecc71 100644
--- a/tests/Unit/Account/Session/Firebase/OwnerSession/GetValidTokenTest.php
+++ b/tests/Unit/Account/Session/Firebase/OwnerSession/GetValidTokenTest.php
@@ -3,12 +3,10 @@
 namespace PrestaShop\Module\PsAccounts\Tests\Unit\Account\Session\Firebase\OwnerSession;
 
 use PrestaShop\Module\PsAccounts\Account\Session\Firebase;
-use PrestaShop\Module\PsAccounts\Account\Session\ShopSession;
 use PrestaShop\Module\PsAccounts\Account\Token\NullToken;
 use PrestaShop\Module\PsAccounts\Account\Token\Token;
-use PrestaShop\Module\PsAccounts\Api\Client\AccountsClient;
 use PrestaShop\Module\PsAccounts\Account\Exception\RefreshTokenException;
-use PrestaShop\Module\PsAccounts\Api\Client\OAuth2\ShopProvider;
+use PrestaShop\Module\PsAccounts\Api\Client\OAuth2\OAuth2ApiClient;
 use PrestaShop\Module\PsAccounts\Tests\TestCase;
 
 class GetValidTokenTest extends TestCase
@@ -25,9 +23,9 @@ class GetValidTokenTest extends TestCase
     /**
      * @inject
      *
-     * @var ShopProvider
+     * @var OAuth2ApiClient
      */
-    protected $shopProvider;
+    protected $oauth2ApiClient;
 
     /**
      * @test
diff --git a/tests/Unit/Account/Session/Firebase/OwnerSession/RefreshTokenTest.php b/tests/Unit/Account/Session/Firebase/OwnerSession/RefreshTokenTest.php
index e2079a1b1..c8ecda8e3 100644
--- a/tests/Unit/Account/Session/Firebase/OwnerSession/RefreshTokenTest.php
+++ b/tests/Unit/Account/Session/Firebase/OwnerSession/RefreshTokenTest.php
@@ -24,7 +24,7 @@
 use PrestaShop\Module\PsAccounts\Account\Session\ShopSession;
 use PrestaShop\Module\PsAccounts\Account\Token\Token;
 use PrestaShop\Module\PsAccounts\Account\Exception\RefreshTokenException;
-use PrestaShop\Module\PsAccounts\Api\Client\OAuth2\ShopProvider;
+use PrestaShop\Module\PsAccounts\Api\Client\OAuth2\OAuth2ApiClient;
 use PrestaShop\Module\PsAccounts\Tests\TestCase;
 
 class RefreshTokenTest extends TestCase
@@ -41,9 +41,9 @@ class RefreshTokenTest extends TestCase
     /**
      * @inject
      *
-     * @var ShopProvider
+     * @var OAuth2ApiClient
      */
-    protected $shopProvider;
+    protected $oauth2ApiClient;
 
     /**
      * @test
diff --git a/tests/Unit/Account/Session/Firebase/ShopSession/GetValidTokenTest.php b/tests/Unit/Account/Session/Firebase/ShopSession/GetValidTokenTest.php
index 85a1be3ab..ef345323a 100644
--- a/tests/Unit/Account/Session/Firebase/ShopSession/GetValidTokenTest.php
+++ b/tests/Unit/Account/Session/Firebase/ShopSession/GetValidTokenTest.php
@@ -6,7 +6,7 @@
 use PrestaShop\Module\PsAccounts\Account\Token\NullToken;
 use PrestaShop\Module\PsAccounts\Account\Token\Token;
 use PrestaShop\Module\PsAccounts\Account\Exception\RefreshTokenException;
-use PrestaShop\Module\PsAccounts\Api\Client\OAuth2\ShopProvider;
+use PrestaShop\Module\PsAccounts\Api\Client\OAuth2\OAuth2ApiClient;
 use PrestaShop\Module\PsAccounts\Tests\TestCase;
 
 class GetValidTokenTest extends TestCase
@@ -23,9 +23,9 @@ class GetValidTokenTest extends TestCase
     /**
      * @inject
      *
-     * @var ShopProvider
+     * @var OAuth2ApiClient
      */
-    protected $shopProvider;
+    protected $oauth2ApiClient;
 
     /**
      * @test
diff --git a/tests/Unit/Account/Session/Firebase/ShopSession/RefreshTokenTest.php b/tests/Unit/Account/Session/Firebase/ShopSession/RefreshTokenTest.php
index 9965f26d3..216e94a8f 100644
--- a/tests/Unit/Account/Session/Firebase/ShopSession/RefreshTokenTest.php
+++ b/tests/Unit/Account/Session/Firebase/ShopSession/RefreshTokenTest.php
@@ -24,7 +24,7 @@
 use PrestaShop\Module\PsAccounts\Account\Session\ShopSession;
 use PrestaShop\Module\PsAccounts\Account\Token\Token;
 use PrestaShop\Module\PsAccounts\Account\Exception\RefreshTokenException;
-use PrestaShop\Module\PsAccounts\Api\Client\OAuth2\ShopProvider;
+use PrestaShop\Module\PsAccounts\Api\Client\OAuth2\OAuth2ApiClient;
 use PrestaShop\Module\PsAccounts\Tests\TestCase;
 
 class RefreshTokenTest extends TestCase
@@ -41,9 +41,9 @@ class RefreshTokenTest extends TestCase
     /**
      * @inject
      *
-     * @var ShopProvider
+     * @var OAuth2ApiClient
      */
-    protected $shopProvider;
+    protected $oauth2ApiClient;
 
     /**
      * @test
diff --git a/tests/Unit/Account/Session/SessionHelpers.php b/tests/Unit/Account/Session/SessionHelpers.php
index 321ccb586..3e0d6f47b 100644
--- a/tests/Unit/Account/Session/SessionHelpers.php
+++ b/tests/Unit/Account/Session/SessionHelpers.php
@@ -19,7 +19,7 @@ protected function getMockedShopSession(Token $token)
         $shopSession = $this->getMockBuilder(ShopSession::class)
             ->setConstructorArgs([
                 $this->configurationRepository,
-                $this->shopProvider,
+                $this->oauth2ApiClient,
                 $this->linkShop,
                 $this->commandBus
             ])
diff --git a/tests/Unit/Account/Session/ShopSession/RefreshTokenTest.php b/tests/Unit/Account/Session/ShopSession/RefreshTokenTest.php
index cd5ac5a2d..0c9b55b46 100644
--- a/tests/Unit/Account/Session/ShopSession/RefreshTokenTest.php
+++ b/tests/Unit/Account/Session/ShopSession/RefreshTokenTest.php
@@ -2,15 +2,14 @@
 
 namespace PrestaShop\Module\PsAccounts\Tests\Unit\Account\Session\ShopSession;
 
-use PrestaShop\Module\PsAccounts\Account\LinkShop;
 use PrestaShop\Module\PsAccounts\Account\Session\ShopSession;
 use PrestaShop\Module\PsAccounts\Account\Token\Token;
+use PrestaShop\Module\PsAccounts\Api\Client\OAuth2\AccessToken;
+use PrestaShop\Module\PsAccounts\Api\Client\OAuth2\OAuth2ApiClient;
 use PrestaShop\Module\PsAccounts\Cqrs\CommandBus;
 use PrestaShop\Module\PsAccounts\Account\Exception\RefreshTokenException;
 use PrestaShop\Module\PsAccounts\Api\Client\OAuth2\OAuth2Client;
-use PrestaShop\Module\PsAccounts\Api\Client\OAuth2\ShopProvider;
 use PrestaShop\Module\PsAccounts\Tests\TestCase;
-use PrestaShop\Module\PsAccounts\Vendor\League\OAuth2\Client\Token\AccessToken;
 
 class RefreshTokenTest extends TestCase
 {
@@ -33,9 +32,9 @@ class RefreshTokenTest extends TestCase
     /**
      * @inject
      *
-     * @var ShopProvider
+     * @var OAuth2ApiClient
      */
-    protected $shopProvider;
+    protected $oauth2ApiClient;
 
     /**
      * @var \PrestaShop\Module\PsAccounts\Vendor\Lcobucci\JWT\Token
@@ -47,8 +46,8 @@ function setUp(): void
         parent::setUp();
 
         $this->validAccessToken = $this->makeJwtToken(new \DateTimeImmutable('tomorrow'));
-        $shopProvider = $this->createMock(ShopProvider::class);
-        $shopProvider->method('getAccessToken')
+        $shopProvider = $this->createMock(OAuth2ApiClient::class);
+        $shopProvider->method('getAccessTokenByClientCredentials')
             ->willReturn(new AccessToken([
                 'access_token' => (string)$this->validAccessToken
             ]));
diff --git a/tests/Unit/Http/Client/CircuitBreaker/CircuitBreakerTest.php b/tests/Unit/Http/Client/CircuitBreaker/CircuitBreakerTest.php
index 605bcca53..d4e54a1a2 100644
--- a/tests/Unit/Http/Client/CircuitBreaker/CircuitBreakerTest.php
+++ b/tests/Unit/Http/Client/CircuitBreaker/CircuitBreakerTest.php
@@ -2,11 +2,10 @@
 namespace PrestaShop\Module\PsAccounts\Tests\Unit\Http\Client\CircuitBreaker;
 
 use PHPUnit\Framework\TestCase;
+use PrestaShop\Module\PsAccounts\Http\Client\CircuitBreaker\CircuitBreakerException;
 use PrestaShop\Module\PsAccounts\Http\Client\CircuitBreaker\Factory;
 use PrestaShop\Module\PsAccounts\Http\Client\CircuitBreaker\CircuitBreaker;
 use PrestaShop\Module\PsAccounts\Http\Client\CircuitBreaker\State;
-use PrestaShop\Module\PsAccounts\Vendor\GuzzleHttp\Exception\ConnectException;
-use PrestaShop\Module\PsAccounts\Vendor\GuzzleHttp\Psr7\Request;
 
 class CircuitBreakerTest extends TestCase
 {
@@ -72,7 +71,7 @@ public function itShouldOpenCircuitOnThreshold()
 
         for ($i = 0; $i <= $circuitBreaker->getThreshold(); ++$i) {
             $response = $circuitBreaker->call(function () {
-                throw new ConnectException('Test Timeout Reached', $this->getRequest());
+                throw new CircuitBreakerException('Test Timeout Reached');
             });
         }
 
@@ -93,7 +92,7 @@ public function itShouldHalfOpenCircuitOnResetTimeout()
 
         for ($i = 0; $i <= $circuitBreaker->getThreshold(); ++$i) {
             $response = $circuitBreaker->call(function () {
-                throw new ConnectException('Test Timeout Reached', $this->getRequest());
+                throw new CircuitBreakerException('Test Timeout Reached');
             });
         }
 
@@ -113,14 +112,14 @@ public function itShouldReOpenCircuitOnTimeoutAndHalfOpen()
 
         for ($i = 0; $i <= $circuitBreaker->getThreshold(); ++$i) {
             $response = $circuitBreaker->call(function () {
-                throw new ConnectException('Test Timeout Reached', $this->getRequest());
+                throw new CircuitBreakerException('Test Timeout Reached');
             });
         }
 
         sleep(1);
 
         $response = $circuitBreaker->call(function () {
-            throw new ConnectException('Test Timeout Reached', $this->getRequest());
+            throw new CircuitBreakerException('Test Timeout Reached');
         });
 
         $this->assertEquals(State::OPEN, $circuitBreaker->state(), (string) $this->circuitBreaker);
@@ -140,7 +139,7 @@ public function itShouldCloseCircuitOnSuccess()
 
         for ($i = 0; $i <= $circuitBreaker->getThreshold(); ++$i) {
             $response = $circuitBreaker->call(function () {
-                throw new ConnectException('Test Timeout Reached', $this->getRequest());
+                throw new CircuitBreakerException('Test Timeout Reached');
             });
         }
 
@@ -178,17 +177,4 @@ private function createCircuitBreaker(
 
         return $circuitBreaker;
     }
-
-    /**
-     * @param string $method
-     * @param string $uri
-     *
-     * @phpstan-ignore-next-line
-     *
-     * @return Request
-     */
-    private function getRequest($method = 'POST', $uri = '/foo/bar')
-    {
-        return new Request($method, $uri);
-    }
 }

From 6bb0f99de5445446f80c0205584511590cc7f293 Mon Sep 17 00:00:00 2001
From: hschoenenberger <herve.schoenenberger@prestashop.com>
Date: Wed, 8 Jan 2025 19:06:48 +0100
Subject: [PATCH 24/46] fix: tests

---
 src/Api/Client/AccountsClient.php         | 21 +++++-----
 src/Api/Client/OAuth2/OAuth2ApiClient.php | 13 +++---
 src/Api/Client/ServicesBillingClient.php  |  5 ++-
 src/Http/Client/Curl/Client.php           | 50 +++++++++++------------
 src/Http/Client/Request.php               | 10 +++++
 5 files changed, 55 insertions(+), 44 deletions(-)
 create mode 100644 src/Http/Client/Request.php

diff --git a/src/Api/Client/AccountsClient.php b/src/Api/Client/AccountsClient.php
index 46e93239b..959c9529c 100644
--- a/src/Api/Client/AccountsClient.php
+++ b/src/Api/Client/AccountsClient.php
@@ -24,6 +24,7 @@
 use PrestaShop\Module\PsAccounts\Account\Dto\UpgradeModule;
 use PrestaShop\Module\PsAccounts\Http\Client\Curl\Client;
 use PrestaShop\Module\PsAccounts\Http\Client\Factory;
+use PrestaShop\Module\PsAccounts\Http\Client\Request;
 use PrestaShop\Module\PsAccounts\Vendor\Ramsey\Uuid\Uuid;
 
 class AccountsClient
@@ -114,7 +115,7 @@ public function firebaseTokens($accessToken)
         $res = $this->getClient()->get(
             'v2/shop/firebase/tokens',
             [
-                'headers' => $this->getHeaders([
+                Request::HEADERS => $this->getHeaders([
                     'Authorization' => 'Bearer ' . $accessToken,
                 ]),
             ]);
@@ -134,10 +135,10 @@ public function refreshShopToken($refreshToken, $shopUuid)
         $res = $this->getClient()->post(
             'v1/shop/token/refresh',
             [
-                'headers' => $this->getHeaders([
+                Request::HEADERS => $this->getHeaders([
                     'X-Shop-Id' => $shopUuid,
                 ]),
-                'json' => [
+                Request::JSON => [
                     'token' => $refreshToken,
                 ],
             ]
@@ -159,7 +160,7 @@ public function deleteUserShop($ownerUid, $shopUid, $ownerToken)
         $res = $this->getClient()->delete(
             'v1/user/' . $ownerUid . '/shop/' . $shopUid,
             [
-                'headers' => $this->getHeaders([
+                Request::HEADERS => $this->getHeaders([
                     'Authorization' => 'Bearer ' . $ownerToken,
                     'X-Shop-Id' => $shopUid,
                 ]),
@@ -183,11 +184,11 @@ public function updateUserShop($ownerUid, $shopUid, $ownerToken, UpdateShop $sho
         $res = $this->getClient()->patch(
             'v1/user/' . $ownerUid . '/shop/' . $shopUid,
             [
-                'headers' => $this->getHeaders([
+                Request::HEADERS => $this->getHeaders([
                     'Authorization' => 'Bearer ' . $ownerToken,
                     'X-Shop-Id' => $shopUid,
                 ]),
-                'json' => $shop->jsonSerialize(),
+                Request::JSON => $shop->jsonSerialize(),
             ]
         );
 
@@ -207,11 +208,11 @@ public function upgradeShopModule($shopUid, $shopToken, UpgradeModule $data)
         $res = $this->getClient()->post(
             '/v2/shop/module/update',
             [
-                'headers' => $this->getHeaders([
+                Request::HEADERS => $this->getHeaders([
                     'Authorization' => 'Bearer ' . $shopToken,
                     'X-Shop-Id' => $shopUid,
                 ]),
-                'json' => $data->jsonSerialize(),
+                Request::JSON => $data->jsonSerialize(),
             ]
         );
 
@@ -231,8 +232,8 @@ public function verifyToken($idToken)
         $res = $this->getClient()->post(
             '/v1/shop/token/verify',
             [
-                'headers' => $this->getHeaders(),
-                'json' => [
+                Request::HEADERS => $this->getHeaders(),
+                Request::JSON => [
                     'token' => $idToken,
                 ],
             ]
diff --git a/src/Api/Client/OAuth2/OAuth2ApiClient.php b/src/Api/Client/OAuth2/OAuth2ApiClient.php
index b974b3a23..c344a6310 100644
--- a/src/Api/Client/OAuth2/OAuth2ApiClient.php
+++ b/src/Api/Client/OAuth2/OAuth2ApiClient.php
@@ -24,6 +24,7 @@
 use PrestaShop\Module\PsAccounts\Api\Client\OAuth2\OAuth2Client as OauthClient;
 use PrestaShop\Module\PsAccounts\Http\Client\Curl\Client;
 use PrestaShop\Module\PsAccounts\Http\Client\Factory;
+use PrestaShop\Module\PsAccounts\Http\Client\Request;
 use PrestaShop\Module\PsAccounts\Http\Client\Response;
 use PrestaShop\Module\PsAccounts\Vendor\Ramsey\Uuid\Uuid;
 
@@ -189,10 +190,8 @@ protected function fetchWellKnown($url = null)
             $wellKnownUrl = \preg_replace('/\\/?$/', '/.well-known/openid-configuration', $wellKnownUrl);
         }
 
-        $this->getClient()->setRoute($wellKnownUrl);
-
         /** @var Response $response */
-        $response = $this->getClient()->get();
+        $response = $this->getClient()->get($wellKnownUrl);
 
         return $response->body;
     }
@@ -209,7 +208,7 @@ public function getAccessTokenByClientCredentials(array $scope = [], array $audi
         $response = $this->getClient()->post(
             $this->getWellKnown()->token_endpoint,
             [
-                'query' => [
+                Request::BODY => [
                     'grant_type' => 'client_credentials',
                     'client_id' => $this->oauth2Client->getClientId(),
                     'client_secret' => $this->oauth2Client->getClientSecret(),
@@ -309,7 +308,7 @@ public function getAccessTokenByAuthorizationCode(
         $response = $this->getClient()->post(
             $this->getWellKnown()->token_endpoint,
             [
-                'query' => array_merge([
+                Request::BODY => array_merge([
                     'grant_type' => 'authorization_code',
                     'client_id' => $this->oauth2Client->getClientId(),
                     'client_secret' => $this->oauth2Client->getClientSecret(),
@@ -341,7 +340,7 @@ public function refreshAccessToken($refreshToken)
         $response = $this->getClient()->post(
             $this->getWellKnown()->token_endpoint,
             [
-                'query' => [
+                Request::BODY => [
                     'grant_type' => 'refresh_token',
                     'client_id' => $this->oauth2Client->getClientId(),
                     'refresh_token' => $refreshToken,
@@ -367,7 +366,7 @@ public function getUserInfos($accessToken)
         $response = $this->getClient()->get(
             $this->getWellKnown()->userinfo_endpoint,
             [
-                'headers' => $this->getHeaders([
+                Request::HEADERS => $this->getHeaders([
                     'Authorization' => 'Bearer ' . $accessToken,
                 ]),
             ]
diff --git a/src/Api/Client/ServicesBillingClient.php b/src/Api/Client/ServicesBillingClient.php
index 991717866..42d747401 100644
--- a/src/Api/Client/ServicesBillingClient.php
+++ b/src/Api/Client/ServicesBillingClient.php
@@ -22,6 +22,7 @@
 
 use PrestaShop\Module\PsAccounts\Http\Client\Curl\Client;
 use PrestaShop\Module\PsAccounts\Http\Client\Factory;
+use PrestaShop\Module\PsAccounts\Http\Client\Request;
 use PrestaShop\Module\PsAccounts\Http\Client\Response;
 use PrestaShop\Module\PsAccounts\Provider\ShopProvider;
 use PrestaShop\Module\PsAccounts\Service\PsAccountsService;
@@ -99,7 +100,7 @@ public function createBillingCustomer($shopUuidV4, $bodyHttp)
         return $this->client->post(
             '/shops/' . $shopUuidV4,
             [
-                'query' => $bodyHttp,
+                Request::BODY => $bodyHttp,
             ]
         );
     }
@@ -127,7 +128,7 @@ public function createBillingSubscriptions($shopUuidV4, $module, $bodyHttp)
         return $this->client->post(
             '/shops/' . $shopUuidV4 . '/subscriptions/' . $module,
             [
-                'query' => $bodyHttp,
+                Request::BODY => $bodyHttp,
             ]
         );
     }
diff --git a/src/Http/Client/Curl/Client.php b/src/Http/Client/Curl/Client.php
index 05cbd1060..5cb0b44d1 100644
--- a/src/Http/Client/Curl/Client.php
+++ b/src/Http/Client/Curl/Client.php
@@ -21,6 +21,7 @@
 namespace PrestaShop\Module\PsAccounts\Http\Client\Curl;
 
 use PrestaShop\Module\PsAccounts\Http\Client\CircuitBreaker;
+use PrestaShop\Module\PsAccounts\Http\Client\Request;
 use PrestaShop\Module\PsAccounts\Http\Client\Response;
 use PrestaShop\Module\PsAccounts\Log\Logger;
 
@@ -41,17 +42,8 @@ class Client
      */
     protected $timeout = 10;
 
-    /**
-     * @var bool
-     *
-     * TODO: implement exceptions
-     */
-    protected $catchExceptions = false;
-
     /**
      * @var CircuitBreaker\CircuitBreaker
-     *
-     * TODO: implement circuit breaker
      */
     protected $circuitBreaker;
 
@@ -70,6 +62,11 @@ class Client
      */
     protected $allowRedirects;
 
+    /**
+     * @var array
+     */
+    protected $headers = [];
+
     /**
      * @param array $options
      *
@@ -91,7 +88,7 @@ public function __construct($options)
 //        \Tools::refreshCACertFile();
 
         // FIXME headers
-        foreach (['baseUri', 'timeout', 'objectResponse', 'sslCheck', 'allowRedirects'] as $option) {
+        foreach (['baseUri', 'timeout', 'objectResponse', 'sslCheck', 'allowRedirects', 'headers'] as $option) {
             if (isset($options[$option])) {
                 $this->$option = $options[$option];
             }
@@ -277,14 +274,18 @@ private function logResponse($response, $ch)
      */
     public function initHeaders(array $options, $ch)
     {
-        if (array_key_exists('headers', $options)) {
-            $headers = [];
-            foreach ($options['headers'] as $header => $value) {
-                $headers[] = "$header: $value";
-            }
-            Logger::getInstance()->info('headers ' . var_export($headers, true));
-            curl_setopt($ch, CURLOPT_HTTPHEADER, $headers);
+        $assoc = $this->headers;
+        if (array_key_exists(Request::HEADERS, $options)) {
+            $assoc = array_merge($assoc, $options[Request::HEADERS]);
         }
+
+        $headers = [];
+        foreach ($assoc as $header => $value) {
+            $headers[] = "$header: $value";
+        }
+
+        Logger::getInstance()->info('headers ' . var_export($headers, true));
+        curl_setopt($ch, CURLOPT_HTTPHEADER, $headers);
     }
 
     /**
@@ -310,7 +311,7 @@ public function initRoute()
         curl_setopt($ch, CURLOPT_FOLLOWLOCATION, $this->allowRedirects);
         curl_setopt($ch, CURLOPT_POSTREDIR, $this->allowRedirects ? 3 : 0);
 
-        curl_setopt($ch, CURLOPT_USERAGENT, 'Ps_accounts/' . \Ps_accounts::VERSION);
+        curl_setopt($ch, CURLOPT_USERAGENT, 'ps_accounts/' . \Ps_accounts::VERSION);
         //curl_setopt($ch, CURLOPT_VERBOSE, true);
 
         return $ch;
@@ -336,14 +337,13 @@ public function initSsl($ch)
      */
     public function initPayload(array $options, $ch)
     {
-        if (array_key_exists('json', $options)) {
-            Logger::getInstance()->info('payload ' . var_export($options['json'], true));
-            curl_setopt($ch, CURLOPT_POSTFIELDS, json_encode($options['json']) ?: '');
+        if (array_key_exists(Request::JSON, $options)) {
+            Logger::getInstance()->info('payload ' . var_export($options[Request::JSON], true));
+            curl_setopt($ch, CURLOPT_POSTFIELDS, json_encode($options[Request::JSON]) ?: '');
             curl_setopt($ch, CURLOPT_HTTPHEADER, ['Content-Type: application/json']);
-
-        } elseif (array_key_exists('query', $options)) {
-            Logger::getInstance()->info('payload ' . var_export($options['query'], true));
-            curl_setopt($ch, CURLOPT_POSTFIELDS, http_build_query($options['query']));
+        } elseif (array_key_exists(Request::BODY, $options)) {
+            Logger::getInstance()->info('payload ' . var_export($options[Request::BODY], true));
+            curl_setopt($ch, CURLOPT_POSTFIELDS, http_build_query($options[Request::BODY]));
         }
     }
 
diff --git a/src/Http/Client/Request.php b/src/Http/Client/Request.php
new file mode 100644
index 000000000..29eb654d2
--- /dev/null
+++ b/src/Http/Client/Request.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace PrestaShop\Module\PsAccounts\Http\Client;
+
+class Request
+{
+    const HEADERS = 'headers';
+    const JSON = 'json';
+    const BODY = 'body';
+}

From c40fc0c4c3e8ad2a6d2f6ec9f993a23fc2e3004e Mon Sep 17 00:00:00 2001
From: hschoenenberger <herve.schoenenberger@prestashop.com>
Date: Wed, 8 Jan 2025 19:07:38 +0100
Subject: [PATCH 25/46] fix: tests

---
 src/Api/Client/OAuth2/OAuth2ApiClient.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/Api/Client/OAuth2/OAuth2ApiClient.php b/src/Api/Client/OAuth2/OAuth2ApiClient.php
index c344a6310..dba43b4ff 100644
--- a/src/Api/Client/OAuth2/OAuth2ApiClient.php
+++ b/src/Api/Client/OAuth2/OAuth2ApiClient.php
@@ -423,4 +423,5 @@ public function getOauth2Client()
     // TODO: move Exception classes
     // TODO: throw Exceptions -> and catch them in Login Trait
     // TODO: log client errors (onError)
+    // TODO: USER AGENT
 }

From 03166057f0a9db9fb45ead80c6cc1f837530ee7c Mon Sep 17 00:00:00 2001
From: hschoenenberger <herve.schoenenberger@prestashop.com>
Date: Wed, 8 Jan 2025 21:07:25 +0100
Subject: [PATCH 26/46] fix: tests

---
 src/Api/Client/AccountsClient.php         | 22 +++++++++++-----------
 src/Api/Client/OAuth2/OAuth2ApiClient.php | 10 +++++-----
 src/Api/Client/ServicesBillingClient.php  |  6 +++---
 src/Http/Client/Curl/Client.php           | 18 +++++++++---------
 src/Http/Client/Options.php               | 10 ++++++++++
 src/Http/Client/Request.php               | 10 ----------
 6 files changed, 38 insertions(+), 38 deletions(-)
 create mode 100644 src/Http/Client/Options.php
 delete mode 100644 src/Http/Client/Request.php

diff --git a/src/Api/Client/AccountsClient.php b/src/Api/Client/AccountsClient.php
index 959c9529c..cff26a2c6 100644
--- a/src/Api/Client/AccountsClient.php
+++ b/src/Api/Client/AccountsClient.php
@@ -24,7 +24,7 @@
 use PrestaShop\Module\PsAccounts\Account\Dto\UpgradeModule;
 use PrestaShop\Module\PsAccounts\Http\Client\Curl\Client;
 use PrestaShop\Module\PsAccounts\Http\Client\Factory;
-use PrestaShop\Module\PsAccounts\Http\Client\Request;
+use PrestaShop\Module\PsAccounts\Http\Client\Options;
 use PrestaShop\Module\PsAccounts\Vendor\Ramsey\Uuid\Uuid;
 
 class AccountsClient
@@ -115,7 +115,7 @@ public function firebaseTokens($accessToken)
         $res = $this->getClient()->get(
             'v2/shop/firebase/tokens',
             [
-                Request::HEADERS => $this->getHeaders([
+                Options::REQ_HEADERS => $this->getHeaders([
                     'Authorization' => 'Bearer ' . $accessToken,
                 ]),
             ]);
@@ -135,10 +135,10 @@ public function refreshShopToken($refreshToken, $shopUuid)
         $res = $this->getClient()->post(
             'v1/shop/token/refresh',
             [
-                Request::HEADERS => $this->getHeaders([
+                Options::REQ_HEADERS => $this->getHeaders([
                     'X-Shop-Id' => $shopUuid,
                 ]),
-                Request::JSON => [
+                Options::REQ_JSON => [
                     'token' => $refreshToken,
                 ],
             ]
@@ -160,7 +160,7 @@ public function deleteUserShop($ownerUid, $shopUid, $ownerToken)
         $res = $this->getClient()->delete(
             'v1/user/' . $ownerUid . '/shop/' . $shopUid,
             [
-                Request::HEADERS => $this->getHeaders([
+                Options::REQ_HEADERS => $this->getHeaders([
                     'Authorization' => 'Bearer ' . $ownerToken,
                     'X-Shop-Id' => $shopUid,
                 ]),
@@ -184,11 +184,11 @@ public function updateUserShop($ownerUid, $shopUid, $ownerToken, UpdateShop $sho
         $res = $this->getClient()->patch(
             'v1/user/' . $ownerUid . '/shop/' . $shopUid,
             [
-                Request::HEADERS => $this->getHeaders([
+                Options::REQ_HEADERS => $this->getHeaders([
                     'Authorization' => 'Bearer ' . $ownerToken,
                     'X-Shop-Id' => $shopUid,
                 ]),
-                Request::JSON => $shop->jsonSerialize(),
+                Options::REQ_JSON => $shop->jsonSerialize(),
             ]
         );
 
@@ -208,11 +208,11 @@ public function upgradeShopModule($shopUid, $shopToken, UpgradeModule $data)
         $res = $this->getClient()->post(
             '/v2/shop/module/update',
             [
-                Request::HEADERS => $this->getHeaders([
+                Options::REQ_HEADERS => $this->getHeaders([
                     'Authorization' => 'Bearer ' . $shopToken,
                     'X-Shop-Id' => $shopUid,
                 ]),
-                Request::JSON => $data->jsonSerialize(),
+                Options::REQ_JSON => $data->jsonSerialize(),
             ]
         );
 
@@ -232,8 +232,8 @@ public function verifyToken($idToken)
         $res = $this->getClient()->post(
             '/v1/shop/token/verify',
             [
-                Request::HEADERS => $this->getHeaders(),
-                Request::JSON => [
+                Options::REQ_HEADERS => $this->getHeaders(),
+                Options::REQ_JSON => [
                     'token' => $idToken,
                 ],
             ]
diff --git a/src/Api/Client/OAuth2/OAuth2ApiClient.php b/src/Api/Client/OAuth2/OAuth2ApiClient.php
index dba43b4ff..6fd4b15fe 100644
--- a/src/Api/Client/OAuth2/OAuth2ApiClient.php
+++ b/src/Api/Client/OAuth2/OAuth2ApiClient.php
@@ -24,7 +24,7 @@
 use PrestaShop\Module\PsAccounts\Api\Client\OAuth2\OAuth2Client as OauthClient;
 use PrestaShop\Module\PsAccounts\Http\Client\Curl\Client;
 use PrestaShop\Module\PsAccounts\Http\Client\Factory;
-use PrestaShop\Module\PsAccounts\Http\Client\Request;
+use PrestaShop\Module\PsAccounts\Http\Client\Options;
 use PrestaShop\Module\PsAccounts\Http\Client\Response;
 use PrestaShop\Module\PsAccounts\Vendor\Ramsey\Uuid\Uuid;
 
@@ -208,7 +208,7 @@ public function getAccessTokenByClientCredentials(array $scope = [], array $audi
         $response = $this->getClient()->post(
             $this->getWellKnown()->token_endpoint,
             [
-                Request::BODY => [
+                Options::REQ_FORM => [
                     'grant_type' => 'client_credentials',
                     'client_id' => $this->oauth2Client->getClientId(),
                     'client_secret' => $this->oauth2Client->getClientSecret(),
@@ -308,7 +308,7 @@ public function getAccessTokenByAuthorizationCode(
         $response = $this->getClient()->post(
             $this->getWellKnown()->token_endpoint,
             [
-                Request::BODY => array_merge([
+                Options::REQ_FORM => array_merge([
                     'grant_type' => 'authorization_code',
                     'client_id' => $this->oauth2Client->getClientId(),
                     'client_secret' => $this->oauth2Client->getClientSecret(),
@@ -340,7 +340,7 @@ public function refreshAccessToken($refreshToken)
         $response = $this->getClient()->post(
             $this->getWellKnown()->token_endpoint,
             [
-                Request::BODY => [
+                Options::REQ_FORM => [
                     'grant_type' => 'refresh_token',
                     'client_id' => $this->oauth2Client->getClientId(),
                     'refresh_token' => $refreshToken,
@@ -366,7 +366,7 @@ public function getUserInfos($accessToken)
         $response = $this->getClient()->get(
             $this->getWellKnown()->userinfo_endpoint,
             [
-                Request::HEADERS => $this->getHeaders([
+                Options::REQ_HEADERS => $this->getHeaders([
                     'Authorization' => 'Bearer ' . $accessToken,
                 ]),
             ]
diff --git a/src/Api/Client/ServicesBillingClient.php b/src/Api/Client/ServicesBillingClient.php
index 42d747401..c4a5a0917 100644
--- a/src/Api/Client/ServicesBillingClient.php
+++ b/src/Api/Client/ServicesBillingClient.php
@@ -22,7 +22,7 @@
 
 use PrestaShop\Module\PsAccounts\Http\Client\Curl\Client;
 use PrestaShop\Module\PsAccounts\Http\Client\Factory;
-use PrestaShop\Module\PsAccounts\Http\Client\Request;
+use PrestaShop\Module\PsAccounts\Http\Client\Options;
 use PrestaShop\Module\PsAccounts\Http\Client\Response;
 use PrestaShop\Module\PsAccounts\Provider\ShopProvider;
 use PrestaShop\Module\PsAccounts\Service\PsAccountsService;
@@ -100,7 +100,7 @@ public function createBillingCustomer($shopUuidV4, $bodyHttp)
         return $this->client->post(
             '/shops/' . $shopUuidV4,
             [
-                Request::BODY => $bodyHttp,
+                Options::REQ_FORM => $bodyHttp,
             ]
         );
     }
@@ -128,7 +128,7 @@ public function createBillingSubscriptions($shopUuidV4, $module, $bodyHttp)
         return $this->client->post(
             '/shops/' . $shopUuidV4 . '/subscriptions/' . $module,
             [
-                Request::BODY => $bodyHttp,
+                Options::REQ_FORM => $bodyHttp,
             ]
         );
     }
diff --git a/src/Http/Client/Curl/Client.php b/src/Http/Client/Curl/Client.php
index 5cb0b44d1..bd5196969 100644
--- a/src/Http/Client/Curl/Client.php
+++ b/src/Http/Client/Curl/Client.php
@@ -21,7 +21,7 @@
 namespace PrestaShop\Module\PsAccounts\Http\Client\Curl;
 
 use PrestaShop\Module\PsAccounts\Http\Client\CircuitBreaker;
-use PrestaShop\Module\PsAccounts\Http\Client\Request;
+use PrestaShop\Module\PsAccounts\Http\Client\Options;
 use PrestaShop\Module\PsAccounts\Http\Client\Response;
 use PrestaShop\Module\PsAccounts\Log\Logger;
 
@@ -275,8 +275,8 @@ private function logResponse($response, $ch)
     public function initHeaders(array $options, $ch)
     {
         $assoc = $this->headers;
-        if (array_key_exists(Request::HEADERS, $options)) {
-            $assoc = array_merge($assoc, $options[Request::HEADERS]);
+        if (array_key_exists(Options::REQ_HEADERS, $options)) {
+            $assoc = array_merge($assoc, $options[Options::REQ_HEADERS]);
         }
 
         $headers = [];
@@ -337,13 +337,13 @@ public function initSsl($ch)
      */
     public function initPayload(array $options, $ch)
     {
-        if (array_key_exists(Request::JSON, $options)) {
-            Logger::getInstance()->info('payload ' . var_export($options[Request::JSON], true));
-            curl_setopt($ch, CURLOPT_POSTFIELDS, json_encode($options[Request::JSON]) ?: '');
+        if (array_key_exists(Options::REQ_JSON, $options)) {
+            Logger::getInstance()->info('payload ' . var_export($options[Options::REQ_JSON], true));
+            curl_setopt($ch, CURLOPT_POSTFIELDS, json_encode($options[Options::REQ_JSON]) ?: '');
             curl_setopt($ch, CURLOPT_HTTPHEADER, ['Content-Type: application/json']);
-        } elseif (array_key_exists(Request::BODY, $options)) {
-            Logger::getInstance()->info('payload ' . var_export($options[Request::BODY], true));
-            curl_setopt($ch, CURLOPT_POSTFIELDS, http_build_query($options[Request::BODY]));
+        } elseif (array_key_exists(Options::REQ_FORM, $options)) {
+            Logger::getInstance()->info('payload ' . var_export($options[Options::REQ_FORM], true));
+            curl_setopt($ch, CURLOPT_POSTFIELDS, http_build_query($options[Options::REQ_FORM]));
         }
     }
 
diff --git a/src/Http/Client/Options.php b/src/Http/Client/Options.php
new file mode 100644
index 000000000..877d7bc83
--- /dev/null
+++ b/src/Http/Client/Options.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace PrestaShop\Module\PsAccounts\Http\Client;
+
+class Options
+{
+    const REQ_HEADERS = 'headers';
+    const REQ_JSON = 'json';
+    const REQ_FORM = 'form';
+}
diff --git a/src/Http/Client/Request.php b/src/Http/Client/Request.php
deleted file mode 100644
index 29eb654d2..000000000
--- a/src/Http/Client/Request.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-
-namespace PrestaShop\Module\PsAccounts\Http\Client;
-
-class Request
-{
-    const HEADERS = 'headers';
-    const JSON = 'json';
-    const BODY = 'body';
-}

From 2fe6a2b005c63475d53111eadd038e80901031a6 Mon Sep 17 00:00:00 2001
From: hschoenenberger <herve.schoenenberger@prestashop.com>
Date: Wed, 8 Jan 2025 23:59:20 +0100
Subject: [PATCH 27/46] fix: json post

---
 src/Http/Client/Curl/Client.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/Http/Client/Curl/Client.php b/src/Http/Client/Curl/Client.php
index bd5196969..082871636 100644
--- a/src/Http/Client/Curl/Client.php
+++ b/src/Http/Client/Curl/Client.php
@@ -275,6 +275,9 @@ private function logResponse($response, $ch)
     public function initHeaders(array $options, $ch)
     {
         $assoc = $this->headers;
+        if (array_key_exists(Options::REQ_JSON, $options)) {
+            $assoc['Content-Type'] = 'application/json';
+        }
         if (array_key_exists(Options::REQ_HEADERS, $options)) {
             $assoc = array_merge($assoc, $options[Options::REQ_HEADERS]);
         }
@@ -340,7 +343,6 @@ public function initPayload(array $options, $ch)
         if (array_key_exists(Options::REQ_JSON, $options)) {
             Logger::getInstance()->info('payload ' . var_export($options[Options::REQ_JSON], true));
             curl_setopt($ch, CURLOPT_POSTFIELDS, json_encode($options[Options::REQ_JSON]) ?: '');
-            curl_setopt($ch, CURLOPT_HTTPHEADER, ['Content-Type: application/json']);
         } elseif (array_key_exists(Options::REQ_FORM, $options)) {
             Logger::getInstance()->info('payload ' . var_export($options[Options::REQ_FORM], true));
             curl_setopt($ch, CURLOPT_POSTFIELDS, http_build_query($options[Options::REQ_FORM]));

From 19f7e8f4a6fe486734e1fd28a2cce95120a05ef6 Mon Sep 17 00:00:00 2001
From: hschoenenberger <herve.schoenenberger@prestashop.com>
Date: Thu, 9 Jan 2025 18:03:01 +0100
Subject: [PATCH 28/46] fix: json post

---
 ps_accounts.php                               |  4 ++++
 src/Api/Controller/AbstractRestController.php |  4 ++++
 src/Hook/ActionShopAccountUnlinkAfter.php     |  3 ++-
 src/Provider/RsaKeysProvider.php              | 14 ++++----------
 src/Provider/ShopProvider.php                 |  3 ++-
 src/Repository/ConfigurationRepository.php    |  7 +++++--
 6 files changed, 21 insertions(+), 14 deletions(-)

diff --git a/ps_accounts.php b/ps_accounts.php
index 32c4ea7fe..9ba2a36ea 100644
--- a/ps_accounts.php
+++ b/ps_accounts.php
@@ -366,6 +366,10 @@ public function getContent()
         /** @var \PrestaShop\Module\PsAccounts\Presenter\PsAccountsPresenter $psAccountsPresenter */
         $psAccountsPresenter = $this->getService(\PrestaShop\Module\PsAccounts\Presenter\PsAccountsPresenter::class);
 
+        /** @var \PrestaShop\Module\PsAccounts\Provider\RsaKeysProvider $rsaKeysProvider */
+        $rsaKeysProvider = $this->getService(\PrestaShop\Module\PsAccounts\Provider\RsaKeysProvider::class);
+        $rsaKeysProvider->getOrGenerateAccountsRsaPublicKey();
+
         Media::addJsDef([
             'contextPsAccounts' => $psAccountsPresenter->present((string) $this->name),
         ]);
diff --git a/src/Api/Controller/AbstractRestController.php b/src/Api/Controller/AbstractRestController.php
index 61a6d7253..327690598 100644
--- a/src/Api/Controller/AbstractRestController.php
+++ b/src/Api/Controller/AbstractRestController.php
@@ -285,11 +285,15 @@ protected function decodePayload($defaultShopId = null)
                 $this->setContextShop($shop);
                 $publicKey = $shopKeysService->getPublicKey();
 
+                $this->module->getLogger()->debug('trying to verify token with pkey: ' . $publicKey);
+
                 if (
                     !empty($publicKey) &&
                     is_string($publicKey) &&
                     true === $jwt->verify(new Sha256(), new Key((string) $publicKey))
                 ) {
+                    $this->module->getLogger()->debug('token verified: ' . $jwtString);
+
                     return $jwt->claims()->all();
                 }
                 $this->module->getLogger()->error('Failed to verify token: ' . $jwtString);
diff --git a/src/Hook/ActionShopAccountUnlinkAfter.php b/src/Hook/ActionShopAccountUnlinkAfter.php
index 06e78cbee..798c514d5 100644
--- a/src/Hook/ActionShopAccountUnlinkAfter.php
+++ b/src/Hook/ActionShopAccountUnlinkAfter.php
@@ -56,7 +56,8 @@ public function execute(array $params = [])
         $rsaKeysProvider = $this->module->getService(RsaKeysProvider::class);
         try {
             $rsaKeysProvider->cleanupKeys();
-            $rsaKeysProvider->generateKeys();
+            // FIXME: We MUST generate a new key here to avoid concurrent key re-generation at Presenter display time
+            //$rsaKeysProvider->generateKeys();
         } catch (\Exception $e) {
         }
     }
diff --git a/src/Provider/RsaKeysProvider.php b/src/Provider/RsaKeysProvider.php
index d2ef123f8..b7edfd238 100644
--- a/src/Provider/RsaKeysProvider.php
+++ b/src/Provider/RsaKeysProvider.php
@@ -131,18 +131,12 @@ public function generateKeys($refresh = false)
     }
 
     /**
-     * @return string|bool|null
+     * @return string|null
      */
     public function getOrGenerateAccountsRsaPublicKey()
     {
-        $publicKey = $this->getPublicKey();
-        if ($publicKey) {
-            return $publicKey;
-        }
-
         try {
-            $this->regenerateKeys();
-
+            $this->generateKeys();
             return $this->getPublicKey();
         } catch (\Exception $e) {
             return null;
@@ -164,7 +158,7 @@ public function regenerateKeys()
      */
     public function hasKeys()
     {
-        return false === empty($this->configuration->getAccountsRsaPublicKey());
+        return false === empty($this->configuration->getAccountsRsaPublicKey(false, false));
     }
 
     /**
@@ -172,7 +166,7 @@ public function hasKeys()
      */
     public function getPublicKey()
     {
-        return $this->configuration->getAccountsRsaPublicKey();
+        return $this->configuration->getAccountsRsaPublicKey(false, false);
     }
 
     /**
diff --git a/src/Provider/ShopProvider.php b/src/Provider/ShopProvider.php
index bb30bd4cc..2a346bd73 100644
--- a/src/Provider/ShopProvider.php
+++ b/src/Provider/ShopProvider.php
@@ -87,7 +87,8 @@ public function formatShopData(array $shopData, $psxName = '', $refreshTokens =
 
                 // LinkAccount
                 'uuid' => $linkShop->getShopUuid() ?: null,
-                'publicKey' => $rsaKeyProvider->getOrGenerateAccountsRsaPublicKey() ?: null,
+                //'publicKey' => $rsaKeyProvider->getOrGenerateAccountsRsaPublicKey() ?: null,
+                'publicKey' => $rsaKeyProvider->getPublicKey() ?: null,
                 'employeeId' => (int) $linkShop->getEmployeeId() ?: null,
                 'user' => [
                     'email' => $linkShop->getOwnerEmail() ?: null,
diff --git a/src/Repository/ConfigurationRepository.php b/src/Repository/ConfigurationRepository.php
index d808e5169..95e9ffbf9 100644
--- a/src/Repository/ConfigurationRepository.php
+++ b/src/Repository/ConfigurationRepository.php
@@ -215,11 +215,14 @@ public function updateAccountsRsaPrivateKey($key)
     }
 
     /**
+     * @param bool $cached
+     * @param bool|mixed $default
+     *
      * @return string|bool
      */
-    public function getAccountsRsaPublicKey()
+    public function getAccountsRsaPublicKey($default = false, $cached = false)
     {
-        return $this->configuration->get(ConfigurationKeys::PS_ACCOUNTS_RSA_PUBLIC_KEY);
+        return $this->configuration->get(ConfigurationKeys::PS_ACCOUNTS_RSA_PUBLIC_KEY, $default, $cached);
     }
 
     /**

From bbcade41bbe5eeb8d1c65c0820719ac3c2592515 Mon Sep 17 00:00:00 2001
From: hschoenenberger <herve.schoenenberger@prestashop.com>
Date: Thu, 9 Jan 2025 18:06:27 +0100
Subject: [PATCH 29/46] fix: php-cs-fixer

---
 src/Provider/RsaKeysProvider.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/Provider/RsaKeysProvider.php b/src/Provider/RsaKeysProvider.php
index b7edfd238..ff31a582f 100644
--- a/src/Provider/RsaKeysProvider.php
+++ b/src/Provider/RsaKeysProvider.php
@@ -137,6 +137,7 @@ public function getOrGenerateAccountsRsaPublicKey()
     {
         try {
             $this->generateKeys();
+
             return $this->getPublicKey();
         } catch (\Exception $e) {
             return null;

From 23d9fab06910559ff49eb95d78e8f607aec0acb8 Mon Sep 17 00:00:00 2001
From: hschoenenberger <herve.schoenenberger@prestashop.com>
Date: Thu, 9 Jan 2025 18:03:01 +0100
Subject: [PATCH 30/46] fix: json post

---
 ps_accounts.php                               |  4 ++++
 src/Api/Controller/AbstractRestController.php |  4 ++++
 src/Hook/ActionShopAccountUnlinkAfter.php     |  3 ++-
 src/Provider/RsaKeysProvider.php              | 14 ++++----------
 src/Provider/ShopProvider.php                 |  3 ++-
 src/Repository/ConfigurationRepository.php    |  7 +++++--
 6 files changed, 21 insertions(+), 14 deletions(-)

diff --git a/ps_accounts.php b/ps_accounts.php
index 8d0c0b02c..2d218bd90 100644
--- a/ps_accounts.php
+++ b/ps_accounts.php
@@ -366,6 +366,10 @@ public function getContent()
         /** @var \PrestaShop\Module\PsAccounts\Presenter\PsAccountsPresenter $psAccountsPresenter */
         $psAccountsPresenter = $this->getService(\PrestaShop\Module\PsAccounts\Presenter\PsAccountsPresenter::class);
 
+        /** @var \PrestaShop\Module\PsAccounts\Provider\RsaKeysProvider $rsaKeysProvider */
+        $rsaKeysProvider = $this->getService(\PrestaShop\Module\PsAccounts\Provider\RsaKeysProvider::class);
+        $rsaKeysProvider->getOrGenerateAccountsRsaPublicKey();
+
         Media::addJsDef([
             'contextPsAccounts' => $psAccountsPresenter->present((string) $this->name),
         ]);
diff --git a/src/Api/Controller/AbstractRestController.php b/src/Api/Controller/AbstractRestController.php
index cb4149111..1e57af5bc 100644
--- a/src/Api/Controller/AbstractRestController.php
+++ b/src/Api/Controller/AbstractRestController.php
@@ -285,11 +285,15 @@ protected function decodePayload($defaultShopId = null)
                 $this->setContextShop($shop);
                 $publicKey = $shopKeysService->getPublicKey();
 
+                $this->module->getLogger()->debug('trying to verify token with pkey: ' . $publicKey);
+
                 if (
                     !empty($publicKey) &&
                     is_string($publicKey) &&
                     true === $jwt->verify(new Sha256(), new Key((string) $publicKey))
                 ) {
+                    $this->module->getLogger()->debug('token verified: ' . $jwtString);
+
                     return $jwt->claims()->all();
                 }
                 $this->module->getLogger()->error('Failed to verify token: ' . $jwtString);
diff --git a/src/Hook/ActionShopAccountUnlinkAfter.php b/src/Hook/ActionShopAccountUnlinkAfter.php
index df3979654..319e776f3 100644
--- a/src/Hook/ActionShopAccountUnlinkAfter.php
+++ b/src/Hook/ActionShopAccountUnlinkAfter.php
@@ -56,7 +56,8 @@ public function execute(array $params = [])
         $rsaKeysProvider = $this->module->getService(RsaKeysProvider::class);
         try {
             $rsaKeysProvider->cleanupKeys();
-            $rsaKeysProvider->generateKeys();
+            // FIXME: We MUST generate a new key here to avoid concurrent key re-generation at Presenter display time
+            //$rsaKeysProvider->generateKeys();
         } catch (\Exception $e) {
         }
     }
diff --git a/src/Provider/RsaKeysProvider.php b/src/Provider/RsaKeysProvider.php
index c69569583..7d54c93c0 100644
--- a/src/Provider/RsaKeysProvider.php
+++ b/src/Provider/RsaKeysProvider.php
@@ -131,18 +131,12 @@ public function generateKeys($refresh = false)
     }
 
     /**
-     * @return string|bool|null
+     * @return string|null
      */
     public function getOrGenerateAccountsRsaPublicKey()
     {
-        $publicKey = $this->getPublicKey();
-        if ($publicKey) {
-            return $publicKey;
-        }
-
         try {
-            $this->regenerateKeys();
-
+            $this->generateKeys();
             return $this->getPublicKey();
         } catch (\Exception $e) {
             return null;
@@ -164,7 +158,7 @@ public function regenerateKeys()
      */
     public function hasKeys()
     {
-        return false === empty($this->configuration->getAccountsRsaPublicKey());
+        return false === empty($this->configuration->getAccountsRsaPublicKey(false, false));
     }
 
     /**
@@ -172,7 +166,7 @@ public function hasKeys()
      */
     public function getPublicKey()
     {
-        return $this->configuration->getAccountsRsaPublicKey();
+        return $this->configuration->getAccountsRsaPublicKey(false, false);
     }
 
     /**
diff --git a/src/Provider/ShopProvider.php b/src/Provider/ShopProvider.php
index bb30bd4cc..2a346bd73 100644
--- a/src/Provider/ShopProvider.php
+++ b/src/Provider/ShopProvider.php
@@ -87,7 +87,8 @@ public function formatShopData(array $shopData, $psxName = '', $refreshTokens =
 
                 // LinkAccount
                 'uuid' => $linkShop->getShopUuid() ?: null,
-                'publicKey' => $rsaKeyProvider->getOrGenerateAccountsRsaPublicKey() ?: null,
+                //'publicKey' => $rsaKeyProvider->getOrGenerateAccountsRsaPublicKey() ?: null,
+                'publicKey' => $rsaKeyProvider->getPublicKey() ?: null,
                 'employeeId' => (int) $linkShop->getEmployeeId() ?: null,
                 'user' => [
                     'email' => $linkShop->getOwnerEmail() ?: null,
diff --git a/src/Repository/ConfigurationRepository.php b/src/Repository/ConfigurationRepository.php
index c44672edd..2c588cf6a 100644
--- a/src/Repository/ConfigurationRepository.php
+++ b/src/Repository/ConfigurationRepository.php
@@ -215,11 +215,14 @@ public function updateAccountsRsaPrivateKey($key)
     }
 
     /**
+     * @param bool $cached
+     * @param bool|mixed $default
+     *
      * @return string|bool
      */
-    public function getAccountsRsaPublicKey()
+    public function getAccountsRsaPublicKey($default = false, $cached = false)
     {
-        return $this->configuration->get(ConfigurationKeys::PS_ACCOUNTS_RSA_PUBLIC_KEY);
+        return $this->configuration->get(ConfigurationKeys::PS_ACCOUNTS_RSA_PUBLIC_KEY, $default, $cached);
     }
 
     /**

From 0d6621a85ab1a9ce2d8c451410068a8bbf9fcda1 Mon Sep 17 00:00:00 2001
From: hschoenenberger <herve.schoenenberger@prestashop.com>
Date: Thu, 9 Jan 2025 18:06:27 +0100
Subject: [PATCH 31/46] fix: php-cs-fixer

---
 src/Provider/RsaKeysProvider.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/Provider/RsaKeysProvider.php b/src/Provider/RsaKeysProvider.php
index 7d54c93c0..38dffde92 100644
--- a/src/Provider/RsaKeysProvider.php
+++ b/src/Provider/RsaKeysProvider.php
@@ -137,6 +137,7 @@ public function getOrGenerateAccountsRsaPublicKey()
     {
         try {
             $this->generateKeys();
+
             return $this->getPublicKey();
         } catch (\Exception $e) {
             return null;

From c041554e5c2cdbdd2d01797f2592284389040b4c Mon Sep 17 00:00:00 2001
From: hschoenenberger <herve.schoenenberger@prestashop.com>
Date: Wed, 15 Jan 2025 16:53:14 +0100
Subject: [PATCH 32/46] fix: phpstan

---
 src/Provider/RsaKeysProvider.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Provider/RsaKeysProvider.php b/src/Provider/RsaKeysProvider.php
index ff31a582f..19e6bd06d 100644
--- a/src/Provider/RsaKeysProvider.php
+++ b/src/Provider/RsaKeysProvider.php
@@ -159,15 +159,15 @@ public function regenerateKeys()
      */
     public function hasKeys()
     {
-        return false === empty($this->configuration->getAccountsRsaPublicKey(false, false));
+        return null !== $this->getPublicKey();
     }
 
     /**
-     * @return string|bool
+     * @return string|null
      */
     public function getPublicKey()
     {
-        return $this->configuration->getAccountsRsaPublicKey(false, false);
+        return ((string) $this->configuration->getAccountsRsaPublicKey(false, false)) ?: null;
     }
 
     /**

From ffe2b7f778dc6039601e7075b05875ab1923c5b5 Mon Sep 17 00:00:00 2001
From: hschoenenberger <herve.schoenenberger@prestashop.com>
Date: Wed, 15 Jan 2025 17:02:13 +0100
Subject: [PATCH 33/46] fix: phpstan

---
 src/Api/Controller/AbstractRestController.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/Api/Controller/AbstractRestController.php b/src/Api/Controller/AbstractRestController.php
index 327690598..4139db272 100644
--- a/src/Api/Controller/AbstractRestController.php
+++ b/src/Api/Controller/AbstractRestController.php
@@ -288,8 +288,7 @@ protected function decodePayload($defaultShopId = null)
                 $this->module->getLogger()->debug('trying to verify token with pkey: ' . $publicKey);
 
                 if (
-                    !empty($publicKey) &&
-                    is_string($publicKey) &&
+                    null !== $publicKey &&
                     true === $jwt->verify(new Sha256(), new Key((string) $publicKey))
                 ) {
                     $this->module->getLogger()->debug('token verified: ' . $jwtString);

From b0b4b09e01f021174ec49ad85dda28c6ab4c2563 Mon Sep 17 00:00:00 2001
From: hschoenenberger <herve.schoenenberger@prestashop.com>
Date: Wed, 15 Jan 2025 17:22:05 +0100
Subject: [PATCH 34/46] chore: cleanup commented code

---
 src/Hook/ActionShopAccountUnlinkAfter.php | 7 +------
 src/Provider/ShopProvider.php             | 1 -
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/src/Hook/ActionShopAccountUnlinkAfter.php b/src/Hook/ActionShopAccountUnlinkAfter.php
index 798c514d5..6a6d4cb69 100644
--- a/src/Hook/ActionShopAccountUnlinkAfter.php
+++ b/src/Hook/ActionShopAccountUnlinkAfter.php
@@ -54,11 +54,6 @@ public function execute(array $params = [])
 
         /** @var RsaKeysProvider $rsaKeysProvider */
         $rsaKeysProvider = $this->module->getService(RsaKeysProvider::class);
-        try {
-            $rsaKeysProvider->cleanupKeys();
-            // FIXME: We MUST generate a new key here to avoid concurrent key re-generation at Presenter display time
-            //$rsaKeysProvider->generateKeys();
-        } catch (\Exception $e) {
-        }
+        $rsaKeysProvider->cleanupKeys();
     }
 }
diff --git a/src/Provider/ShopProvider.php b/src/Provider/ShopProvider.php
index 2a346bd73..6fc40ea85 100644
--- a/src/Provider/ShopProvider.php
+++ b/src/Provider/ShopProvider.php
@@ -87,7 +87,6 @@ public function formatShopData(array $shopData, $psxName = '', $refreshTokens =
 
                 // LinkAccount
                 'uuid' => $linkShop->getShopUuid() ?: null,
-                //'publicKey' => $rsaKeyProvider->getOrGenerateAccountsRsaPublicKey() ?: null,
                 'publicKey' => $rsaKeyProvider->getPublicKey() ?: null,
                 'employeeId' => (int) $linkShop->getEmployeeId() ?: null,
                 'user' => [

From 5617e2ceaa5e319853bebe8f486c466cd2a86f8b Mon Sep 17 00:00:00 2001
From: hschoenenberger <herve.schoenenberger@prestashop.com>
Date: Thu, 16 Jan 2025 14:28:02 +0100
Subject: [PATCH 35/46] fix: default values much match legacy behaviour

---
 src/Repository/ConfigurationRepository.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Repository/ConfigurationRepository.php b/src/Repository/ConfigurationRepository.php
index 95e9ffbf9..d87d7a8a4 100644
--- a/src/Repository/ConfigurationRepository.php
+++ b/src/Repository/ConfigurationRepository.php
@@ -220,7 +220,7 @@ public function updateAccountsRsaPrivateKey($key)
      *
      * @return string|bool
      */
-    public function getAccountsRsaPublicKey($default = false, $cached = false)
+    public function getAccountsRsaPublicKey($default = false, $cached = true)
     {
         return $this->configuration->get(ConfigurationKeys::PS_ACCOUNTS_RSA_PUBLIC_KEY, $default, $cached);
     }

From fa08aef9a6f7fa99b8554d408905fb1e8ec5d5bf Mon Sep 17 00:00:00 2001
From: hschoenenberger <herve.schoenenberger@prestashop.com>
Date: Thu, 16 Jan 2025 16:13:43 +0100
Subject: [PATCH 36/46] fix: default values much match legacy behaviour

---
 .gitignore | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 3e1291e5d..5eaee05d8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,7 +10,7 @@ app.js
 
 ### Composer ###
 composer.phar
-/vendor/
+vendor/
 node_modules/
 .php_cs.cache
 .php_cs

From dcb223a9538a0ca0d42d4193905630c466e8b497 Mon Sep 17 00:00:00 2001
From: hschoenenberger <herve.schoenenberger@prestashop.com>
Date: Thu, 16 Jan 2025 16:37:13 +0100
Subject: [PATCH 37/46] fix: default values much match legacy behaviour

---
 src/Repository/ConfigurationRepository.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/Repository/ConfigurationRepository.php b/src/Repository/ConfigurationRepository.php
index d87d7a8a4..a811c610a 100644
--- a/src/Repository/ConfigurationRepository.php
+++ b/src/Repository/ConfigurationRepository.php
@@ -173,7 +173,8 @@ public function getShopUuidDateUpd()
             $entry = $this->configuration->getUncachedConfiguration(
                 ConfigurationKeys::PSX_UUID_V4,
                 $this->configuration->getIdShopGroup(),
-                $this->configuration->getIdShop());
+                $this->configuration->getIdShop()
+            );
 
             return $entry->date_upd;
         } catch (\Exception $e) {

From 26cd49a878fbc74509bcb6be84eb799b090c1e5f Mon Sep 17 00:00:00 2001
From: hschoenenberger <herve.schoenenberger@prestashop.com>
Date: Thu, 16 Jan 2025 16:49:47 +0100
Subject: [PATCH 38/46] refactor: userinfo without s

---
 controllers/admin/AdminOAuth2PsAccountsController.php | 10 +++++-----
 src/Account/Exception/AccountLoginException.php       | 10 +++++-----
 src/Account/Exception/EmailNotVerifiedException.php   |  6 +++---
 src/Account/Exception/EmployeeNotFoundException.php   |  6 +++---
 src/Account/Exception/Oauth2LoginException.php        |  6 +++---
 src/Api/Client/OAuth2/OAuth2ApiClient.php             |  6 +++---
 src/Api/Client/OAuth2/PrestaShopLoginTrait.php        |  4 ++--
 src/Api/Client/OAuth2/PrestaShopSession.php           |  4 ++--
 src/Api/Client/OAuth2/{UserInfos.php => UserInfo.php} |  2 +-
 9 files changed, 27 insertions(+), 27 deletions(-)
 rename src/Api/Client/OAuth2/{UserInfos.php => UserInfo.php} (98%)

diff --git a/controllers/admin/AdminOAuth2PsAccountsController.php b/controllers/admin/AdminOAuth2PsAccountsController.php
index 0eb522abc..2402064dc 100644
--- a/controllers/admin/AdminOAuth2PsAccountsController.php
+++ b/controllers/admin/AdminOAuth2PsAccountsController.php
@@ -24,7 +24,7 @@
 use PrestaShop\Module\PsAccounts\Api\Client\OAuth2\OAuth2ApiClient;
 use PrestaShop\Module\PsAccounts\Api\Client\OAuth2\PrestaShopLoginTrait;
 use PrestaShop\Module\PsAccounts\Api\Client\OAuth2\PrestaShopSession;
-use PrestaShop\Module\PsAccounts\Api\Client\OAuth2\UserInfos;
+use PrestaShop\Module\PsAccounts\Api\Client\OAuth2\UserInfo;
 use PrestaShop\Module\PsAccounts\Entity\EmployeeAccount;
 use PrestaShop\Module\PsAccounts\Polyfill\Traits\AdminController\IsAnonymousAllowed;
 use PrestaShop\Module\PsAccounts\Repository\EmployeeAccountRepository;
@@ -109,7 +109,7 @@ public function init()
     }
 
     /**
-     * @param UserInfos $user
+     * @param UserInfo $user
      *
      * @return bool
      *
@@ -117,7 +117,7 @@ public function init()
      * @throws EmployeeNotFoundException
      * @throws Exception
      */
-    private function initUserSession(UserInfos $user)
+    private function initUserSession(UserInfo $user)
     {
         $this->oauth2ErrorLog((string) print_r($user, true));
 
@@ -241,13 +241,13 @@ protected function getOauth2Session()
     }
 
     /**
-     * @param UserInfos $user
+     * @param UserInfo $user
      *
      * @return void
      *
      * @throws Exception
      */
-    private function trackLoginEvent(UserInfos $user)
+    private function trackLoginEvent(UserInfo $user)
     {
         if ($this->module->isShopEdition()) {
             $this->analyticsService->identify(
diff --git a/src/Account/Exception/AccountLoginException.php b/src/Account/Exception/AccountLoginException.php
index 2073c4704..6a7c43927 100644
--- a/src/Account/Exception/AccountLoginException.php
+++ b/src/Account/Exception/AccountLoginException.php
@@ -20,12 +20,12 @@
 
 namespace PrestaShop\Module\PsAccounts\Account\Exception;
 
-use PrestaShop\Module\PsAccounts\Api\Client\OAuth2\UserInfos;
+use PrestaShop\Module\PsAccounts\Api\Client\OAuth2\UserInfo;
 
 class AccountLoginException extends \Exception
 {
     /**
-     * @var UserInfos|null
+     * @var UserInfo|null
      */
     protected $user;
 
@@ -36,12 +36,12 @@ class AccountLoginException extends \Exception
 
     /**
      * @param string $message
-     * @param UserInfos|null $user
+     * @param UserInfo|null $user
      * @param \Exception $previous
      */
     public function __construct(
         $message = '',
-        UserInfos $user = null,
+        UserInfo $user = null,
         \Exception $previous = null
     ) {
         parent::__construct($message, 0, $previous);
@@ -50,7 +50,7 @@ public function __construct(
     }
 
     /**
-     * @return UserInfos|null
+     * @return UserInfo|null
      */
     public function getUser()
     {
diff --git a/src/Account/Exception/EmailNotVerifiedException.php b/src/Account/Exception/EmailNotVerifiedException.php
index b05b98fa6..817910ac8 100644
--- a/src/Account/Exception/EmailNotVerifiedException.php
+++ b/src/Account/Exception/EmailNotVerifiedException.php
@@ -20,18 +20,18 @@
 
 namespace PrestaShop\Module\PsAccounts\Account\Exception;
 
-use PrestaShop\Module\PsAccounts\Api\Client\OAuth2\UserInfos;
+use PrestaShop\Module\PsAccounts\Api\Client\OAuth2\UserInfo;
 
 class EmailNotVerifiedException extends AccountLoginException
 {
     /**
      * @param string $message
-     * @param UserInfos|null $user
+     * @param UserInfo|null $user
      * @param \Exception $previous
      */
     public function __construct(
         $message = 'Your account email is not verified',
-        UserInfos $user = null,
+        UserInfo $user = null,
         \Exception $previous = null
     ) {
         parent::__construct($message, $user, $previous);
diff --git a/src/Account/Exception/EmployeeNotFoundException.php b/src/Account/Exception/EmployeeNotFoundException.php
index 0fc03e41a..1c5c74d12 100644
--- a/src/Account/Exception/EmployeeNotFoundException.php
+++ b/src/Account/Exception/EmployeeNotFoundException.php
@@ -20,18 +20,18 @@
 
 namespace PrestaShop\Module\PsAccounts\Account\Exception;
 
-use PrestaShop\Module\PsAccounts\Api\Client\OAuth2\UserInfos;
+use PrestaShop\Module\PsAccounts\Api\Client\OAuth2\UserInfo;
 
 class EmployeeNotFoundException extends AccountLoginException
 {
     /**
      * @param string $message
-     * @param UserInfos|null $user
+     * @param UserInfo|null $user
      * @param \Exception $previous
      */
     public function __construct(
         $message = 'The email address is not associated to a PrestaShop backoffice account.',
-        UserInfos $user = null,
+        UserInfo $user = null,
         \Exception $previous = null
     ) {
         parent::__construct($message, $user, $previous);
diff --git a/src/Account/Exception/Oauth2LoginException.php b/src/Account/Exception/Oauth2LoginException.php
index c516abedd..ae3229a6c 100644
--- a/src/Account/Exception/Oauth2LoginException.php
+++ b/src/Account/Exception/Oauth2LoginException.php
@@ -20,18 +20,18 @@
 
 namespace PrestaShop\Module\PsAccounts\Account\Exception;
 
-use PrestaShop\Module\PsAccounts\Api\Client\OAuth2\UserInfos;
+use PrestaShop\Module\PsAccounts\Api\Client\OAuth2\UserInfo;
 
 class Oauth2LoginException extends AccountLoginException
 {
     /**
      * @param string $message
-     * @param UserInfos|null $user
+     * @param UserInfo|null $user
      * @param \Exception $previous
      */
     public function __construct(
         $message = 'OAuth2 error',
-        UserInfos $user = null,
+        UserInfo $user = null,
         \Exception $previous = null
     ) {
         parent::__construct($message, $user, $previous);
diff --git a/src/Api/Client/OAuth2/OAuth2ApiClient.php b/src/Api/Client/OAuth2/OAuth2ApiClient.php
index 6fd4b15fe..691524e3d 100644
--- a/src/Api/Client/OAuth2/OAuth2ApiClient.php
+++ b/src/Api/Client/OAuth2/OAuth2ApiClient.php
@@ -358,9 +358,9 @@ public function refreshAccessToken($refreshToken)
     /**
      * @param string $accessToken
      *
-     * @return UserInfos
+     * @return UserInfo
      */
-    public function getUserInfos($accessToken)
+    public function getUserInfo($accessToken)
     {
         /** @var Response $response */
         $response = $this->getClient()->get(
@@ -376,7 +376,7 @@ public function getUserInfos($accessToken)
             throw new OAuth2Exception('Unable to get user infos');
         }
 
-        return new UserInfos($response->body);
+        return new UserInfo($response->body);
     }
 
     /**
diff --git a/src/Api/Client/OAuth2/PrestaShopLoginTrait.php b/src/Api/Client/OAuth2/PrestaShopLoginTrait.php
index b708aaec1..b34a35804 100644
--- a/src/Api/Client/OAuth2/PrestaShopLoginTrait.php
+++ b/src/Api/Client/OAuth2/PrestaShopLoginTrait.php
@@ -35,11 +35,11 @@ trait PrestaShopLoginTrait
     abstract protected function getOAuth2Client();
 
     /**
-     * @param UserInfos $user
+     * @param UserInfo $user
      *
      * @return bool
      */
-    abstract protected function initUserSession(UserInfos $user);
+    abstract protected function initUserSession(UserInfo $user);
 
     /**
      * @return void
diff --git a/src/Api/Client/OAuth2/PrestaShopSession.php b/src/Api/Client/OAuth2/PrestaShopSession.php
index 0a37a04a8..6ec4707f4 100644
--- a/src/Api/Client/OAuth2/PrestaShopSession.php
+++ b/src/Api/Client/OAuth2/PrestaShopSession.php
@@ -106,11 +106,11 @@ public function isAuthenticated()
     }
 
     /**
-     * @return UserInfos
+     * @return UserInfo
      */
     public function getPrestashopUser()
     {
-        return $this->oauth2ApiClient->getUserInfos($this->getAccessToken());
+        return $this->oauth2ApiClient->getUserInfo($this->getAccessToken());
     }
 
     /**
diff --git a/src/Api/Client/OAuth2/UserInfos.php b/src/Api/Client/OAuth2/UserInfo.php
similarity index 98%
rename from src/Api/Client/OAuth2/UserInfos.php
rename to src/Api/Client/OAuth2/UserInfo.php
index 6467ebbd3..06637d3bd 100644
--- a/src/Api/Client/OAuth2/UserInfos.php
+++ b/src/Api/Client/OAuth2/UserInfo.php
@@ -29,7 +29,7 @@
 //     [rat] => 1736251522
 //     [sub] => 4rFN5bm2piPeYpsotUIwcyabcdeF
 // )  [] []
-class UserInfos
+class UserInfo
 {
     /**
      * @var string

From 80c2c8ea33879f1fef2f6286de39d1cc12881faa Mon Sep 17 00:00:00 2001
From: hschoenenberger <herve.schoenenberger@prestashop.com>
Date: Thu, 16 Jan 2025 18:01:12 +0100
Subject: [PATCH 39/46] fix: update header-stamps

---
 composer.json                                 |  2 +-
 src/Api/Client/OAuth2/AccessToken.php         | 19 +++++++++++++++++++
 src/Api/Client/OAuth2/CachedFile.php          | 19 +++++++++++++++++++
 src/Api/Client/OAuth2/OAuth2Exception.php     | 19 +++++++++++++++++++
 src/Api/Client/OAuth2/UserInfo.php            | 19 +++++++++++++++++++
 src/Api/Client/OAuth2/WellKnown.php           | 19 +++++++++++++++++++
 .../CircuitBreakerException.php               | 19 +++++++++++++++++++
 src/Http/Client/Options.php                   | 19 +++++++++++++++++++
 src/Http/Client/Response.php                  | 19 +++++++++++++++++++
 9 files changed, 153 insertions(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index e6abeb43b..0d79d9e7d 100644
--- a/composer.json
+++ b/composer.json
@@ -52,4 +52,4 @@
         }
     ],
     "author": "PrestaShop"
-}
+}
\ No newline at end of file
diff --git a/src/Api/Client/OAuth2/AccessToken.php b/src/Api/Client/OAuth2/AccessToken.php
index a827cfde8..f4b87c960 100644
--- a/src/Api/Client/OAuth2/AccessToken.php
+++ b/src/Api/Client/OAuth2/AccessToken.php
@@ -1,4 +1,23 @@
 <?php
+/**
+ * Copyright since 2007 PrestaShop SA and Contributors
+ * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License version 3.0
+ * that is bundled with this package in the file LICENSE.md.
+ * It is also available through the world-wide-web at this URL:
+ * https://opensource.org/licenses/AFL-3.0
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@prestashop.com so we can send you a copy immediately.
+ *
+ * @author    PrestaShop SA and Contributors <contact@prestashop.com>
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license   https://opensource.org/licenses/AFL-3.0 Academic Free License version 3.0
+ */
+
 
 namespace PrestaShop\Module\PsAccounts\Api\Client\OAuth2;
 
diff --git a/src/Api/Client/OAuth2/CachedFile.php b/src/Api/Client/OAuth2/CachedFile.php
index 2d2b7f848..f2cb315b3 100644
--- a/src/Api/Client/OAuth2/CachedFile.php
+++ b/src/Api/Client/OAuth2/CachedFile.php
@@ -1,4 +1,23 @@
 <?php
+/**
+ * Copyright since 2007 PrestaShop SA and Contributors
+ * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License version 3.0
+ * that is bundled with this package in the file LICENSE.md.
+ * It is also available through the world-wide-web at this URL:
+ * https://opensource.org/licenses/AFL-3.0
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@prestashop.com so we can send you a copy immediately.
+ *
+ * @author    PrestaShop SA and Contributors <contact@prestashop.com>
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license   https://opensource.org/licenses/AFL-3.0 Academic Free License version 3.0
+ */
+
 
 namespace PrestaShop\Module\PsAccounts\Api\Client\OAuth2;
 
diff --git a/src/Api/Client/OAuth2/OAuth2Exception.php b/src/Api/Client/OAuth2/OAuth2Exception.php
index d0a0ade39..9d9e50221 100644
--- a/src/Api/Client/OAuth2/OAuth2Exception.php
+++ b/src/Api/Client/OAuth2/OAuth2Exception.php
@@ -1,4 +1,23 @@
 <?php
+/**
+ * Copyright since 2007 PrestaShop SA and Contributors
+ * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License version 3.0
+ * that is bundled with this package in the file LICENSE.md.
+ * It is also available through the world-wide-web at this URL:
+ * https://opensource.org/licenses/AFL-3.0
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@prestashop.com so we can send you a copy immediately.
+ *
+ * @author    PrestaShop SA and Contributors <contact@prestashop.com>
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license   https://opensource.org/licenses/AFL-3.0 Academic Free License version 3.0
+ */
+
 
 namespace PrestaShop\Module\PsAccounts\Api\Client\OAuth2;
 
diff --git a/src/Api/Client/OAuth2/UserInfo.php b/src/Api/Client/OAuth2/UserInfo.php
index 06637d3bd..168dc3ee6 100644
--- a/src/Api/Client/OAuth2/UserInfo.php
+++ b/src/Api/Client/OAuth2/UserInfo.php
@@ -1,4 +1,23 @@
 <?php
+/**
+ * Copyright since 2007 PrestaShop SA and Contributors
+ * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License version 3.0
+ * that is bundled with this package in the file LICENSE.md.
+ * It is also available through the world-wide-web at this URL:
+ * https://opensource.org/licenses/AFL-3.0
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@prestashop.com so we can send you a copy immediately.
+ *
+ * @author    PrestaShop SA and Contributors <contact@prestashop.com>
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license   https://opensource.org/licenses/AFL-3.0 Academic Free License version 3.0
+ */
+
 
 namespace PrestaShop\Module\PsAccounts\Api\Client\OAuth2;
 
diff --git a/src/Api/Client/OAuth2/WellKnown.php b/src/Api/Client/OAuth2/WellKnown.php
index dfc3f023a..160cfd816 100644
--- a/src/Api/Client/OAuth2/WellKnown.php
+++ b/src/Api/Client/OAuth2/WellKnown.php
@@ -1,4 +1,23 @@
 <?php
+/**
+ * Copyright since 2007 PrestaShop SA and Contributors
+ * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License version 3.0
+ * that is bundled with this package in the file LICENSE.md.
+ * It is also available through the world-wide-web at this URL:
+ * https://opensource.org/licenses/AFL-3.0
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@prestashop.com so we can send you a copy immediately.
+ *
+ * @author    PrestaShop SA and Contributors <contact@prestashop.com>
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license   https://opensource.org/licenses/AFL-3.0 Academic Free License version 3.0
+ */
+
 
 namespace PrestaShop\Module\PsAccounts\Api\Client\OAuth2;
 
diff --git a/src/Http/Client/CircuitBreaker/CircuitBreakerException.php b/src/Http/Client/CircuitBreaker/CircuitBreakerException.php
index 2aa14703e..107a1d4f2 100644
--- a/src/Http/Client/CircuitBreaker/CircuitBreakerException.php
+++ b/src/Http/Client/CircuitBreaker/CircuitBreakerException.php
@@ -1,4 +1,23 @@
 <?php
+/**
+ * Copyright since 2007 PrestaShop SA and Contributors
+ * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License version 3.0
+ * that is bundled with this package in the file LICENSE.md.
+ * It is also available through the world-wide-web at this URL:
+ * https://opensource.org/licenses/AFL-3.0
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@prestashop.com so we can send you a copy immediately.
+ *
+ * @author    PrestaShop SA and Contributors <contact@prestashop.com>
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license   https://opensource.org/licenses/AFL-3.0 Academic Free License version 3.0
+ */
+
 
 namespace PrestaShop\Module\PsAccounts\Http\Client\CircuitBreaker;
 
diff --git a/src/Http/Client/Options.php b/src/Http/Client/Options.php
index 877d7bc83..7385436c6 100644
--- a/src/Http/Client/Options.php
+++ b/src/Http/Client/Options.php
@@ -1,4 +1,23 @@
 <?php
+/**
+ * Copyright since 2007 PrestaShop SA and Contributors
+ * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License version 3.0
+ * that is bundled with this package in the file LICENSE.md.
+ * It is also available through the world-wide-web at this URL:
+ * https://opensource.org/licenses/AFL-3.0
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@prestashop.com so we can send you a copy immediately.
+ *
+ * @author    PrestaShop SA and Contributors <contact@prestashop.com>
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license   https://opensource.org/licenses/AFL-3.0 Academic Free License version 3.0
+ */
+
 
 namespace PrestaShop\Module\PsAccounts\Http\Client;
 
diff --git a/src/Http/Client/Response.php b/src/Http/Client/Response.php
index dc767073b..9fb35f206 100644
--- a/src/Http/Client/Response.php
+++ b/src/Http/Client/Response.php
@@ -1,4 +1,23 @@
 <?php
+/**
+ * Copyright since 2007 PrestaShop SA and Contributors
+ * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License version 3.0
+ * that is bundled with this package in the file LICENSE.md.
+ * It is also available through the world-wide-web at this URL:
+ * https://opensource.org/licenses/AFL-3.0
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@prestashop.com so we can send you a copy immediately.
+ *
+ * @author    PrestaShop SA and Contributors <contact@prestashop.com>
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license   https://opensource.org/licenses/AFL-3.0 Academic Free License version 3.0
+ */
+
 
 namespace PrestaShop\Module\PsAccounts\Http\Client;
 

From ae365104015963b55b1896e8ea18cdae6bbf7abf Mon Sep 17 00:00:00 2001
From: hschoenenberger <herve.schoenenberger@prestashop.com>
Date: Thu, 16 Jan 2025 18:09:45 +0100
Subject: [PATCH 40/46] fix: php-cs-fixer

---
 src/Api/Client/OAuth2/AccessToken.php                      | 1 -
 src/Api/Client/OAuth2/CachedFile.php                       | 1 -
 src/Api/Client/OAuth2/OAuth2Exception.php                  | 1 -
 src/Api/Client/OAuth2/UserInfo.php                         | 1 -
 src/Api/Client/OAuth2/WellKnown.php                        | 1 -
 src/Http/Client/CircuitBreaker/CircuitBreakerException.php | 1 -
 src/Http/Client/Options.php                                | 1 -
 src/Http/Client/Response.php                               | 1 -
 8 files changed, 8 deletions(-)

diff --git a/src/Api/Client/OAuth2/AccessToken.php b/src/Api/Client/OAuth2/AccessToken.php
index f4b87c960..ce7fe715b 100644
--- a/src/Api/Client/OAuth2/AccessToken.php
+++ b/src/Api/Client/OAuth2/AccessToken.php
@@ -18,7 +18,6 @@
  * @license   https://opensource.org/licenses/AFL-3.0 Academic Free License version 3.0
  */
 
-
 namespace PrestaShop\Module\PsAccounts\Api\Client\OAuth2;
 
 use PrestaShop\Module\PsAccounts\Account\Token\Token;
diff --git a/src/Api/Client/OAuth2/CachedFile.php b/src/Api/Client/OAuth2/CachedFile.php
index f2cb315b3..b1296705f 100644
--- a/src/Api/Client/OAuth2/CachedFile.php
+++ b/src/Api/Client/OAuth2/CachedFile.php
@@ -18,7 +18,6 @@
  * @license   https://opensource.org/licenses/AFL-3.0 Academic Free License version 3.0
  */
 
-
 namespace PrestaShop\Module\PsAccounts\Api\Client\OAuth2;
 
 class CachedFile
diff --git a/src/Api/Client/OAuth2/OAuth2Exception.php b/src/Api/Client/OAuth2/OAuth2Exception.php
index 9d9e50221..33f737930 100644
--- a/src/Api/Client/OAuth2/OAuth2Exception.php
+++ b/src/Api/Client/OAuth2/OAuth2Exception.php
@@ -18,7 +18,6 @@
  * @license   https://opensource.org/licenses/AFL-3.0 Academic Free License version 3.0
  */
 
-
 namespace PrestaShop\Module\PsAccounts\Api\Client\OAuth2;
 
 class OAuth2Exception extends \Exception
diff --git a/src/Api/Client/OAuth2/UserInfo.php b/src/Api/Client/OAuth2/UserInfo.php
index 168dc3ee6..4a0989634 100644
--- a/src/Api/Client/OAuth2/UserInfo.php
+++ b/src/Api/Client/OAuth2/UserInfo.php
@@ -18,7 +18,6 @@
  * @license   https://opensource.org/licenses/AFL-3.0 Academic Free License version 3.0
  */
 
-
 namespace PrestaShop\Module\PsAccounts\Api\Client\OAuth2;
 
 // [OAuth2] stdClass Object (
diff --git a/src/Api/Client/OAuth2/WellKnown.php b/src/Api/Client/OAuth2/WellKnown.php
index 160cfd816..918f13d96 100644
--- a/src/Api/Client/OAuth2/WellKnown.php
+++ b/src/Api/Client/OAuth2/WellKnown.php
@@ -18,7 +18,6 @@
  * @license   https://opensource.org/licenses/AFL-3.0 Academic Free License version 3.0
  */
 
-
 namespace PrestaShop\Module\PsAccounts\Api\Client\OAuth2;
 
 /**
diff --git a/src/Http/Client/CircuitBreaker/CircuitBreakerException.php b/src/Http/Client/CircuitBreaker/CircuitBreakerException.php
index 107a1d4f2..6ba72102f 100644
--- a/src/Http/Client/CircuitBreaker/CircuitBreakerException.php
+++ b/src/Http/Client/CircuitBreaker/CircuitBreakerException.php
@@ -18,7 +18,6 @@
  * @license   https://opensource.org/licenses/AFL-3.0 Academic Free License version 3.0
  */
 
-
 namespace PrestaShop\Module\PsAccounts\Http\Client\CircuitBreaker;
 
 class CircuitBreakerException extends \Exception
diff --git a/src/Http/Client/Options.php b/src/Http/Client/Options.php
index 7385436c6..73fc04b1b 100644
--- a/src/Http/Client/Options.php
+++ b/src/Http/Client/Options.php
@@ -18,7 +18,6 @@
  * @license   https://opensource.org/licenses/AFL-3.0 Academic Free License version 3.0
  */
 
-
 namespace PrestaShop\Module\PsAccounts\Http\Client;
 
 class Options
diff --git a/src/Http/Client/Response.php b/src/Http/Client/Response.php
index 9fb35f206..9705f425d 100644
--- a/src/Http/Client/Response.php
+++ b/src/Http/Client/Response.php
@@ -18,7 +18,6 @@
  * @license   https://opensource.org/licenses/AFL-3.0 Academic Free License version 3.0
  */
 
-
 namespace PrestaShop\Module\PsAccounts\Http\Client;
 
 class Response

From 47a4844887cdc050ce2a077eb51e87d942a6c4ff Mon Sep 17 00:00:00 2001
From: hschoenenberger <herve.schoenenberger@prestashop.com>
Date: Fri, 17 Jan 2025 09:38:20 +0100
Subject: [PATCH 41/46] chore: bump to milestone

---
 _dev/package.json | 2 +-
 config.xml        | 2 +-
 ps_accounts.php   | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/_dev/package.json b/_dev/package.json
index 1434ea419..4fb148fce 100644
--- a/_dev/package.json
+++ b/_dev/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ps_accounts",
-  "version": "7.0.9",
+  "version": "7.2.0",
   "private": true,
   "scripts": {
     "dev": "vite",
diff --git a/config.xml b/config.xml
index 2469e908f..1a4da9506 100644
--- a/config.xml
+++ b/config.xml
@@ -2,7 +2,7 @@
 <module>
     <name>ps_accounts</name>
     <displayName><![CDATA[PrestaShop Account]]></displayName>
-    <version><![CDATA[7.0.9]]></version>
+    <version><![CDATA[7.2.0]]></version>
     <description><![CDATA[Link your store to your PrestaShop account to activate and manage your subscriptions in your back office. Do not uninstall this module if you have a current subscription.]]></description>
     <author><![CDATA[PrestaShop]]></author>
     <tab><![CDATA[administration]]></tab>
diff --git a/ps_accounts.php b/ps_accounts.php
index 2d218bd90..73d98dab3 100644
--- a/ps_accounts.php
+++ b/ps_accounts.php
@@ -34,7 +34,7 @@ class Ps_accounts extends Module
 
     // Needed in order to retrieve the module version easier (in api call headers) than instanciate
     // the module each time to get the version
-    const VERSION = '7.0.9';
+    const VERSION = '7.2.0';
 
     /**
      * Admin tabs
@@ -131,7 +131,7 @@ public function __construct()
 
         // We cannot use the const VERSION because the const is not computed by addons marketplace
         // when the zip is uploaded
-        $this->version = '7.0.9';
+        $this->version = '7.2.0';
 
         $this->module_key = 'abf2cd758b4d629b2944d3922ef9db73';
 

From a04864eaaa5089bc6f5593216c08cd23ab59cb26 Mon Sep 17 00:00:00 2001
From: hschoenenberger <herve.schoenenberger@prestashop.com>
Date: Fri, 17 Jan 2025 17:49:53 +0100
Subject: [PATCH 42/46] refactor: move responses objects

---
 Makefile                                      |  1 +
 .../admin/AdminOAuth2PsAccountsController.php |  2 +-
 .../Exception/AccountLoginException.php       |  2 +-
 .../Exception/EmailNotVerifiedException.php   |  2 +-
 .../Exception/EmployeeNotFoundException.php   |  2 +-
 .../Exception/Oauth2LoginException.php        |  2 +-
 src/Account/Session/ShopSession.php           |  2 +-
 src/Api/Client/OAuth2/OAuth2ApiClient.php     |  3 ++
 .../Client/OAuth2/PrestaShopLoginTrait.php    |  1 +
 src/Api/Client/OAuth2/PrestaShopSession.php   |  2 ++
 .../OAuth2/{ => Response}/AccessToken.php     | 17 ++-------
 .../Client/OAuth2/{ => Response}/UserInfo.php | 18 +++-------
 .../OAuth2/{ => Response}/WellKnown.php       | 18 +++-------
 src/Api/Client/Response.php                   | 36 +++++++++++++++++++
 src/ServiceProvider/ApiClientProvider.php     |  3 +-
 .../Session/ShopSession/RefreshTokenTest.php  |  2 +-
 16 files changed, 63 insertions(+), 50 deletions(-)
 rename src/Api/Client/OAuth2/{ => Response}/AccessToken.php (82%)
 rename src/Api/Client/OAuth2/{ => Response}/UserInfo.php (86%)
 rename src/Api/Client/OAuth2/{ => Response}/WellKnown.php (92%)
 create mode 100644 src/Api/Client/Response.php

diff --git a/Makefile b/Makefile
index ac7e2d8f5..d0bb2dafc 100644
--- a/Makefile
+++ b/Makefile
@@ -282,6 +282,7 @@ bundle-preprod: php-scoper config.php.preprod build-front
 
 define build_front
 	rm -f ./views/js/app.*.js
+	rm -f ./views/css/app.*.css
 	yarn --cwd ./_dev --frozen-lockfile
 	yarn --cwd ./_dev build
 endef
diff --git a/controllers/admin/AdminOAuth2PsAccountsController.php b/controllers/admin/AdminOAuth2PsAccountsController.php
index 2402064dc..7f7bac7ac 100644
--- a/controllers/admin/AdminOAuth2PsAccountsController.php
+++ b/controllers/admin/AdminOAuth2PsAccountsController.php
@@ -24,7 +24,7 @@
 use PrestaShop\Module\PsAccounts\Api\Client\OAuth2\OAuth2ApiClient;
 use PrestaShop\Module\PsAccounts\Api\Client\OAuth2\PrestaShopLoginTrait;
 use PrestaShop\Module\PsAccounts\Api\Client\OAuth2\PrestaShopSession;
-use PrestaShop\Module\PsAccounts\Api\Client\OAuth2\UserInfo;
+use PrestaShop\Module\PsAccounts\Api\Client\OAuth2\Response\UserInfo;
 use PrestaShop\Module\PsAccounts\Entity\EmployeeAccount;
 use PrestaShop\Module\PsAccounts\Polyfill\Traits\AdminController\IsAnonymousAllowed;
 use PrestaShop\Module\PsAccounts\Repository\EmployeeAccountRepository;
diff --git a/src/Account/Exception/AccountLoginException.php b/src/Account/Exception/AccountLoginException.php
index 6a7c43927..4f62ddb4f 100644
--- a/src/Account/Exception/AccountLoginException.php
+++ b/src/Account/Exception/AccountLoginException.php
@@ -20,7 +20,7 @@
 
 namespace PrestaShop\Module\PsAccounts\Account\Exception;
 
-use PrestaShop\Module\PsAccounts\Api\Client\OAuth2\UserInfo;
+use PrestaShop\Module\PsAccounts\Api\Client\OAuth2\Response\UserInfo;
 
 class AccountLoginException extends \Exception
 {
diff --git a/src/Account/Exception/EmailNotVerifiedException.php b/src/Account/Exception/EmailNotVerifiedException.php
index 817910ac8..790c783d2 100644
--- a/src/Account/Exception/EmailNotVerifiedException.php
+++ b/src/Account/Exception/EmailNotVerifiedException.php
@@ -20,7 +20,7 @@
 
 namespace PrestaShop\Module\PsAccounts\Account\Exception;
 
-use PrestaShop\Module\PsAccounts\Api\Client\OAuth2\UserInfo;
+use PrestaShop\Module\PsAccounts\Api\Client\OAuth2\Response\UserInfo;
 
 class EmailNotVerifiedException extends AccountLoginException
 {
diff --git a/src/Account/Exception/EmployeeNotFoundException.php b/src/Account/Exception/EmployeeNotFoundException.php
index 1c5c74d12..0201ddfb8 100644
--- a/src/Account/Exception/EmployeeNotFoundException.php
+++ b/src/Account/Exception/EmployeeNotFoundException.php
@@ -20,7 +20,7 @@
 
 namespace PrestaShop\Module\PsAccounts\Account\Exception;
 
-use PrestaShop\Module\PsAccounts\Api\Client\OAuth2\UserInfo;
+use PrestaShop\Module\PsAccounts\Api\Client\OAuth2\Response\UserInfo;
 
 class EmployeeNotFoundException extends AccountLoginException
 {
diff --git a/src/Account/Exception/Oauth2LoginException.php b/src/Account/Exception/Oauth2LoginException.php
index ae3229a6c..1cc3b8a8d 100644
--- a/src/Account/Exception/Oauth2LoginException.php
+++ b/src/Account/Exception/Oauth2LoginException.php
@@ -20,7 +20,7 @@
 
 namespace PrestaShop\Module\PsAccounts\Account\Exception;
 
-use PrestaShop\Module\PsAccounts\Api\Client\OAuth2\UserInfo;
+use PrestaShop\Module\PsAccounts\Api\Client\OAuth2\Response\UserInfo;
 
 class Oauth2LoginException extends AccountLoginException
 {
diff --git a/src/Account/Session/ShopSession.php b/src/Account/Session/ShopSession.php
index 05eafdd04..f7fafdda0 100644
--- a/src/Account/Session/ShopSession.php
+++ b/src/Account/Session/ShopSession.php
@@ -25,8 +25,8 @@
 use PrestaShop\Module\PsAccounts\Account\Exception\RefreshTokenException;
 use PrestaShop\Module\PsAccounts\Account\LinkShop;
 use PrestaShop\Module\PsAccounts\Account\Token\Token;
-use PrestaShop\Module\PsAccounts\Api\Client\OAuth2\AccessToken;
 use PrestaShop\Module\PsAccounts\Api\Client\OAuth2\OAuth2ApiClient;
+use PrestaShop\Module\PsAccounts\Api\Client\OAuth2\Response\AccessToken;
 use PrestaShop\Module\PsAccounts\Cqrs\CommandBus;
 use PrestaShop\Module\PsAccounts\Hook\ActionShopAccessTokenRefreshAfter;
 use PrestaShop\Module\PsAccounts\Repository\ConfigurationRepository;
diff --git a/src/Api/Client/OAuth2/OAuth2ApiClient.php b/src/Api/Client/OAuth2/OAuth2ApiClient.php
index 691524e3d..90f3a9a12 100644
--- a/src/Api/Client/OAuth2/OAuth2ApiClient.php
+++ b/src/Api/Client/OAuth2/OAuth2ApiClient.php
@@ -22,6 +22,9 @@
 
 use PrestaShop\Module\PsAccounts\Adapter\Link;
 use PrestaShop\Module\PsAccounts\Api\Client\OAuth2\OAuth2Client as OauthClient;
+use PrestaShop\Module\PsAccounts\Api\Client\OAuth2\Response\AccessToken;
+use PrestaShop\Module\PsAccounts\Api\Client\OAuth2\Response\UserInfo;
+use PrestaShop\Module\PsAccounts\Api\Client\OAuth2\Response\WellKnown;
 use PrestaShop\Module\PsAccounts\Http\Client\Curl\Client;
 use PrestaShop\Module\PsAccounts\Http\Client\Factory;
 use PrestaShop\Module\PsAccounts\Http\Client\Options;
diff --git a/src/Api/Client/OAuth2/PrestaShopLoginTrait.php b/src/Api/Client/OAuth2/PrestaShopLoginTrait.php
index b34a35804..504ae159b 100644
--- a/src/Api/Client/OAuth2/PrestaShopLoginTrait.php
+++ b/src/Api/Client/OAuth2/PrestaShopLoginTrait.php
@@ -23,6 +23,7 @@
 use PrestaShop\Module\PsAccounts\Account\Exception\EmailNotVerifiedException;
 use PrestaShop\Module\PsAccounts\Account\Exception\EmployeeNotFoundException;
 use PrestaShop\Module\PsAccounts\Account\Exception\Oauth2LoginException;
+use PrestaShop\Module\PsAccounts\Api\Client\OAuth2\Response\UserInfo;
 use PrestaShop\Module\PsAccounts\Log\Logger;
 use Symfony\Component\HttpFoundation\Session\SessionInterface;
 use Tools;
diff --git a/src/Api/Client/OAuth2/PrestaShopSession.php b/src/Api/Client/OAuth2/PrestaShopSession.php
index 6ec4707f4..3acb844b0 100644
--- a/src/Api/Client/OAuth2/PrestaShopSession.php
+++ b/src/Api/Client/OAuth2/PrestaShopSession.php
@@ -20,6 +20,8 @@
 
 namespace PrestaShop\Module\PsAccounts\Api\Client\OAuth2;
 
+use PrestaShop\Module\PsAccounts\Api\Client\OAuth2\Response\AccessToken;
+use PrestaShop\Module\PsAccounts\Api\Client\OAuth2\Response\UserInfo;
 use Symfony\Component\HttpFoundation\Session\SessionInterface;
 
 class PrestaShopSession
diff --git a/src/Api/Client/OAuth2/AccessToken.php b/src/Api/Client/OAuth2/Response/AccessToken.php
similarity index 82%
rename from src/Api/Client/OAuth2/AccessToken.php
rename to src/Api/Client/OAuth2/Response/AccessToken.php
index ce7fe715b..2ef8a95e3 100644
--- a/src/Api/Client/OAuth2/AccessToken.php
+++ b/src/Api/Client/OAuth2/Response/AccessToken.php
@@ -18,11 +18,12 @@
  * @license   https://opensource.org/licenses/AFL-3.0 Academic Free License version 3.0
  */
 
-namespace PrestaShop\Module\PsAccounts\Api\Client\OAuth2;
+namespace PrestaShop\Module\PsAccounts\Api\Client\OAuth2\Response;
 
 use PrestaShop\Module\PsAccounts\Account\Token\Token;
+use PrestaShop\Module\PsAccounts\Api\Client\Response;
 
-class AccessToken
+class AccessToken extends Response
 {
     /**
      * @var string
@@ -64,18 +65,6 @@ class AccessToken
      */
     public $resource_owner_id;
 
-    /**
-     * @param array $data
-     */
-    public function __construct(array $data = [])
-    {
-        foreach ($data as $key => $value) {
-            if (property_exists($this, $key)) {
-                $this->$key = $value;
-            }
-        }
-    }
-
     /**
      * @return bool
      */
diff --git a/src/Api/Client/OAuth2/UserInfo.php b/src/Api/Client/OAuth2/Response/UserInfo.php
similarity index 86%
rename from src/Api/Client/OAuth2/UserInfo.php
rename to src/Api/Client/OAuth2/Response/UserInfo.php
index 4a0989634..6f828b27d 100644
--- a/src/Api/Client/OAuth2/UserInfo.php
+++ b/src/Api/Client/OAuth2/Response/UserInfo.php
@@ -18,7 +18,7 @@
  * @license   https://opensource.org/licenses/AFL-3.0 Academic Free License version 3.0
  */
 
-namespace PrestaShop\Module\PsAccounts\Api\Client\OAuth2;
+namespace PrestaShop\Module\PsAccounts\Api\Client\OAuth2\Response;
 
 // [OAuth2] stdClass Object (
 //     [amr] => Array
@@ -47,7 +47,9 @@
 //     [rat] => 1736251522
 //     [sub] => 4rFN5bm2piPeYpsotUIwcyabcdeF
 // )  [] []
-class UserInfo
+use PrestaShop\Module\PsAccounts\Api\Client\Response;
+
+class UserInfo extends Response
 {
     /**
      * @var string
@@ -83,16 +85,4 @@ class UserInfo
      * @var string
      */
     public $picture;
-
-    /**
-     * @param array $data
-     */
-    public function __construct(array $data = [])
-    {
-        foreach ($data as $key => $value) {
-            if (property_exists($this, $key)) {
-                $this->$key = $value;
-            }
-        }
-    }
 }
diff --git a/src/Api/Client/OAuth2/WellKnown.php b/src/Api/Client/OAuth2/Response/WellKnown.php
similarity index 92%
rename from src/Api/Client/OAuth2/WellKnown.php
rename to src/Api/Client/OAuth2/Response/WellKnown.php
index 918f13d96..b301e4a56 100644
--- a/src/Api/Client/OAuth2/WellKnown.php
+++ b/src/Api/Client/OAuth2/Response/WellKnown.php
@@ -18,7 +18,9 @@
  * @license   https://opensource.org/licenses/AFL-3.0 Academic Free License version 3.0
  */
 
-namespace PrestaShop\Module\PsAccounts\Api\Client\OAuth2;
+namespace PrestaShop\Module\PsAccounts\Api\Client\OAuth2\Response;
+
+use PrestaShop\Module\PsAccounts\Api\Client\Response;
 
 /**
  * {
@@ -52,7 +54,7 @@
  *  "code_challenge_methods_supported":["plain","S256"]
  * }
  */
-class WellKnown
+class WellKnown extends Response
 {
     /** @var string */
     public $issuer;
@@ -137,16 +139,4 @@ class WellKnown
 
     /** @var array */
     public $code_challenge_methods_supported;
-
-    /**
-     * @param array $data WellKnown data
-     */
-    public function __construct(array $data = [])
-    {
-        foreach ($data as $key => $value) {
-            if (property_exists($this, $key)) {
-                $this->$key = $value;
-            }
-        }
-    }
 }
diff --git a/src/Api/Client/Response.php b/src/Api/Client/Response.php
new file mode 100644
index 000000000..c0c0536e1
--- /dev/null
+++ b/src/Api/Client/Response.php
@@ -0,0 +1,36 @@
+<?php
+/**
+ * Copyright since 2007 PrestaShop SA and Contributors
+ * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License version 3.0
+ * that is bundled with this package in the file LICENSE.md.
+ * It is also available through the world-wide-web at this URL:
+ * https://opensource.org/licenses/AFL-3.0
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@prestashop.com so we can send you a copy immediately.
+ *
+ * @author    PrestaShop SA and Contributors <contact@prestashop.com>
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license   https://opensource.org/licenses/AFL-3.0 Academic Free License version 3.0
+ */
+
+namespace PrestaShop\Module\PsAccounts\Api\Client;
+
+abstract class Response
+{
+    /**
+     * @param array $data
+     */
+    public function __construct(array $data = [])
+    {
+        foreach ($data as $key => $value) {
+            if (property_exists($this, $key)) {
+                $this->$key = $value;
+            }
+        }
+    }
+}
diff --git a/src/ServiceProvider/ApiClientProvider.php b/src/ServiceProvider/ApiClientProvider.php
index 039b9b9b1..f76941837 100644
--- a/src/ServiceProvider/ApiClientProvider.php
+++ b/src/ServiceProvider/ApiClientProvider.php
@@ -23,6 +23,7 @@
 use PrestaShop\Module\PsAccounts\Adapter\Link;
 use PrestaShop\Module\PsAccounts\Api\Client\AccountsClient;
 use PrestaShop\Module\PsAccounts\Api\Client\OAuth2\OAuth2ApiClient;
+use PrestaShop\Module\PsAccounts\Api\Client\OAuth2\OAuth2Client;
 use PrestaShop\Module\PsAccounts\Api\Client\ServicesBillingClient;
 use PrestaShop\Module\PsAccounts\Provider\ShopProvider;
 use PrestaShop\Module\PsAccounts\Service\PsAccountsService;
@@ -48,7 +49,7 @@ public function provide(ServiceContainer $container)
         $container->registerProvider(OAuth2ApiClient::class, static function () use ($container) {
             return new OAuth2ApiClient(
                 $container->getParameter('ps_accounts.oauth2_url'),
-                $container->get(\PrestaShop\Module\PsAccounts\Api\Client\OAuth2\OAuth2Client::class),
+                $container->get(OAuth2Client::class),
                 $container->get(Link::class),
                 _PS_CACHE_DIR_ . DIRECTORY_SEPARATOR . 'ps_accounts',
                 10,
diff --git a/tests/Unit/Account/Session/ShopSession/RefreshTokenTest.php b/tests/Unit/Account/Session/ShopSession/RefreshTokenTest.php
index f726eec88..6fc7b45ae 100644
--- a/tests/Unit/Account/Session/ShopSession/RefreshTokenTest.php
+++ b/tests/Unit/Account/Session/ShopSession/RefreshTokenTest.php
@@ -4,7 +4,7 @@
 
 use PrestaShop\Module\PsAccounts\Account\Session\ShopSession;
 use PrestaShop\Module\PsAccounts\Account\Token\Token;
-use PrestaShop\Module\PsAccounts\Api\Client\OAuth2\AccessToken;
+use PrestaShop\Module\PsAccounts\Api\Client\OAuth2\Response\AccessToken;
 use PrestaShop\Module\PsAccounts\Api\Client\OAuth2\OAuth2ApiClient;
 use PrestaShop\Module\PsAccounts\Cqrs\CommandBus;
 use PrestaShop\Module\PsAccounts\Account\Exception\RefreshTokenException;

From 20fa349d45020faae9d290772aa89af6d08b1f24 Mon Sep 17 00:00:00 2001
From: hschoenenberger <herve.schoenenberger@prestashop.com>
Date: Mon, 20 Jan 2025 11:35:51 +0100
Subject: [PATCH 43/46] refactor: extract AccountLogin domain

---
 .../admin/AdminAjaxPsAccountsController.php   |  8 +-
 .../admin/AdminLoginPsAccountsController.php  |  6 +-
 .../admin/AdminOAuth2PsAccountsController.php | 24 +++---
 controllers/front/apiV1ShopOauth2Client.php   |  6 +-
 controllers/front/apiV2ShopHealthCheck.php    | 12 +--
 ps_accounts.php                               |  4 +-
 src/Account/Session/ShopSession.php           | 12 +--
 .../Exception/AccountLoginException.php       |  4 +-
 .../Exception/EmailNotVerifiedException.php   |  4 +-
 .../Exception/EmployeeNotFoundException.php   |  4 +-
 .../Exception/Oauth2LoginException.php        |  4 +-
 .../Middleware/Oauth2Middleware.php           | 18 ++--
 .../OAuth2LoginTrait.php}                     | 20 +++--
 .../OAuth2LogoutTrait.php}                    | 12 +--
 .../OAuth2Session.php}                        | 22 ++---
 src/Hook/ActionShopAccountUnlinkAfter.php     |  6 +-
 src/Http/Client/CircuitBreaker/Factory.php    |  4 +-
 src/Http/Client/Curl/Client.php               | 15 +++-
 .../ApiClient.php}                            | 86 ++++++++-----------
 src/{Api/Client => }/OAuth2/CachedFile.php    |  2 +-
 .../OAuth2Client.php => OAuth2/Client.php}    |  4 +-
 .../Client => }/OAuth2/OAuth2Exception.php    |  2 +-
 .../OAuth2/Response/AccessToken.php           |  3 +-
 .../Client => OAuth2/Response}/Response.php   |  2 +-
 .../Client => }/OAuth2/Response/UserInfo.php  |  3 +-
 .../Client => }/OAuth2/Response/WellKnown.php |  4 +-
 src/ServiceProvider/ApiClientProvider.php     | 13 ---
 src/ServiceProvider/OAuth2Provider.php        | 31 ++++---
 src/ServiceProvider/SessionProvider.php       |  4 +-
 .../Api/v1/ShopOauth2Client/DeleteTest.php    |  4 +-
 .../Api/v1/ShopOauth2Client/StoreTest.php     |  4 +-
 .../OwnerSession/GetValidTokenTest.php        |  4 +-
 .../OwnerSession/RefreshTokenTest.php         |  4 +-
 .../ShopSession/GetValidTokenTest.php         |  4 +-
 .../Firebase/ShopSession/RefreshTokenTest.php |  4 +-
 .../Session/ShopSession/RefreshTokenTest.php  | 12 +--
 .../GetOrRefreshTokenTest.php                 |  4 +-
 37 files changed, 191 insertions(+), 188 deletions(-)
 rename src/{Account => AccountLogin}/Exception/AccountLoginException.php (92%)
 rename src/{Account => AccountLogin}/Exception/EmailNotVerifiedException.php (90%)
 rename src/{Account => AccountLogin}/Exception/EmployeeNotFoundException.php (91%)
 rename src/{Account => AccountLogin}/Exception/Oauth2LoginException.php (90%)
 rename src/{ => AccountLogin}/Middleware/Oauth2Middleware.php (85%)
 rename src/{Api/Client/OAuth2/PrestaShopLoginTrait.php => AccountLogin/OAuth2LoginTrait.php} (88%)
 rename src/{Api/Client/OAuth2/PrestaShopLogoutTrait.php => AccountLogin/OAuth2LogoutTrait.php} (88%)
 rename src/{Api/Client/OAuth2/PrestaShopSession.php => AccountLogin/OAuth2Session.php} (84%)
 rename src/{Api/Client/OAuth2/OAuth2ApiClient.php => OAuth2/ApiClient.php} (83%)
 rename src/{Api/Client => }/OAuth2/CachedFile.php (98%)
 rename src/{Api/Client/OAuth2/OAuth2Client.php => OAuth2/Client.php} (96%)
 rename src/{Api/Client => }/OAuth2/OAuth2Exception.php (93%)
 rename src/{Api/Client => }/OAuth2/Response/AccessToken.php (92%)
 rename src/{Api/Client => OAuth2/Response}/Response.php (95%)
 rename src/{Api/Client => }/OAuth2/Response/UserInfo.php (94%)
 rename src/{Api/Client => }/OAuth2/Response/WellKnown.php (97%)

diff --git a/controllers/admin/AdminAjaxPsAccountsController.php b/controllers/admin/AdminAjaxPsAccountsController.php
index 707e0f519..f3dfe713c 100644
--- a/controllers/admin/AdminAjaxPsAccountsController.php
+++ b/controllers/admin/AdminAjaxPsAccountsController.php
@@ -22,7 +22,7 @@
 use PrestaShop\Module\PsAccounts\Account\Command\DeleteUserShopCommand;
 use PrestaShop\Module\PsAccounts\Account\Command\UnlinkShopCommand;
 use PrestaShop\Module\PsAccounts\Account\Session\Firebase\ShopSession;
-use PrestaShop\Module\PsAccounts\Api\Client\OAuth2\PrestaShopSession;
+use PrestaShop\Module\PsAccounts\AccountLogin\OAuth2Session;
 use PrestaShop\Module\PsAccounts\Cqrs\CommandBus;
 use PrestaShop\Module\PsAccounts\Polyfill\Traits\Controller\AjaxRender;
 use PrestaShop\Module\PsAccounts\Presenter\PsAccountsPresenter;
@@ -162,14 +162,14 @@ public function ajaxProcessGetContext()
     public function ajaxProcessGetOrRefreshAccessToken()
     {
         try {
-            /** @var PrestaShopSession $oauthSession */
-            $oauthSession = $this->module->getService(PrestaShopSession::class);
+            /** @var OAuth2Session $oauth2Session */
+            $oauth2Session = $this->module->getService(OAuth2Session::class);
 
             header('Content-Type: text/json');
 
             $this->ajaxRender(
                 (string) json_encode([
-                    'token' => (string) $oauthSession->getOrRefreshAccessToken(),
+                    'token' => (string) $oauth2Session->getOrRefreshAccessToken(),
                 ])
             );
         } catch (Exception $e) {
diff --git a/controllers/admin/AdminLoginPsAccountsController.php b/controllers/admin/AdminLoginPsAccountsController.php
index 874ddbee4..5a6437f85 100644
--- a/controllers/admin/AdminLoginPsAccountsController.php
+++ b/controllers/admin/AdminLoginPsAccountsController.php
@@ -18,7 +18,7 @@
  * @license   https://opensource.org/licenses/AFL-3.0 Academic Free License version 3.0
  */
 
-use PrestaShop\Module\PsAccounts\Api\Client\OAuth2\OAuth2ApiClient;
+use PrestaShop\Module\PsAccounts\OAuth2\ApiClient;
 use PrestaShop\Module\PsAccounts\Polyfill\Traits\AdminController\IsAnonymousAllowed;
 
 class AdminLoginPsAccountsController extends \AdminController
@@ -121,8 +121,8 @@ public function setMedia($isNewTheme = false)
      */
     public function createTemplate($tpl_name)
     {
-        /** @var OAuth2ApiClient $provider */
-        $provider = $this->psAccounts->getService(OAuth2ApiClient::class);
+        /** @var ApiClient $provider */
+        $provider = $this->psAccounts->getService(ApiClient::class);
 
         $testimonials = $this->getTestimonials();
 
diff --git a/controllers/admin/AdminOAuth2PsAccountsController.php b/controllers/admin/AdminOAuth2PsAccountsController.php
index 7f7bac7ac..6aa6f1ded 100644
--- a/controllers/admin/AdminOAuth2PsAccountsController.php
+++ b/controllers/admin/AdminOAuth2PsAccountsController.php
@@ -18,14 +18,14 @@
  * @license   https://opensource.org/licenses/AFL-3.0 Academic Free License version 3.0
  */
 
-use PrestaShop\Module\PsAccounts\Account\Exception\AccountLoginException;
-use PrestaShop\Module\PsAccounts\Account\Exception\EmailNotVerifiedException;
-use PrestaShop\Module\PsAccounts\Account\Exception\EmployeeNotFoundException;
-use PrestaShop\Module\PsAccounts\Api\Client\OAuth2\OAuth2ApiClient;
-use PrestaShop\Module\PsAccounts\Api\Client\OAuth2\PrestaShopLoginTrait;
-use PrestaShop\Module\PsAccounts\Api\Client\OAuth2\PrestaShopSession;
-use PrestaShop\Module\PsAccounts\Api\Client\OAuth2\Response\UserInfo;
+use PrestaShop\Module\PsAccounts\AccountLogin\Exception\AccountLoginException;
+use PrestaShop\Module\PsAccounts\AccountLogin\Exception\EmailNotVerifiedException;
+use PrestaShop\Module\PsAccounts\AccountLogin\Exception\EmployeeNotFoundException;
+use PrestaShop\Module\PsAccounts\AccountLogin\OAuth2LoginTrait;
+use PrestaShop\Module\PsAccounts\AccountLogin\OAuth2Session;
 use PrestaShop\Module\PsAccounts\Entity\EmployeeAccount;
+use PrestaShop\Module\PsAccounts\OAuth2\ApiClient;
+use PrestaShop\Module\PsAccounts\OAuth2\Response\UserInfo;
 use PrestaShop\Module\PsAccounts\Polyfill\Traits\AdminController\IsAnonymousAllowed;
 use PrestaShop\Module\PsAccounts\Repository\EmployeeAccountRepository;
 use PrestaShop\Module\PsAccounts\Service\AnalyticsService;
@@ -37,7 +37,7 @@
  */
 class AdminOAuth2PsAccountsController extends \ModuleAdminController
 {
-    use PrestaShopLoginTrait;
+    use OAuth2LoginTrait;
     use IsAnonymousAllowed;
 
     /**
@@ -193,13 +193,13 @@ private function onLoginFailed(AccountLoginException $e)
     }
 
     /**
-     * @return OAuth2ApiClient
+     * @return ApiClient
      *
      * @throws Exception
      */
     private function getOAuth2Client()
     {
-        return $this->module->getService(OAuth2ApiClient::class);
+        return $this->module->getService(ApiClient::class);
     }
 
     /**
@@ -233,11 +233,11 @@ private function setLoginError($error)
     }
 
     /**
-     * @return PrestaShopSession
+     * @return OAuth2Session
      */
     protected function getOauth2Session()
     {
-        return $this->module->getService(PrestaShopSession::class);
+        return $this->module->getService(OAuth2Session::class);
     }
 
     /**
diff --git a/controllers/front/apiV1ShopOauth2Client.php b/controllers/front/apiV1ShopOauth2Client.php
index 5d47bc4c6..f4a1e9c99 100644
--- a/controllers/front/apiV1ShopOauth2Client.php
+++ b/controllers/front/apiV1ShopOauth2Client.php
@@ -20,14 +20,14 @@
 
 use PrestaShop\Module\PsAccounts\Account\Exception\RefreshTokenException;
 use PrestaShop\Module\PsAccounts\Account\Session\ShopSession;
-use PrestaShop\Module\PsAccounts\Api\Client\OAuth2\OAuth2Client;
 use PrestaShop\Module\PsAccounts\Api\Controller\AbstractShopRestController;
 use PrestaShop\Module\PsAccounts\Api\Controller\Request\UpdateShopOauth2ClientRequest;
+use PrestaShop\Module\PsAccounts\OAuth2\Client;
 
 class ps_AccountsApiV1ShopOauth2ClientModuleFrontController extends AbstractShopRestController
 {
     /**
-     * @var OAuth2Client
+     * @var Client
      */
     private $oauth2Client;
 
@@ -45,7 +45,7 @@ public function __construct()
     {
         parent::__construct();
 
-        $this->oauth2Client = $this->module->getService(OAuth2Client::class);
+        $this->oauth2Client = $this->module->getService(Client::class);
         $this->session = $this->module->getService(ShopSession::class);
     }
 
diff --git a/controllers/front/apiV2ShopHealthCheck.php b/controllers/front/apiV2ShopHealthCheck.php
index 93420255f..76f90981a 100644
--- a/controllers/front/apiV2ShopHealthCheck.php
+++ b/controllers/front/apiV2ShopHealthCheck.php
@@ -25,10 +25,10 @@
 use PrestaShop\Module\PsAccounts\Account\Token\NullToken;
 use PrestaShop\Module\PsAccounts\Account\Token\Token;
 use PrestaShop\Module\PsAccounts\Api\Client\AccountsClient;
-use PrestaShop\Module\PsAccounts\Api\Client\OAuth2\OAuth2ApiClient;
-use PrestaShop\Module\PsAccounts\Api\Client\OAuth2\OAuth2Client;
 use PrestaShop\Module\PsAccounts\Api\Controller\AbstractShopRestController;
 use PrestaShop\Module\PsAccounts\Api\Controller\Request\ShopHealthCheckRequest;
+use PrestaShop\Module\PsAccounts\OAuth2\ApiClient;
+use PrestaShop\Module\PsAccounts\OAuth2\Client;
 use PrestaShop\Module\PsAccounts\Service\PsAccountsService;
 
 class ps_AccountsApiV2ShopHealthCheckModuleFrontController extends AbstractShopRestController
@@ -39,7 +39,7 @@ class ps_AccountsApiV2ShopHealthCheckModuleFrontController extends AbstractShopR
     private $linkShop;
 
     /**
-     * @var OAuth2Client
+     * @var Client
      */
     private $oauth2Client;
 
@@ -69,7 +69,7 @@ class ps_AccountsApiV2ShopHealthCheckModuleFrontController extends AbstractShopR
     private $accountsClient;
 
     /**
-     * @var OAuth2ApiClient
+     * @var ApiClient
      */
     private $oauth2ApiClient;
 
@@ -81,13 +81,13 @@ public function __construct()
         $this->authenticated = false;
 
         $this->linkShop = $this->module->getService(LinkShop::class);
-        $this->oauth2Client = $this->module->getService(OAuth2Client::class);
+        $this->oauth2Client = $this->module->getService(Client::class);
         $this->shopSession = $this->module->getService(ShopSession::class);
         $this->firebaseShopSession = $this->module->getService(Firebase\ShopSession::class);
         $this->firebaseOwnerSession = $this->module->getService(Firebase\OwnerSession::class);
         $this->accountsClient = $this->module->getService(AccountsClient::class);
         $this->psAccountsService = $this->module->getService(PsAccountsService::class);
-        $this->oauth2ApiClient = $this->module->getService(OAuth2ApiClient::class);
+        $this->oauth2ApiClient = $this->module->getService(ApiClient::class);
     }
 
     /**
diff --git a/ps_accounts.php b/ps_accounts.php
index 73d98dab3..cc793b060 100644
--- a/ps_accounts.php
+++ b/ps_accounts.php
@@ -397,11 +397,11 @@ public function getShopContext()
     }
 
     /**
-     * @return \PrestaShop\Module\PsAccounts\Middleware\Oauth2Middleware
+     * @return \PrestaShop\Module\PsAccounts\AccountLogin\Middleware\Oauth2Middleware
      */
     public function getOauth2Middleware()
     {
-        return $this->getService(\PrestaShop\Module\PsAccounts\Middleware\Oauth2Middleware::class);
+        return $this->getService(\PrestaShop\Module\PsAccounts\AccountLogin\Middleware\Oauth2Middleware::class);
     }
 
     /**
diff --git a/src/Account/Session/ShopSession.php b/src/Account/Session/ShopSession.php
index f7fafdda0..b7d52ecc2 100644
--- a/src/Account/Session/ShopSession.php
+++ b/src/Account/Session/ShopSession.php
@@ -25,10 +25,10 @@
 use PrestaShop\Module\PsAccounts\Account\Exception\RefreshTokenException;
 use PrestaShop\Module\PsAccounts\Account\LinkShop;
 use PrestaShop\Module\PsAccounts\Account\Token\Token;
-use PrestaShop\Module\PsAccounts\Api\Client\OAuth2\OAuth2ApiClient;
-use PrestaShop\Module\PsAccounts\Api\Client\OAuth2\Response\AccessToken;
 use PrestaShop\Module\PsAccounts\Cqrs\CommandBus;
 use PrestaShop\Module\PsAccounts\Hook\ActionShopAccessTokenRefreshAfter;
+use PrestaShop\Module\PsAccounts\OAuth2\ApiClient;
+use PrestaShop\Module\PsAccounts\OAuth2\Response\AccessToken;
 use PrestaShop\Module\PsAccounts\Repository\ConfigurationRepository;
 
 class ShopSession extends Session implements SessionInterface
@@ -44,7 +44,7 @@ class ShopSession extends Session implements SessionInterface
     protected $configurationRepository;
 
     /**
-     * @var OAuth2ApiClient
+     * @var ApiClient
      */
     protected $oauth2ApiClient;
 
@@ -60,13 +60,13 @@ class ShopSession extends Session implements SessionInterface
 
     /**
      * @param ConfigurationRepository $configurationRepository
-     * @param OAuth2ApiClient $oauth2ApiClient
+     * @param ApiClient $oauth2ApiClient
      * @param LinkShop $linkShop
      * @param CommandBus $commandBus
      */
     public function __construct(
         ConfigurationRepository $configurationRepository,
-        OAuth2ApiClient $oauth2ApiClient,
+        ApiClient $oauth2ApiClient,
         LinkShop $linkShop,
         CommandBus $commandBus
     ) {
@@ -184,7 +184,7 @@ protected function assertAssociationState($oauth2ClientReceiptTimeout = 60)
 
         if ($this->linkShop->exists() &&
             $currentTs - $linkedAtTs > $oauth2ClientReceiptTimeout &&
-            !$this->oauth2ApiClient->getOauth2Client()->exists()) {
+            !$this->oauth2ApiClient->getClient()->exists()) {
             throw new InconsistentAssociationStateException('Invalid OAuth2 client');
         }
     }
diff --git a/src/Account/Exception/AccountLoginException.php b/src/AccountLogin/Exception/AccountLoginException.php
similarity index 92%
rename from src/Account/Exception/AccountLoginException.php
rename to src/AccountLogin/Exception/AccountLoginException.php
index 4f62ddb4f..48d06192f 100644
--- a/src/Account/Exception/AccountLoginException.php
+++ b/src/AccountLogin/Exception/AccountLoginException.php
@@ -18,9 +18,9 @@
  * @license   https://opensource.org/licenses/AFL-3.0 Academic Free License version 3.0
  */
 
-namespace PrestaShop\Module\PsAccounts\Account\Exception;
+namespace PrestaShop\Module\PsAccounts\AccountLogin\Exception;
 
-use PrestaShop\Module\PsAccounts\Api\Client\OAuth2\Response\UserInfo;
+use PrestaShop\Module\PsAccounts\OAuth2\Response\UserInfo;
 
 class AccountLoginException extends \Exception
 {
diff --git a/src/Account/Exception/EmailNotVerifiedException.php b/src/AccountLogin/Exception/EmailNotVerifiedException.php
similarity index 90%
rename from src/Account/Exception/EmailNotVerifiedException.php
rename to src/AccountLogin/Exception/EmailNotVerifiedException.php
index 790c783d2..0d352819e 100644
--- a/src/Account/Exception/EmailNotVerifiedException.php
+++ b/src/AccountLogin/Exception/EmailNotVerifiedException.php
@@ -18,9 +18,9 @@
  * @license   https://opensource.org/licenses/AFL-3.0 Academic Free License version 3.0
  */
 
-namespace PrestaShop\Module\PsAccounts\Account\Exception;
+namespace PrestaShop\Module\PsAccounts\AccountLogin\Exception;
 
-use PrestaShop\Module\PsAccounts\Api\Client\OAuth2\Response\UserInfo;
+use PrestaShop\Module\PsAccounts\OAuth2\Response\UserInfo;
 
 class EmailNotVerifiedException extends AccountLoginException
 {
diff --git a/src/Account/Exception/EmployeeNotFoundException.php b/src/AccountLogin/Exception/EmployeeNotFoundException.php
similarity index 91%
rename from src/Account/Exception/EmployeeNotFoundException.php
rename to src/AccountLogin/Exception/EmployeeNotFoundException.php
index 0201ddfb8..f1338feb9 100644
--- a/src/Account/Exception/EmployeeNotFoundException.php
+++ b/src/AccountLogin/Exception/EmployeeNotFoundException.php
@@ -18,9 +18,9 @@
  * @license   https://opensource.org/licenses/AFL-3.0 Academic Free License version 3.0
  */
 
-namespace PrestaShop\Module\PsAccounts\Account\Exception;
+namespace PrestaShop\Module\PsAccounts\AccountLogin\Exception;
 
-use PrestaShop\Module\PsAccounts\Api\Client\OAuth2\Response\UserInfo;
+use PrestaShop\Module\PsAccounts\OAuth2\Response\UserInfo;
 
 class EmployeeNotFoundException extends AccountLoginException
 {
diff --git a/src/Account/Exception/Oauth2LoginException.php b/src/AccountLogin/Exception/Oauth2LoginException.php
similarity index 90%
rename from src/Account/Exception/Oauth2LoginException.php
rename to src/AccountLogin/Exception/Oauth2LoginException.php
index 1cc3b8a8d..0cd27d08d 100644
--- a/src/Account/Exception/Oauth2LoginException.php
+++ b/src/AccountLogin/Exception/Oauth2LoginException.php
@@ -18,9 +18,9 @@
  * @license   https://opensource.org/licenses/AFL-3.0 Academic Free License version 3.0
  */
 
-namespace PrestaShop\Module\PsAccounts\Account\Exception;
+namespace PrestaShop\Module\PsAccounts\AccountLogin\Exception;
 
-use PrestaShop\Module\PsAccounts\Api\Client\OAuth2\Response\UserInfo;
+use PrestaShop\Module\PsAccounts\OAuth2\Response\UserInfo;
 
 class Oauth2LoginException extends AccountLoginException
 {
diff --git a/src/Middleware/Oauth2Middleware.php b/src/AccountLogin/Middleware/Oauth2Middleware.php
similarity index 85%
rename from src/Middleware/Oauth2Middleware.php
rename to src/AccountLogin/Middleware/Oauth2Middleware.php
index 1c921d250..faa8a5cc7 100644
--- a/src/Middleware/Oauth2Middleware.php
+++ b/src/AccountLogin/Middleware/Oauth2Middleware.php
@@ -18,18 +18,18 @@
  * @license   https://opensource.org/licenses/AFL-3.0 Academic Free License version 3.0
  */
 
-namespace PrestaShop\Module\PsAccounts\Middleware;
+namespace PrestaShop\Module\PsAccounts\AccountLogin\Middleware;
 
 use Exception;
-use PrestaShop\Module\PsAccounts\Api\Client\OAuth2\OAuth2ApiClient;
-use PrestaShop\Module\PsAccounts\Api\Client\OAuth2\PrestaShopLogoutTrait;
-use PrestaShop\Module\PsAccounts\Api\Client\OAuth2\PrestaShopSession;
+use PrestaShop\Module\PsAccounts\AccountLogin\OAuth2LogoutTrait;
+use PrestaShop\Module\PsAccounts\AccountLogin\OAuth2Session;
+use PrestaShop\Module\PsAccounts\OAuth2\ApiClient;
 use PrestaShop\Module\PsAccounts\Service\PsAccountsService;
 use Ps_accounts;
 
 class Oauth2Middleware
 {
-    use PrestaShopLogoutTrait;
+    use OAuth2LogoutTrait;
 
     /**
      * @var Ps_accounts
@@ -78,21 +78,21 @@ public function execute()
     }
 
     /**
-     * @return OAuth2ApiClient
+     * @return ApiClient
      */
     protected function getOAuth2Client()
     {
-        return $this->module->getService(OAuth2ApiClient::class);
+        return $this->module->getService(ApiClient::class);
     }
 
     /**
-     * @return PrestaShopSession
+     * @return OAuth2Session
      *
      * @throws Exception
      */
     protected function getOauth2Session()
     {
-        return $this->module->getService(PrestaShopSession::class);
+        return $this->module->getService(OAuth2Session::class);
     }
 
     /**
diff --git a/src/Api/Client/OAuth2/PrestaShopLoginTrait.php b/src/AccountLogin/OAuth2LoginTrait.php
similarity index 88%
rename from src/Api/Client/OAuth2/PrestaShopLoginTrait.php
rename to src/AccountLogin/OAuth2LoginTrait.php
index 504ae159b..95dff251f 100644
--- a/src/Api/Client/OAuth2/PrestaShopLoginTrait.php
+++ b/src/AccountLogin/OAuth2LoginTrait.php
@@ -18,20 +18,22 @@
  * @license   https://opensource.org/licenses/AFL-3.0 Academic Free License version 3.0
  */
 
-namespace PrestaShop\Module\PsAccounts\Api\Client\OAuth2;
+namespace PrestaShop\Module\PsAccounts\AccountLogin;
 
-use PrestaShop\Module\PsAccounts\Account\Exception\EmailNotVerifiedException;
-use PrestaShop\Module\PsAccounts\Account\Exception\EmployeeNotFoundException;
-use PrestaShop\Module\PsAccounts\Account\Exception\Oauth2LoginException;
-use PrestaShop\Module\PsAccounts\Api\Client\OAuth2\Response\UserInfo;
+use PrestaShop\Module\PsAccounts\AccountLogin\Exception\EmailNotVerifiedException;
+use PrestaShop\Module\PsAccounts\AccountLogin\Exception\EmployeeNotFoundException;
+use PrestaShop\Module\PsAccounts\AccountLogin\Exception\Oauth2LoginException;
 use PrestaShop\Module\PsAccounts\Log\Logger;
+use PrestaShop\Module\PsAccounts\OAuth2\ApiClient;
+use PrestaShop\Module\PsAccounts\OAuth2\OAuth2Exception;
+use PrestaShop\Module\PsAccounts\OAuth2\Response\UserInfo;
 use Symfony\Component\HttpFoundation\Session\SessionInterface;
 use Tools;
 
-trait PrestaShopLoginTrait
+trait OAuth2LoginTrait
 {
     /**
-     * @return OAuth2ApiClient
+     * @return ApiClient
      */
     abstract protected function getOAuth2Client();
 
@@ -53,7 +55,7 @@ abstract protected function redirectAfterLogin();
     abstract protected function getSession();
 
     /**
-     * @return PrestaShopSession
+     * @return OAuth2Session
      */
     abstract protected function getOauth2Session();
 
@@ -103,7 +105,7 @@ public function oauth2Login()
 
             $oauth2Session->setTokenProvider($accessToken);
 
-            if ($this->initUserSession($oauth2Session->getPrestashopUser())) {
+            if ($this->initUserSession($oauth2Session->getUserInfo())) {
                 $this->redirectAfterLogin();
             }
         }
diff --git a/src/Api/Client/OAuth2/PrestaShopLogoutTrait.php b/src/AccountLogin/OAuth2LogoutTrait.php
similarity index 88%
rename from src/Api/Client/OAuth2/PrestaShopLogoutTrait.php
rename to src/AccountLogin/OAuth2LogoutTrait.php
index 682dea20a..dd40c199e 100644
--- a/src/Api/Client/OAuth2/PrestaShopLogoutTrait.php
+++ b/src/AccountLogin/OAuth2LogoutTrait.php
@@ -18,17 +18,19 @@
  * @license   https://opensource.org/licenses/AFL-3.0 Academic Free License version 3.0
  */
 
-namespace PrestaShop\Module\PsAccounts\Api\Client\OAuth2;
+namespace PrestaShop\Module\PsAccounts\AccountLogin;
 
-trait PrestaShopLogoutTrait
+use PrestaShop\Module\PsAccounts\OAuth2\ApiClient;
+
+trait OAuth2LogoutTrait
 {
     /**
-     * @return OAuth2ApiClient
+     * @return ApiClient
      */
     abstract protected function getOAuth2Client();
 
     /**
-     * @return PrestaShopSession
+     * @return OAuth2Session
      */
     abstract protected function getOauth2Session();
 
@@ -57,7 +59,7 @@ public function oauth2Logout()
         }
 
         $oauth2Session = $this->getOauth2Session();
-        if (!isset($_GET[PrestaShopLogoutTrait::getQueryLogoutCallbackParam()])) {
+        if (!isset($_GET[OAuth2LogoutTrait::getQueryLogoutCallbackParam()])) {
             $idToken = $oauth2Session->getIdToken();
 
             if (empty($idToken)) {
diff --git a/src/Api/Client/OAuth2/PrestaShopSession.php b/src/AccountLogin/OAuth2Session.php
similarity index 84%
rename from src/Api/Client/OAuth2/PrestaShopSession.php
rename to src/AccountLogin/OAuth2Session.php
index 3acb844b0..95b97b1b1 100644
--- a/src/Api/Client/OAuth2/PrestaShopSession.php
+++ b/src/AccountLogin/OAuth2Session.php
@@ -18,13 +18,15 @@
  * @license   https://opensource.org/licenses/AFL-3.0 Academic Free License version 3.0
  */
 
-namespace PrestaShop\Module\PsAccounts\Api\Client\OAuth2;
+namespace PrestaShop\Module\PsAccounts\AccountLogin;
 
-use PrestaShop\Module\PsAccounts\Api\Client\OAuth2\Response\AccessToken;
-use PrestaShop\Module\PsAccounts\Api\Client\OAuth2\Response\UserInfo;
+use PrestaShop\Module\PsAccounts\OAuth2\ApiClient;
+use PrestaShop\Module\PsAccounts\OAuth2\Client;
+use PrestaShop\Module\PsAccounts\OAuth2\Response\AccessToken;
+use PrestaShop\Module\PsAccounts\OAuth2\Response\UserInfo;
 use Symfony\Component\HttpFoundation\Session\SessionInterface;
 
-class PrestaShopSession
+class OAuth2Session
 {
     const TOKEN_NAME = 'accessToken';
 
@@ -34,21 +36,21 @@ class PrestaShopSession
     private $session;
 
     /**
-     * @var OAuth2ApiClient
+     * @var ApiClient
      */
     private $oauth2ApiClient;
 
     /**
-     * @var OAuth2Client
+     * @var Client
      */
     private $oauth2Client;
 
     /**
      * @param mixed $session
-     * @param OAuth2ApiClient $oauth2ApiClient
-     * @param OAuth2Client $oauth2Client
+     * @param ApiClient $oauth2ApiClient
+     * @param Client $oauth2Client
      */
-    public function __construct($session, OAuth2ApiClient $oauth2ApiClient, OAuth2Client $oauth2Client)
+    public function __construct($session, ApiClient $oauth2ApiClient, Client $oauth2Client)
     {
         $this->session = $session;
         $this->oauth2ApiClient = $oauth2ApiClient;
@@ -110,7 +112,7 @@ public function isAuthenticated()
     /**
      * @return UserInfo
      */
-    public function getPrestashopUser()
+    public function getUserInfo()
     {
         return $this->oauth2ApiClient->getUserInfo($this->getAccessToken());
     }
diff --git a/src/Hook/ActionShopAccountUnlinkAfter.php b/src/Hook/ActionShopAccountUnlinkAfter.php
index 59a910ce6..b3e76ea87 100644
--- a/src/Hook/ActionShopAccountUnlinkAfter.php
+++ b/src/Hook/ActionShopAccountUnlinkAfter.php
@@ -22,7 +22,7 @@
 
 use PrestaShop\Module\PsAccounts\Account\Session\Firebase;
 use PrestaShop\Module\PsAccounts\Account\Session\ShopSession;
-use PrestaShop\Module\PsAccounts\Api\Client\OAuth2\OAuth2Client;
+use PrestaShop\Module\PsAccounts\OAuth2\Client;
 use PrestaShop\Module\PsAccounts\Provider\RsaKeysProvider;
 
 class ActionShopAccountUnlinkAfter extends Hook
@@ -36,8 +36,8 @@ class ActionShopAccountUnlinkAfter extends Hook
      */
     public function execute(array $params = [])
     {
-        /** @var OAuth2Client $oauth2Client */
-        $oauth2Client = $this->module->getService(OAuth2Client::class);
+        /** @var Client $oauth2Client */
+        $oauth2Client = $this->module->getService(Client::class);
         $oauth2Client->delete();
 
         /** @var Firebase\ShopSession $shopSession */
diff --git a/src/Http/Client/CircuitBreaker/Factory.php b/src/Http/Client/CircuitBreaker/Factory.php
index e1585b38f..84fb0006b 100644
--- a/src/Http/Client/CircuitBreaker/Factory.php
+++ b/src/Http/Client/CircuitBreaker/Factory.php
@@ -22,7 +22,7 @@
 
 use PrestaShop\Module\PsAccounts\Adapter\Configuration;
 use PrestaShop\Module\PsAccounts\Api\Client\AccountsClient;
-use PrestaShop\Module\PsAccounts\Api\Client\OAuth2\OAuth2ApiClient;
+use PrestaShop\Module\PsAccounts\OAuth2\ApiClient;
 
 class Factory
 {
@@ -31,7 +31,7 @@ class Factory
      */
     private $provides = [
         AccountsClient::class,
-        OAuth2ApiClient::class,
+        ApiClient::class,
     ];
 
     /**
diff --git a/src/Http/Client/Curl/Client.php b/src/Http/Client/Curl/Client.php
index 082871636..84312ea29 100644
--- a/src/Http/Client/Curl/Client.php
+++ b/src/Http/Client/Curl/Client.php
@@ -37,6 +37,11 @@ class Client
      */
     protected $route;
 
+    /**
+     * @var string
+     */
+    protected $userAgent = 'ps_accounts/' . \Ps_accounts::VERSION;
+
     /**
      * @var int
      */
@@ -314,7 +319,7 @@ public function initRoute()
         curl_setopt($ch, CURLOPT_FOLLOWLOCATION, $this->allowRedirects);
         curl_setopt($ch, CURLOPT_POSTREDIR, $this->allowRedirects ? 3 : 0);
 
-        curl_setopt($ch, CURLOPT_USERAGENT, 'ps_accounts/' . \Ps_accounts::VERSION);
+        curl_setopt($ch, CURLOPT_USERAGENT, $this->getUserAgent());
         //curl_setopt($ch, CURLOPT_VERBOSE, true);
 
         return $ch;
@@ -376,4 +381,12 @@ public function initCurl(array $options)
 
         return $ch;
     }
+
+    /**
+     * @return string
+     */
+    public function getUserAgent()
+    {
+        return $this->userAgent;
+    }
 }
diff --git a/src/Api/Client/OAuth2/OAuth2ApiClient.php b/src/OAuth2/ApiClient.php
similarity index 83%
rename from src/Api/Client/OAuth2/OAuth2ApiClient.php
rename to src/OAuth2/ApiClient.php
index 90f3a9a12..619646f52 100644
--- a/src/Api/Client/OAuth2/OAuth2ApiClient.php
+++ b/src/OAuth2/ApiClient.php
@@ -18,20 +18,20 @@
  * @license   https://opensource.org/licenses/AFL-3.0 Academic Free License version 3.0
  */
 
-namespace PrestaShop\Module\PsAccounts\Api\Client\OAuth2;
+namespace PrestaShop\Module\PsAccounts\OAuth2;
 
+use PrestaShop\Module\PsAccounts\AccountLogin\OAuth2LogoutTrait;
 use PrestaShop\Module\PsAccounts\Adapter\Link;
-use PrestaShop\Module\PsAccounts\Api\Client\OAuth2\OAuth2Client as OauthClient;
-use PrestaShop\Module\PsAccounts\Api\Client\OAuth2\Response\AccessToken;
-use PrestaShop\Module\PsAccounts\Api\Client\OAuth2\Response\UserInfo;
-use PrestaShop\Module\PsAccounts\Api\Client\OAuth2\Response\WellKnown;
-use PrestaShop\Module\PsAccounts\Http\Client\Curl\Client;
+use PrestaShop\Module\PsAccounts\Http\Client\Curl\Client as HttpClient;
 use PrestaShop\Module\PsAccounts\Http\Client\Factory;
 use PrestaShop\Module\PsAccounts\Http\Client\Options;
 use PrestaShop\Module\PsAccounts\Http\Client\Response;
+use PrestaShop\Module\PsAccounts\OAuth2\Response\AccessToken;
+use PrestaShop\Module\PsAccounts\OAuth2\Response\UserInfo;
+use PrestaShop\Module\PsAccounts\OAuth2\Response\WellKnown;
 use PrestaShop\Module\PsAccounts\Vendor\Ramsey\Uuid\Uuid;
 
-class OAuth2ApiClient
+class ApiClient
 {
     /**
      * @var string
@@ -39,9 +39,9 @@ class OAuth2ApiClient
     private $baseUri;
 
     /**
-     * @var Client
+     * @var HttpClient
      */
-    private $client;
+    private $httpClient;
 
     /**
      * @var WellKnown
@@ -54,9 +54,9 @@ class OAuth2ApiClient
     private $cachedWellKnown;
 
     /**
-     * @var OauthClient
+     * @var Client
      */
-    private $oauth2Client;
+    private $client;
 
     /**
      * @var Link
@@ -75,7 +75,7 @@ class OAuth2ApiClient
 
     /**
      * @param string $baseUri
-     * @param OauthClient $oauth2Client
+     * @param Client $client
      * @param Link $link
      * @param string $cacheDir
      * @param int $defaultTimeout
@@ -84,15 +84,15 @@ class OAuth2ApiClient
      * @throws \Exception
      */
     public function __construct(
-        $baseUri,
-        OauthClient $oauth2Client,
+               $baseUri,
+        Client $client,
         Link $link,
-        $cacheDir = null,
-        $defaultTimeout = 20,
-        $sslCheck = true
+               $cacheDir = null,
+               $defaultTimeout = 20,
+               $sslCheck = true
     ) {
         $this->baseUri = $baseUri;
-        $this->oauth2Client = $oauth2Client;
+        $this->client = $client;
         $this->link = $link;
         $this->defaultTimeout = $defaultTimeout;
         $this->sslCheck = $sslCheck;
@@ -105,12 +105,12 @@ public function __construct(
     }
 
     /**
-     * @return Client
+     * @return HttpClient
      */
-    private function getClient()
+    private function getHttpClient()
     {
-        if (null === $this->client) {
-            $this->client = (new Factory())->create([
+        if (null === $this->httpClient) {
+            $this->httpClient = (new Factory())->create([
                 'name' => static::class,
                 'baseUri' => $this->baseUri,
                 'headers' => $this->getHeaders(),
@@ -120,7 +120,7 @@ private function getClient()
             ]);
         }
 
-        return $this->client;
+        return $this->httpClient;
     }
 
     /**
@@ -194,7 +194,7 @@ protected function fetchWellKnown($url = null)
         }
 
         /** @var Response $response */
-        $response = $this->getClient()->get($wellKnownUrl);
+        $response = $this->getHttpClient()->get($wellKnownUrl);
 
         return $response->body;
     }
@@ -208,13 +208,13 @@ protected function fetchWellKnown($url = null)
     public function getAccessTokenByClientCredentials(array $scope = [], array $audience = [])
     {
         /** @var Response $response */
-        $response = $this->getClient()->post(
+        $response = $this->getHttpClient()->post(
             $this->getWellKnown()->token_endpoint,
             [
                 Options::REQ_FORM => [
                     'grant_type' => 'client_credentials',
-                    'client_id' => $this->oauth2Client->getClientId(),
-                    'client_secret' => $this->oauth2Client->getClientSecret(),
+                    'client_id' => $this->client->getClientId(),
+                    'client_secret' => $this->client->getClientSecret(),
                     'scope' => implode(' ', $scope),
                     'audience' => implode(' ', $audience),
                 ],
@@ -252,7 +252,7 @@ public function getAuthorizationUri(
                 'response_type' => 'code',
                 'approval_prompt' => 'auto',
                 'redirect_uri' => $redirectUri,
-                'client_id' => $this->oauth2Client->getClientId(),
+                'client_id' => $this->client->getClientId(),
             ], $pkceCode ? [
                 'code_challenge' => trim(strtr(base64_encode(hash('sha256', $pkceCode, true)), '+/', '-_'), '='),
                 'code_challenge_method' => $pkceMethod,
@@ -308,13 +308,13 @@ public function getAccessTokenByAuthorizationCode(
         array $audience = []
     ) {
         /** @var Response $response */
-        $response = $this->getClient()->post(
+        $response = $this->getHttpClient()->post(
             $this->getWellKnown()->token_endpoint,
             [
                 Options::REQ_FORM => array_merge([
                     'grant_type' => 'authorization_code',
-                    'client_id' => $this->oauth2Client->getClientId(),
-                    'client_secret' => $this->oauth2Client->getClientSecret(),
+                    'client_id' => $this->client->getClientId(),
+                    'client_secret' => $this->client->getClientSecret(),
                     'code' => $code,
                     'scope' => implode(' ', $scope),
                     'audience' => implode(' ', $audience),
@@ -340,12 +340,12 @@ public function getAccessTokenByAuthorizationCode(
     public function refreshAccessToken($refreshToken)
     {
         /** @var Response $response */
-        $response = $this->getClient()->post(
+        $response = $this->getHttpClient()->post(
             $this->getWellKnown()->token_endpoint,
             [
                 Options::REQ_FORM => [
                     'grant_type' => 'refresh_token',
-                    'client_id' => $this->oauth2Client->getClientId(),
+                    'client_id' => $this->client->getClientId(),
                     'refresh_token' => $refreshToken,
                 ],
             ]
@@ -366,7 +366,7 @@ public function refreshAccessToken($refreshToken)
     public function getUserInfo($accessToken)
     {
         /** @var Response $response */
-        $response = $this->getClient()->get(
+        $response = $this->getHttpClient()->get(
             $this->getWellKnown()->userinfo_endpoint,
             [
                 Options::REQ_HEADERS => $this->getHeaders([
@@ -406,25 +406,15 @@ public function getPostLogoutRedirectUri()
     {
         return $this->link->getAdminLink('AdminLogin', false, [], [
             'logout' => 1,
-            PrestaShopLogoutTrait::getQueryLogoutCallbackParam() => 1,
+            OAuth2LogoutTrait::getQueryLogoutCallbackParam() => 1,
         ]);
     }
 
     /**
-     * @return OAuth2Client
+     * @return Client
      */
-    public function getOauth2Client()
+    public function getClient()
     {
-        return $this->oauth2Client;
+        return $this->client;
     }
-
-    // TODO: remove Lcobucci (use firebase/jwt)
-    // TODO: instantiate real response types (and throw exceptions)
-    // TODO: check response types (HTTPClient)
-
-    // TODO: move Token class
-    // TODO: move Exception classes
-    // TODO: throw Exceptions -> and catch them in Login Trait
-    // TODO: log client errors (onError)
-    // TODO: USER AGENT
 }
diff --git a/src/Api/Client/OAuth2/CachedFile.php b/src/OAuth2/CachedFile.php
similarity index 98%
rename from src/Api/Client/OAuth2/CachedFile.php
rename to src/OAuth2/CachedFile.php
index b1296705f..98923bb24 100644
--- a/src/Api/Client/OAuth2/CachedFile.php
+++ b/src/OAuth2/CachedFile.php
@@ -18,7 +18,7 @@
  * @license   https://opensource.org/licenses/AFL-3.0 Academic Free License version 3.0
  */
 
-namespace PrestaShop\Module\PsAccounts\Api\Client\OAuth2;
+namespace PrestaShop\Module\PsAccounts\OAuth2;
 
 class CachedFile
 {
diff --git a/src/Api/Client/OAuth2/OAuth2Client.php b/src/OAuth2/Client.php
similarity index 96%
rename from src/Api/Client/OAuth2/OAuth2Client.php
rename to src/OAuth2/Client.php
index 06ebc9098..d9bd8bb89 100644
--- a/src/Api/Client/OAuth2/OAuth2Client.php
+++ b/src/OAuth2/Client.php
@@ -18,11 +18,11 @@
  * @license   https://opensource.org/licenses/AFL-3.0 Academic Free License version 3.0
  */
 
-namespace PrestaShop\Module\PsAccounts\Api\Client\OAuth2;
+namespace PrestaShop\Module\PsAccounts\OAuth2;
 
 use PrestaShop\Module\PsAccounts\Repository\ConfigurationRepository;
 
-class OAuth2Client
+class Client
 {
     /**
      * @var ConfigurationRepository
diff --git a/src/Api/Client/OAuth2/OAuth2Exception.php b/src/OAuth2/OAuth2Exception.php
similarity index 93%
rename from src/Api/Client/OAuth2/OAuth2Exception.php
rename to src/OAuth2/OAuth2Exception.php
index 33f737930..c02f54608 100644
--- a/src/Api/Client/OAuth2/OAuth2Exception.php
+++ b/src/OAuth2/OAuth2Exception.php
@@ -18,7 +18,7 @@
  * @license   https://opensource.org/licenses/AFL-3.0 Academic Free License version 3.0
  */
 
-namespace PrestaShop\Module\PsAccounts\Api\Client\OAuth2;
+namespace PrestaShop\Module\PsAccounts\OAuth2;
 
 class OAuth2Exception extends \Exception
 {
diff --git a/src/Api/Client/OAuth2/Response/AccessToken.php b/src/OAuth2/Response/AccessToken.php
similarity index 92%
rename from src/Api/Client/OAuth2/Response/AccessToken.php
rename to src/OAuth2/Response/AccessToken.php
index 2ef8a95e3..22fa6f991 100644
--- a/src/Api/Client/OAuth2/Response/AccessToken.php
+++ b/src/OAuth2/Response/AccessToken.php
@@ -18,10 +18,9 @@
  * @license   https://opensource.org/licenses/AFL-3.0 Academic Free License version 3.0
  */
 
-namespace PrestaShop\Module\PsAccounts\Api\Client\OAuth2\Response;
+namespace PrestaShop\Module\PsAccounts\OAuth2\Response;
 
 use PrestaShop\Module\PsAccounts\Account\Token\Token;
-use PrestaShop\Module\PsAccounts\Api\Client\Response;
 
 class AccessToken extends Response
 {
diff --git a/src/Api/Client/Response.php b/src/OAuth2/Response/Response.php
similarity index 95%
rename from src/Api/Client/Response.php
rename to src/OAuth2/Response/Response.php
index c0c0536e1..84335566d 100644
--- a/src/Api/Client/Response.php
+++ b/src/OAuth2/Response/Response.php
@@ -18,7 +18,7 @@
  * @license   https://opensource.org/licenses/AFL-3.0 Academic Free License version 3.0
  */
 
-namespace PrestaShop\Module\PsAccounts\Api\Client;
+namespace PrestaShop\Module\PsAccounts\OAuth2\Response;
 
 abstract class Response
 {
diff --git a/src/Api/Client/OAuth2/Response/UserInfo.php b/src/OAuth2/Response/UserInfo.php
similarity index 94%
rename from src/Api/Client/OAuth2/Response/UserInfo.php
rename to src/OAuth2/Response/UserInfo.php
index 6f828b27d..13b40ea62 100644
--- a/src/Api/Client/OAuth2/Response/UserInfo.php
+++ b/src/OAuth2/Response/UserInfo.php
@@ -18,7 +18,7 @@
  * @license   https://opensource.org/licenses/AFL-3.0 Academic Free License version 3.0
  */
 
-namespace PrestaShop\Module\PsAccounts\Api\Client\OAuth2\Response;
+namespace PrestaShop\Module\PsAccounts\OAuth2\Response;
 
 // [OAuth2] stdClass Object (
 //     [amr] => Array
@@ -47,7 +47,6 @@
 //     [rat] => 1736251522
 //     [sub] => 4rFN5bm2piPeYpsotUIwcyabcdeF
 // )  [] []
-use PrestaShop\Module\PsAccounts\Api\Client\Response;
 
 class UserInfo extends Response
 {
diff --git a/src/Api/Client/OAuth2/Response/WellKnown.php b/src/OAuth2/Response/WellKnown.php
similarity index 97%
rename from src/Api/Client/OAuth2/Response/WellKnown.php
rename to src/OAuth2/Response/WellKnown.php
index b301e4a56..38d142acb 100644
--- a/src/Api/Client/OAuth2/Response/WellKnown.php
+++ b/src/OAuth2/Response/WellKnown.php
@@ -18,9 +18,7 @@
  * @license   https://opensource.org/licenses/AFL-3.0 Academic Free License version 3.0
  */
 
-namespace PrestaShop\Module\PsAccounts\Api\Client\OAuth2\Response;
-
-use PrestaShop\Module\PsAccounts\Api\Client\Response;
+namespace PrestaShop\Module\PsAccounts\OAuth2\Response;
 
 /**
  * {
diff --git a/src/ServiceProvider/ApiClientProvider.php b/src/ServiceProvider/ApiClientProvider.php
index f76941837..e1bf5aa4f 100644
--- a/src/ServiceProvider/ApiClientProvider.php
+++ b/src/ServiceProvider/ApiClientProvider.php
@@ -20,10 +20,7 @@
 
 namespace PrestaShop\Module\PsAccounts\ServiceProvider;
 
-use PrestaShop\Module\PsAccounts\Adapter\Link;
 use PrestaShop\Module\PsAccounts\Api\Client\AccountsClient;
-use PrestaShop\Module\PsAccounts\Api\Client\OAuth2\OAuth2ApiClient;
-use PrestaShop\Module\PsAccounts\Api\Client\OAuth2\OAuth2Client;
 use PrestaShop\Module\PsAccounts\Api\Client\ServicesBillingClient;
 use PrestaShop\Module\PsAccounts\Provider\ShopProvider;
 use PrestaShop\Module\PsAccounts\Service\PsAccountsService;
@@ -46,16 +43,6 @@ public function provide(ServiceContainer $container)
                 $container->getParameter('ps_accounts.check_api_ssl_cert')
             );
         });
-        $container->registerProvider(OAuth2ApiClient::class, static function () use ($container) {
-            return new OAuth2ApiClient(
-                $container->getParameter('ps_accounts.oauth2_url'),
-                $container->get(OAuth2Client::class),
-                $container->get(Link::class),
-                _PS_CACHE_DIR_ . DIRECTORY_SEPARATOR . 'ps_accounts',
-                10,
-                $container->getParameter('ps_accounts.check_api_ssl_cert')
-            );
-        });
         $container->registerProvider(ServicesBillingClient::class, static function () use ($container) {
             return new ServicesBillingClient(
                 $container->getParameter('ps_accounts.billing_api_url'),
diff --git a/src/ServiceProvider/OAuth2Provider.php b/src/ServiceProvider/OAuth2Provider.php
index 607cc6bf8..27f955bf3 100644
--- a/src/ServiceProvider/OAuth2Provider.php
+++ b/src/ServiceProvider/OAuth2Provider.php
@@ -20,10 +20,11 @@
 
 namespace PrestaShop\Module\PsAccounts\ServiceProvider;
 
-use PrestaShop\Module\PsAccounts\Api\Client\OAuth2\OAuth2ApiClient;
-use PrestaShop\Module\PsAccounts\Api\Client\OAuth2\OAuth2Client;
-use PrestaShop\Module\PsAccounts\Api\Client\OAuth2\PrestaShopSession;
-use PrestaShop\Module\PsAccounts\Middleware\Oauth2Middleware;
+use PrestaShop\Module\PsAccounts\AccountLogin\Middleware\Oauth2Middleware;
+use PrestaShop\Module\PsAccounts\AccountLogin\OAuth2Session;
+use PrestaShop\Module\PsAccounts\Adapter\Link;
+use PrestaShop\Module\PsAccounts\OAuth2\ApiClient;
+use PrestaShop\Module\PsAccounts\OAuth2\Client;
 use PrestaShop\Module\PsAccounts\Repository\ConfigurationRepository;
 use PrestaShop\Module\PsAccounts\Vendor\PrestaShopCorp\LightweightContainer\ServiceContainer\Contract\IServiceProvider;
 use PrestaShop\Module\PsAccounts\Vendor\PrestaShopCorp\LightweightContainer\ServiceContainer\ServiceContainer;
@@ -38,16 +39,26 @@ class OAuth2Provider implements IServiceProvider
     public function provide(ServiceContainer $container)
     {
         // OAuth2
-        $container->registerProvider(OAuth2Client::class, static function () use ($container) {
-            return new OAuth2Client(
+        $container->registerProvider(ApiClient::class, static function () use ($container) {
+            return new ApiClient(
+                $container->getParameter('ps_accounts.oauth2_url'),
+                $container->get(Client::class),
+                $container->get(Link::class),
+                _PS_CACHE_DIR_ . DIRECTORY_SEPARATOR . 'ps_accounts',
+                10,
+                $container->getParameter('ps_accounts.check_api_ssl_cert')
+            );
+        });
+        $container->registerProvider(Client::class, static function () use ($container) {
+            return new Client(
                 $container->get(ConfigurationRepository::class)
             );
         });
-        $container->registerProvider(PrestaShopSession::class, static function () use ($container) {
-            return new PrestaShopSession(
+        $container->registerProvider(OAuth2Session::class, static function () use ($container) {
+            return new OAuth2Session(
                 $container->get('ps_accounts.module')->getSession(),
-                $container->getService(OAuth2ApiClient::class),
-                $container->getService(OAuth2Client::class)
+                $container->getService(ApiClient::class),
+                $container->getService(Client::class)
             );
         });
         // Middleware
diff --git a/src/ServiceProvider/SessionProvider.php b/src/ServiceProvider/SessionProvider.php
index 0f416c730..6bbb2950f 100644
--- a/src/ServiceProvider/SessionProvider.php
+++ b/src/ServiceProvider/SessionProvider.php
@@ -23,8 +23,8 @@
 use PrestaShop\Module\PsAccounts\Account\LinkShop;
 use PrestaShop\Module\PsAccounts\Account\Session\Firebase;
 use PrestaShop\Module\PsAccounts\Account\Session\ShopSession;
-use PrestaShop\Module\PsAccounts\Api\Client\OAuth2\OAuth2ApiClient;
 use PrestaShop\Module\PsAccounts\Cqrs\CommandBus;
+use PrestaShop\Module\PsAccounts\OAuth2\ApiClient;
 use PrestaShop\Module\PsAccounts\Repository\ConfigurationRepository;
 use PrestaShop\Module\PsAccounts\Vendor\PrestaShopCorp\LightweightContainer\ServiceContainer\Contract\IServiceProvider;
 use PrestaShop\Module\PsAccounts\Vendor\PrestaShopCorp\LightweightContainer\ServiceContainer\ServiceContainer;
@@ -42,7 +42,7 @@ public function provide(ServiceContainer $container)
         $container->registerProvider(ShopSession::class, static function () use ($container) {
             return new ShopSession(
                 $container->get(ConfigurationRepository::class),
-                $container->get(OAuth2ApiClient::class),
+                $container->get(ApiClient::class),
                 $container->get(LinkShop::class),
                 $container->get(CommandBus::class)
             );
diff --git a/tests/Feature/Api/v1/ShopOauth2Client/DeleteTest.php b/tests/Feature/Api/v1/ShopOauth2Client/DeleteTest.php
index 52486ba21..2c397e779 100644
--- a/tests/Feature/Api/v1/ShopOauth2Client/DeleteTest.php
+++ b/tests/Feature/Api/v1/ShopOauth2Client/DeleteTest.php
@@ -2,7 +2,7 @@
 
 namespace PrestaShop\Module\PsAccounts\Tests\Feature\Api\v1\ShopOauth2Client;
 
-use PrestaShop\Module\PsAccounts\Api\Client\OAuth2\OAuth2Client;
+use PrestaShop\Module\PsAccounts\OAuth2\Client;
 use PrestaShop\Module\PsAccounts\Api\Controller\AbstractRestController;
 use PrestaShop\Module\PsAccounts\Tests\Feature\FeatureTestCase;
 
@@ -11,7 +11,7 @@ class DeleteTest extends FeatureTestCase
     /**
      * @inject
      *
-     * @var OAuth2Client
+     * @var Client
      */
     protected $oauth2Client;
 
diff --git a/tests/Feature/Api/v1/ShopOauth2Client/StoreTest.php b/tests/Feature/Api/v1/ShopOauth2Client/StoreTest.php
index df2e2e4c9..a25412757 100644
--- a/tests/Feature/Api/v1/ShopOauth2Client/StoreTest.php
+++ b/tests/Feature/Api/v1/ShopOauth2Client/StoreTest.php
@@ -4,7 +4,7 @@
 
 use PrestaShop\Module\PsAccounts\Account\Session\Firebase\OwnerSession;
 use PrestaShop\Module\PsAccounts\Account\Session\Firebase\ShopSession;
-use PrestaShop\Module\PsAccounts\Api\Client\OAuth2\OAuth2Client;
+use PrestaShop\Module\PsAccounts\OAuth2\Client;
 use PrestaShop\Module\PsAccounts\Api\Controller\AbstractRestController;
 use PrestaShop\Module\PsAccounts\Adapter\ConfigurationKeys;
 use PrestaShop\Module\PsAccounts\Tests\Feature\FeatureTestCase;
@@ -15,7 +15,7 @@ class StoreTest extends FeatureTestCase
     /**
      * @inject
      *
-     * @var OAuth2Client
+     * @var Client
      */
     protected $oauth2Client;
 
diff --git a/tests/Unit/Account/Session/Firebase/OwnerSession/GetValidTokenTest.php b/tests/Unit/Account/Session/Firebase/OwnerSession/GetValidTokenTest.php
index ee65ecc71..c0a663297 100644
--- a/tests/Unit/Account/Session/Firebase/OwnerSession/GetValidTokenTest.php
+++ b/tests/Unit/Account/Session/Firebase/OwnerSession/GetValidTokenTest.php
@@ -6,7 +6,7 @@
 use PrestaShop\Module\PsAccounts\Account\Token\NullToken;
 use PrestaShop\Module\PsAccounts\Account\Token\Token;
 use PrestaShop\Module\PsAccounts\Account\Exception\RefreshTokenException;
-use PrestaShop\Module\PsAccounts\Api\Client\OAuth2\OAuth2ApiClient;
+use PrestaShop\Module\PsAccounts\OAuth2\ApiClient;
 use PrestaShop\Module\PsAccounts\Tests\TestCase;
 
 class GetValidTokenTest extends TestCase
@@ -23,7 +23,7 @@ class GetValidTokenTest extends TestCase
     /**
      * @inject
      *
-     * @var OAuth2ApiClient
+     * @var ApiClient
      */
     protected $oauth2ApiClient;
 
diff --git a/tests/Unit/Account/Session/Firebase/OwnerSession/RefreshTokenTest.php b/tests/Unit/Account/Session/Firebase/OwnerSession/RefreshTokenTest.php
index c8ecda8e3..9a9179d5d 100644
--- a/tests/Unit/Account/Session/Firebase/OwnerSession/RefreshTokenTest.php
+++ b/tests/Unit/Account/Session/Firebase/OwnerSession/RefreshTokenTest.php
@@ -24,7 +24,7 @@
 use PrestaShop\Module\PsAccounts\Account\Session\ShopSession;
 use PrestaShop\Module\PsAccounts\Account\Token\Token;
 use PrestaShop\Module\PsAccounts\Account\Exception\RefreshTokenException;
-use PrestaShop\Module\PsAccounts\Api\Client\OAuth2\OAuth2ApiClient;
+use PrestaShop\Module\PsAccounts\OAuth2\ApiClient;
 use PrestaShop\Module\PsAccounts\Tests\TestCase;
 
 class RefreshTokenTest extends TestCase
@@ -41,7 +41,7 @@ class RefreshTokenTest extends TestCase
     /**
      * @inject
      *
-     * @var OAuth2ApiClient
+     * @var ApiClient
      */
     protected $oauth2ApiClient;
 
diff --git a/tests/Unit/Account/Session/Firebase/ShopSession/GetValidTokenTest.php b/tests/Unit/Account/Session/Firebase/ShopSession/GetValidTokenTest.php
index ef345323a..a2acd8d1a 100644
--- a/tests/Unit/Account/Session/Firebase/ShopSession/GetValidTokenTest.php
+++ b/tests/Unit/Account/Session/Firebase/ShopSession/GetValidTokenTest.php
@@ -6,7 +6,7 @@
 use PrestaShop\Module\PsAccounts\Account\Token\NullToken;
 use PrestaShop\Module\PsAccounts\Account\Token\Token;
 use PrestaShop\Module\PsAccounts\Account\Exception\RefreshTokenException;
-use PrestaShop\Module\PsAccounts\Api\Client\OAuth2\OAuth2ApiClient;
+use PrestaShop\Module\PsAccounts\OAuth2\ApiClient;
 use PrestaShop\Module\PsAccounts\Tests\TestCase;
 
 class GetValidTokenTest extends TestCase
@@ -23,7 +23,7 @@ class GetValidTokenTest extends TestCase
     /**
      * @inject
      *
-     * @var OAuth2ApiClient
+     * @var ApiClient
      */
     protected $oauth2ApiClient;
 
diff --git a/tests/Unit/Account/Session/Firebase/ShopSession/RefreshTokenTest.php b/tests/Unit/Account/Session/Firebase/ShopSession/RefreshTokenTest.php
index 216e94a8f..9496ed92a 100644
--- a/tests/Unit/Account/Session/Firebase/ShopSession/RefreshTokenTest.php
+++ b/tests/Unit/Account/Session/Firebase/ShopSession/RefreshTokenTest.php
@@ -24,7 +24,7 @@
 use PrestaShop\Module\PsAccounts\Account\Session\ShopSession;
 use PrestaShop\Module\PsAccounts\Account\Token\Token;
 use PrestaShop\Module\PsAccounts\Account\Exception\RefreshTokenException;
-use PrestaShop\Module\PsAccounts\Api\Client\OAuth2\OAuth2ApiClient;
+use PrestaShop\Module\PsAccounts\OAuth2\ApiClient;
 use PrestaShop\Module\PsAccounts\Tests\TestCase;
 
 class RefreshTokenTest extends TestCase
@@ -41,7 +41,7 @@ class RefreshTokenTest extends TestCase
     /**
      * @inject
      *
-     * @var OAuth2ApiClient
+     * @var ApiClient
      */
     protected $oauth2ApiClient;
 
diff --git a/tests/Unit/Account/Session/ShopSession/RefreshTokenTest.php b/tests/Unit/Account/Session/ShopSession/RefreshTokenTest.php
index 6fc7b45ae..87984796f 100644
--- a/tests/Unit/Account/Session/ShopSession/RefreshTokenTest.php
+++ b/tests/Unit/Account/Session/ShopSession/RefreshTokenTest.php
@@ -4,11 +4,11 @@
 
 use PrestaShop\Module\PsAccounts\Account\Session\ShopSession;
 use PrestaShop\Module\PsAccounts\Account\Token\Token;
-use PrestaShop\Module\PsAccounts\Api\Client\OAuth2\Response\AccessToken;
-use PrestaShop\Module\PsAccounts\Api\Client\OAuth2\OAuth2ApiClient;
+use PrestaShop\Module\PsAccounts\OAuth2\Response\AccessToken;
+use PrestaShop\Module\PsAccounts\OAuth2\ApiClient;
 use PrestaShop\Module\PsAccounts\Cqrs\CommandBus;
 use PrestaShop\Module\PsAccounts\Account\Exception\RefreshTokenException;
-use PrestaShop\Module\PsAccounts\Api\Client\OAuth2\OAuth2Client;
+use PrestaShop\Module\PsAccounts\OAuth2\Client;
 use PrestaShop\Module\PsAccounts\Tests\TestCase;
 
 class RefreshTokenTest extends TestCase
@@ -25,14 +25,14 @@ class RefreshTokenTest extends TestCase
     /**
      * @inject
      *
-     * @var OAuth2Client
+     * @var Client
      */
     protected $oauth2Client;
 
     /**
      * @inject
      *
-     * @var OAuth2ApiClient
+     * @var ApiClient
      */
     protected $oauth2ApiClient;
 
@@ -46,7 +46,7 @@ function set_up()
         parent::set_up();
 
         $this->validAccessToken = $this->makeJwtToken(new \DateTimeImmutable('tomorrow'));
-        $shopProvider = $this->createMock(OAuth2ApiClient::class);
+        $shopProvider = $this->createMock(ApiClient::class);
         $shopProvider->method('getAccessTokenByClientCredentials')
             ->willReturn(new AccessToken([
                 'access_token' => (string)$this->validAccessToken
diff --git a/tests/Unit/Service/PsAccountsService/GetOrRefreshTokenTest.php b/tests/Unit/Service/PsAccountsService/GetOrRefreshTokenTest.php
index 5ce1e7fb6..24b04cefd 100644
--- a/tests/Unit/Service/PsAccountsService/GetOrRefreshTokenTest.php
+++ b/tests/Unit/Service/PsAccountsService/GetOrRefreshTokenTest.php
@@ -3,7 +3,7 @@
 namespace PrestaShop\Module\PsAccounts\Tests\Unit\Service\PsAccountsService;
 
 use PrestaShop\Module\PsAccounts\Account\Session\Firebase\ShopSession;
-use PrestaShop\Module\PsAccounts\Api\Client\OAuth2\OAuth2Client;
+use PrestaShop\Module\PsAccounts\OAuth2\Client;
 use PrestaShop\Module\PsAccounts\Service\PsAccountsService;
 use PrestaShop\Module\PsAccounts\Tests\TestCase;
 
@@ -26,7 +26,7 @@ class GetOrRefreshTokenTest extends TestCase
     /**
      * @inject
      *
-     * @var OAuth2Client
+     * @var Client
      */
     protected $oauthClient;
 

From c91fafdd9594369b8ce04656b0fc451bf24fd66a Mon Sep 17 00:00:00 2001
From: hschoenenberger <herve.schoenenberger@prestashop.com>
Date: Mon, 20 Jan 2025 11:41:47 +0100
Subject: [PATCH 44/46] fix: tests

---
 tests/Unit/Account/Session/ShopSession/RefreshTokenTest.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/Unit/Account/Session/ShopSession/RefreshTokenTest.php b/tests/Unit/Account/Session/ShopSession/RefreshTokenTest.php
index 87984796f..4ea7cb627 100644
--- a/tests/Unit/Account/Session/ShopSession/RefreshTokenTest.php
+++ b/tests/Unit/Account/Session/ShopSession/RefreshTokenTest.php
@@ -51,7 +51,7 @@ function set_up()
             ->willReturn(new AccessToken([
                 'access_token' => (string)$this->validAccessToken
             ]));
-        $shopProvider->method('getOauth2Client')
+        $shopProvider->method('getClient')
             ->willReturn($this->oauth2Client);
 
         $commandBus = $this->createMock(CommandBus::class);

From 3c790280189e4c1c930856c2a2b8d4bd3ddf3994 Mon Sep 17 00:00:00 2001
From: hschoenenberger <herve.schoenenberger@prestashop.com>
Date: Mon, 20 Jan 2025 11:57:51 +0100
Subject: [PATCH 45/46] fix: tests

---
 src/Http/Client/Curl/Client.php | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/src/Http/Client/Curl/Client.php b/src/Http/Client/Curl/Client.php
index 84312ea29..5cd29ff02 100644
--- a/src/Http/Client/Curl/Client.php
+++ b/src/Http/Client/Curl/Client.php
@@ -92,8 +92,15 @@ public function __construct($options)
         unset($options['name']);
 //        \Tools::refreshCACertFile();
 
-        // FIXME headers
-        foreach (['baseUri', 'timeout', 'objectResponse', 'sslCheck', 'allowRedirects', 'headers'] as $option) {
+        foreach ([
+                     'baseUri',
+                     'userAgent',
+                     'timeout',
+                     'objectResponse',
+                     'sslCheck',
+                     'allowRedirects',
+                     'headers',
+                 ] as $option) {
             if (isset($options[$option])) {
                 $this->$option = $options[$option];
             }
@@ -319,7 +326,9 @@ public function initRoute()
         curl_setopt($ch, CURLOPT_FOLLOWLOCATION, $this->allowRedirects);
         curl_setopt($ch, CURLOPT_POSTREDIR, $this->allowRedirects ? 3 : 0);
 
-        curl_setopt($ch, CURLOPT_USERAGENT, $this->getUserAgent());
+        if (!empty($this->userAgent)) {
+            curl_setopt($ch, CURLOPT_USERAGENT, $this->userAgent);
+        }
         //curl_setopt($ch, CURLOPT_VERBOSE, true);
 
         return $ch;
@@ -381,12 +390,4 @@ public function initCurl(array $options)
 
         return $ch;
     }
-
-    /**
-     * @return string
-     */
-    public function getUserAgent()
-    {
-        return $this->userAgent;
-    }
 }

From a4c1a7ec6291a7f73fcf005694fb2311c5afaef9 Mon Sep 17 00:00:00 2001
From: hschoenenberger <herve.schoenenberger@prestashop.com>
Date: Mon, 20 Jan 2025 16:31:45 +0100
Subject: [PATCH 46/46] refactor: response type legacy management

---
 src/Account/Session/Session.php            |  2 +-
 src/Account/Session/ShopSession.php        |  9 ++--
 src/Api/Client/AccountsClient.php          | 47 +++++-------------
 src/Api/Client/ServicesBillingClient.php   | 19 ++++----
 src/Http/Client/CircuitBreaker/Factory.php |  5 +-
 src/Http/Client/Curl/Client.php            | 44 ++++++-----------
 src/Http/Client/Response.php               | 12 +++++
 src/OAuth2/ApiClient.php                   | 56 +++++++++++++++-------
 8 files changed, 98 insertions(+), 96 deletions(-)

diff --git a/src/Account/Session/Session.php b/src/Account/Session/Session.php
index 2173ae5d7..30ff065ed 100644
--- a/src/Account/Session/Session.php
+++ b/src/Account/Session/Session.php
@@ -70,11 +70,11 @@ public function getValidToken($forceRefresh = false, $throw = true)
             } catch (RefreshTokenException $e) {
                 $this->setToken('');
                 $this->setRefreshTokenErrors(static::class);
-                Logger::getInstance()->error($e->getMessage());
 
                 if ($throw) {
                     throw $e;
                 }
+                Logger::getInstance()->error($e->getMessage());
             }
         }
 
diff --git a/src/Account/Session/ShopSession.php b/src/Account/Session/ShopSession.php
index b7d52ecc2..79c4e9e05 100644
--- a/src/Account/Session/ShopSession.php
+++ b/src/Account/Session/ShopSession.php
@@ -28,6 +28,7 @@
 use PrestaShop\Module\PsAccounts\Cqrs\CommandBus;
 use PrestaShop\Module\PsAccounts\Hook\ActionShopAccessTokenRefreshAfter;
 use PrestaShop\Module\PsAccounts\OAuth2\ApiClient;
+use PrestaShop\Module\PsAccounts\OAuth2\OAuth2Exception;
 use PrestaShop\Module\PsAccounts\OAuth2\Response\AccessToken;
 use PrestaShop\Module\PsAccounts\Repository\ConfigurationRepository;
 
@@ -106,7 +107,7 @@ public function refreshToken($refreshToken = null)
                 $this->configurationRepository->getShopId(),
                 $e->getMessage()
             ));
-            //} catch (IdentityProviderException $e) {
+        } catch (OAuth2Exception $e) {
         } catch (\Throwable $e) {
             /* @phpstan-ignore-next-line */
         } catch (\Exception $e) {
@@ -155,6 +156,8 @@ public function setOauth2ClientReceiptTimeout($oauth2ClientReceiptTimeout)
      * @param string $shopUid
      *
      * @return AccessToken
+     *
+     * @throws OAuth2Exception
      */
     protected function getAccessToken($shopUid)
     {
@@ -163,9 +166,7 @@ protected function getAccessToken($shopUid)
             //'another.audience'
         ];
 
-        $accessToken = $this->oauth2ApiClient->getAccessTokenByClientCredentials([], $audience);
-
-        return $accessToken;
+        return $this->oauth2ApiClient->getAccessTokenByClientCredentials([], $audience);
     }
 
     /**
diff --git a/src/Api/Client/AccountsClient.php b/src/Api/Client/AccountsClient.php
index cff26a2c6..5eecac42e 100644
--- a/src/Api/Client/AccountsClient.php
+++ b/src/Api/Client/AccountsClient.php
@@ -111,16 +111,13 @@ private function getHeaders($additionalHeaders = [])
      */
     public function firebaseTokens($accessToken)
     {
-        /** @var array $res */
-        $res = $this->getClient()->get(
+        return $this->getClient()->get(
             'v2/shop/firebase/tokens',
             [
                 Options::REQ_HEADERS => $this->getHeaders([
                     'Authorization' => 'Bearer ' . $accessToken,
                 ]),
-            ]);
-
-        return $res;
+            ])->toLegacy();
     }
 
     /**
@@ -131,8 +128,7 @@ public function firebaseTokens($accessToken)
      */
     public function refreshShopToken($refreshToken, $shopUuid)
     {
-        /** @var array $res */
-        $res = $this->getClient()->post(
+        return $this->getClient()->post(
             'v1/shop/token/refresh',
             [
                 Options::REQ_HEADERS => $this->getHeaders([
@@ -142,9 +138,7 @@ public function refreshShopToken($refreshToken, $shopUuid)
                     'token' => $refreshToken,
                 ],
             ]
-        );
-
-        return $res;
+        )->toLegacy();
     }
 
     /**
@@ -156,8 +150,7 @@ public function refreshShopToken($refreshToken, $shopUuid)
      */
     public function deleteUserShop($ownerUid, $shopUid, $ownerToken)
     {
-        /** @var array $res */
-        $res = $this->getClient()->delete(
+        return $this->getClient()->delete(
             'v1/user/' . $ownerUid . '/shop/' . $shopUid,
             [
                 Options::REQ_HEADERS => $this->getHeaders([
@@ -165,9 +158,7 @@ public function deleteUserShop($ownerUid, $shopUid, $ownerToken)
                     'X-Shop-Id' => $shopUid,
                 ]),
             ]
-        );
-
-        return $res;
+        )->toLegacy();
     }
 
     /**
@@ -180,8 +171,7 @@ public function deleteUserShop($ownerUid, $shopUid, $ownerToken)
      */
     public function updateUserShop($ownerUid, $shopUid, $ownerToken, UpdateShop $shop)
     {
-        /** @var array $res */
-        $res = $this->getClient()->patch(
+        return $this->getClient()->patch(
             'v1/user/' . $ownerUid . '/shop/' . $shopUid,
             [
                 Options::REQ_HEADERS => $this->getHeaders([
@@ -190,9 +180,7 @@ public function updateUserShop($ownerUid, $shopUid, $ownerToken, UpdateShop $sho
                 ]),
                 Options::REQ_JSON => $shop->jsonSerialize(),
             ]
-        );
-
-        return $res;
+        )->toLegacy();
     }
 
     /**
@@ -204,8 +192,7 @@ public function updateUserShop($ownerUid, $shopUid, $ownerToken, UpdateShop $sho
      */
     public function upgradeShopModule($shopUid, $shopToken, UpgradeModule $data)
     {
-        /** @var array $res */
-        $res = $this->getClient()->post(
+        return $this->getClient()->post(
             '/v2/shop/module/update',
             [
                 Options::REQ_HEADERS => $this->getHeaders([
@@ -214,9 +201,7 @@ public function upgradeShopModule($shopUid, $shopToken, UpgradeModule $data)
                 ]),
                 Options::REQ_JSON => $data->jsonSerialize(),
             ]
-        );
-
-        return $res;
+        )->toLegacy();
     }
 
     /**
@@ -228,8 +213,7 @@ public function upgradeShopModule($shopUid, $shopToken, UpgradeModule $data)
      */
     public function verifyToken($idToken)
     {
-        /** @var array $res */
-        $res = $this->getClient()->post(
+        return $this->getClient()->post(
             '/v1/shop/token/verify',
             [
                 Options::REQ_HEADERS => $this->getHeaders(),
@@ -237,9 +221,7 @@ public function verifyToken($idToken)
                     'token' => $idToken,
                 ],
             ]
-        );
-
-        return $res;
+        )->toLegacy();
     }
 
     /**
@@ -247,9 +229,6 @@ public function verifyToken($idToken)
      */
     public function healthCheck()
     {
-        /** @var array $res */
-        $res = $this->getClient()->get('/healthcheck');
-
-        return $res;
+        return $this->getClient()->get('/healthcheck')->toLegacy();
     }
 }
diff --git a/src/Api/Client/ServicesBillingClient.php b/src/Api/Client/ServicesBillingClient.php
index c4a5a0917..c90c05386 100644
--- a/src/Api/Client/ServicesBillingClient.php
+++ b/src/Api/Client/ServicesBillingClient.php
@@ -23,7 +23,6 @@
 use PrestaShop\Module\PsAccounts\Http\Client\Curl\Client;
 use PrestaShop\Module\PsAccounts\Http\Client\Factory;
 use PrestaShop\Module\PsAccounts\Http\Client\Options;
-use PrestaShop\Module\PsAccounts\Http\Client\Response;
 use PrestaShop\Module\PsAccounts\Provider\ShopProvider;
 use PrestaShop\Module\PsAccounts\Service\PsAccountsService;
 
@@ -82,18 +81,19 @@ public function __construct(
     /**
      * @param mixed $shopUuidV4
      *
-     * @return Response|array
+     * @return array
      */
     public function getBillingCustomer($shopUuidV4)
     {
-        return $this->client->get('/shops/' . $shopUuidV4);
+        return $this->client->get('/shops/' . $shopUuidV4)
+            ->toLegacy();
     }
 
     /**
      * @param mixed $shopUuidV4
      * @param array $bodyHttp
      *
-     * @return Response|array
+     * @return array
      */
     public function createBillingCustomer($shopUuidV4, $bodyHttp)
     {
@@ -102,18 +102,19 @@ public function createBillingCustomer($shopUuidV4, $bodyHttp)
             [
                 Options::REQ_FORM => $bodyHttp,
             ]
-        );
+        )->toLegacy();
     }
 
     /**
      * @param mixed $shopUuidV4
      * @param string $module
      *
-     * @return Response|array
+     * @return array
      */
     public function getBillingSubscriptions($shopUuidV4, $module)
     {
-        return $this->client->get('/shops/' . $shopUuidV4 . '/subscriptions/' . $module);
+        return $this->client->get('/shops/' . $shopUuidV4 . '/subscriptions/' . $module)
+            ->toLegacy();
     }
 
     /**
@@ -121,7 +122,7 @@ public function getBillingSubscriptions($shopUuidV4, $module)
      * @param string $module
      * @param array $bodyHttp
      *
-     * @return Response|array
+     * @return array
      */
     public function createBillingSubscriptions($shopUuidV4, $module, $bodyHttp)
     {
@@ -130,6 +131,6 @@ public function createBillingSubscriptions($shopUuidV4, $module, $bodyHttp)
             [
                 Options::REQ_FORM => $bodyHttp,
             ]
-        );
+        )->toLegacy();
     }
 }
diff --git a/src/Http/Client/CircuitBreaker/Factory.php b/src/Http/Client/CircuitBreaker/Factory.php
index 84fb0006b..d7acd36b6 100644
--- a/src/Http/Client/CircuitBreaker/Factory.php
+++ b/src/Http/Client/CircuitBreaker/Factory.php
@@ -22,6 +22,7 @@
 
 use PrestaShop\Module\PsAccounts\Adapter\Configuration;
 use PrestaShop\Module\PsAccounts\Api\Client\AccountsClient;
+use PrestaShop\Module\PsAccounts\Http\Client\Response;
 use PrestaShop\Module\PsAccounts\OAuth2\ApiClient;
 
 class Factory
@@ -67,11 +68,11 @@ public function createInstance($resourceId)
             'PS_ACCOUNTS',
             $this->configStorage
         );
-        $instance->setDefaultFallbackResponse([
+        $instance->setDefaultFallbackResponse(new Response([
             'status' => false,
             'httpCode' => 500,
             'body' => ['message' => 'Circuit Breaker Open'],
-        ]);
+        ]));
         $this->instances[$resourceId] = $instance;
 
         return $instance;
diff --git a/src/Http/Client/Curl/Client.php b/src/Http/Client/Curl/Client.php
index 5cd29ff02..cd011655d 100644
--- a/src/Http/Client/Curl/Client.php
+++ b/src/Http/Client/Curl/Client.php
@@ -52,11 +52,6 @@ class Client
      */
     protected $circuitBreaker;
 
-    /**
-     * @var bool
-     */
-    protected $objectResponse = false;
-
     /**
      * @var bool
      */
@@ -83,12 +78,6 @@ public function __construct($options)
             isset($options['name']) ? $options['name'] : static::class
         );
 
-        if ($this->objectResponse) {
-            $this->circuitBreaker->setDefaultFallbackResponse(
-                new Response($this->circuitBreaker->getDefaultFallbackResponse())
-            );
-        }
-
         unset($options['name']);
 //        \Tools::refreshCACertFile();
 
@@ -96,7 +85,6 @@ public function __construct($options)
                      'baseUri',
                      'userAgent',
                      'timeout',
-                     'objectResponse',
                      'sslCheck',
                      'allowRedirects',
                      'headers',
@@ -111,7 +99,7 @@ public function __construct($options)
      * @param string $route
      * @param array $options payload
      *
-     * @return Response|array return response or false if no response
+     * @return Response return response or false if no response
      */
     public function post($route, array $options = [])
     {
@@ -136,7 +124,7 @@ public function post($route, array $options = [])
      * @param string $route
      * @param array $options payload
      *
-     * @return Response|array return response or false if no response
+     * @return Response return response or false if no response
      */
     public function patch($route, array $options = [])
     {
@@ -161,7 +149,7 @@ public function patch($route, array $options = [])
      * @param string $route
      * @param array $options payload
      *
-     * @return Response|array return response or false if no response
+     * @return Response return response or false if no response
      */
     public function get($route, array $options = [])
     {
@@ -182,7 +170,7 @@ public function get($route, array $options = [])
      * @param string $route
      * @param array $options payload
      *
-     * @return Response|array return response array
+     * @return Response return response array
      */
     public function delete($route, array $options = [])
     {
@@ -234,7 +222,7 @@ public function setRoute($route)
      * @param mixed $ch
      * @param mixed $response
      *
-     * @return Response|array
+     * @return Response
      *
      * @throws CircuitBreaker\CircuitBreakerException
      */
@@ -247,31 +235,27 @@ public function getResponse($ch, $response)
         }
 
         $statusCode = curl_getinfo($ch, CURLINFO_RESPONSE_CODE);
-        $res = [
+        $response = new Response([
             'status' => $this->responseIsSuccessful([], $statusCode),
             'httpCode' => $statusCode,
             'body' => is_array($response) ?
                 $response :
                 \json_decode($response, true),
-        ];
-        $this->logResponse($res, $ch);
-
-        if ($this->objectResponse) {
-            return new Response($res);
-        }
+        ]);
+        $this->logResponse($response, $ch);
 
-        return $res;
+        return $response;
     }
 
     /**
-     * @param array $response
+     * @param Response $response
      * @param mixed $ch
      *
      * @return void
      */
-    private function logResponse($response, $ch)
+    private function logResponse(Response $response, $ch)
     {
-        if (!$response['status']) {
+        if (!$response->status) {
             Logger::getInstance()->error('response ' . var_export($response, true));
         } else {
             Logger::getInstance()->info('response ' . var_export($response, true));
@@ -341,7 +325,7 @@ public function initRoute()
      */
     public function initSsl($ch)
     {
-        $checkSsl = $this->getVerify();
+        $checkSsl = $this->getSslCheck();
         curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, $checkSsl ? 2 : 0);
         curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, $checkSsl);
     }
@@ -366,7 +350,7 @@ public function initPayload(array $options, $ch)
     /**
      * @return bool
      */
-    protected function getVerify()
+    protected function getSslCheck()
     {
         if (version_compare((string) phpversion(), '7', '>=')) {
             return $this->sslCheck;
diff --git a/src/Http/Client/Response.php b/src/Http/Client/Response.php
index 9705f425d..18f2de7b7 100644
--- a/src/Http/Client/Response.php
+++ b/src/Http/Client/Response.php
@@ -64,4 +64,16 @@ public function getBody()
     {
         return $this->body;
     }
+
+    /**
+     * @return array
+     */
+    public function toLegacy()
+    {
+        return [
+            'status' => $this->status,
+            'httpCode' => $this->httpCode,
+            'body' => $this->body,
+        ];
+    }
 }
diff --git a/src/OAuth2/ApiClient.php b/src/OAuth2/ApiClient.php
index 619646f52..88f1528a3 100644
--- a/src/OAuth2/ApiClient.php
+++ b/src/OAuth2/ApiClient.php
@@ -25,7 +25,6 @@
 use PrestaShop\Module\PsAccounts\Http\Client\Curl\Client as HttpClient;
 use PrestaShop\Module\PsAccounts\Http\Client\Factory;
 use PrestaShop\Module\PsAccounts\Http\Client\Options;
-use PrestaShop\Module\PsAccounts\Http\Client\Response;
 use PrestaShop\Module\PsAccounts\OAuth2\Response\AccessToken;
 use PrestaShop\Module\PsAccounts\OAuth2\Response\UserInfo;
 use PrestaShop\Module\PsAccounts\OAuth2\Response\WellKnown;
@@ -33,6 +32,11 @@
 
 class ApiClient
 {
+    /**
+     * openid-configuration cache (24 Hours)
+     */
+    const OPENID_CONFIGURATION_CACHE_TTL = 60 * 60 * 24;
+
     /**
      * @var string
      */
@@ -84,12 +88,12 @@ class ApiClient
      * @throws \Exception
      */
     public function __construct(
-               $baseUri,
+        $baseUri,
         Client $client,
         Link $link,
-               $cacheDir = null,
-               $defaultTimeout = 20,
-               $sslCheck = true
+        $cacheDir = null,
+        $defaultTimeout = 20,
+        $sslCheck = true
     ) {
         $this->baseUri = $baseUri;
         $this->client = $client;
@@ -97,10 +101,9 @@ public function __construct(
         $this->defaultTimeout = $defaultTimeout;
         $this->sslCheck = $sslCheck;
 
-        // FIXME configuration parameter
         $this->cachedWellKnown = new CachedFile(
             $cacheDir . '/openid-configuration.json',
-            60 * 60 * 24
+            self::OPENID_CONFIGURATION_CACHE_TTL
         );
     }
 
@@ -116,7 +119,6 @@ private function getHttpClient()
                 'headers' => $this->getHeaders(),
                 'timeout' => $this->defaultTimeout,
                 'sslCheck' => $this->sslCheck,
-                'objectResponse' => true,
             ]);
         }
 
@@ -193,10 +195,8 @@ protected function fetchWellKnown($url = null)
             $wellKnownUrl = \preg_replace('/\\/?$/', '/.well-known/openid-configuration', $wellKnownUrl);
         }
 
-        /** @var Response $response */
-        $response = $this->getHttpClient()->get($wellKnownUrl);
-
-        return $response->body;
+        return $this->getHttpClient()->get($wellKnownUrl)
+            ->getBody();
     }
 
     /**
@@ -204,10 +204,13 @@ protected function fetchWellKnown($url = null)
      * @param array $audience
      *
      * @return AccessToken access token
+     *
+     * @throws OAuth2Exception
      */
     public function getAccessTokenByClientCredentials(array $scope = [], array $audience = [])
     {
-        /** @var Response $response */
+        $this->assertClientExists();
+
         $response = $this->getHttpClient()->post(
             $this->getWellKnown()->token_endpoint,
             [
@@ -236,6 +239,8 @@ public function getAccessTokenByClientCredentials(array $scope = [], array $audi
      * @param string $uiLocales
      *
      * @return string authorization flow uri
+     *
+     * @throws OAuth2Exception
      */
     public function getAuthorizationUri(
         $state,
@@ -244,6 +249,8 @@ public function getAuthorizationUri(
         $pkceMethod = 'S256',
         $uiLocales = 'fr'
     ) {
+        $this->assertClientExists();
+
         return $this->getWellKnown()->authorization_endpoint . '?' .
             http_build_query(array_merge([
                 'ui_locales' => $uiLocales,
@@ -299,6 +306,8 @@ public function getRandomPkceCode($length = 64)
      * @param array $audience
      *
      * @return AccessToken access token
+     *
+     * @throws OAuth2Exception
      */
     public function getAccessTokenByAuthorizationCode(
         $code,
@@ -307,7 +316,8 @@ public function getAccessTokenByAuthorizationCode(
         array $scope = [],
         array $audience = []
     ) {
-        /** @var Response $response */
+        $this->assertClientExists();
+
         $response = $this->getHttpClient()->post(
             $this->getWellKnown()->token_endpoint,
             [
@@ -336,10 +346,13 @@ public function getAccessTokenByAuthorizationCode(
      * @param string $refreshToken
      *
      * @return AccessToken
+     *
+     * @throws OAuth2Exception
      */
     public function refreshAccessToken($refreshToken)
     {
-        /** @var Response $response */
+        $this->assertClientExists();
+
         $response = $this->getHttpClient()->post(
             $this->getWellKnown()->token_endpoint,
             [
@@ -365,7 +378,6 @@ public function refreshAccessToken($refreshToken)
      */
     public function getUserInfo($accessToken)
     {
-        /** @var Response $response */
         $response = $this->getHttpClient()->get(
             $this->getWellKnown()->userinfo_endpoint,
             [
@@ -417,4 +429,16 @@ public function getClient()
     {
         return $this->client;
     }
+
+    /**
+     * @return void
+     *
+     * @throws OAuth2Exception
+     */
+    protected function assertClientExists()
+    {
+        if (!$this->client->exists()) {
+            throw new OAuth2Exception('OAuth2 client not configured');
+        }
+    }
 }