[ACCOUNT-2522] feat: bakend login compat v9

.docker/docker-compose.prestashop@prestashop-flashlight.yml

@@ -3,12 +3,14 @@ services:
   prestashop:
     container_name: phpunit
 #    image: 'prestashop/prestashop-flashlight:1.7.6.9-7.2'
+#    image: prestashop/prestashop-flashlight:8.1.5-7.4
     image: ${PLATFORM_IMAGE}
     healthcheck:
       test: curl --fail http://localhost:80 || exit 1
       interval: 10s
       timeout: 10s
       retries: 5
+#    user: www-data
     user: root
     environment:
       - PS_DOMAIN=localhost

.gitignore

@@ -57,3 +57,5 @@ views/files/*
 npm-debug.log*
 yarn-debug.log*
 yarn-error.log*
+
+/cache/

.zip-contents

@@ -1,7 +1,9 @@
 config
+config_module
 controllers
 sql
 src
+templates
 translations
 upgrade
 vendor

.zip-excludes

@@ -4,7 +4,8 @@
 *.docker/*
 *.idea/*
 *tests/*
-*config/config.yml.*
+*config/config.yml*
+*config_module/config.yml.*
 *.bak/*
 *.md/*
 *composer.*

Makefile

@@ -59,7 +59,7 @@ platform-restart: platform-stop platform-start
 
 platform-module-config:
 	@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_module/config.yml ]; then cp ./config_module/config.yml.dist ./config_module/config.yml; fi"
 
 platform-module-version:
 	@docker exec -w ${CONTAINER_INSTALL_DIR} phpunit \
@@ -75,9 +75,12 @@ platform-module-install: tests/vendor platform-phpstan-config platform-module-co
 	-@docker exec phpunit sh -c "if [ ! -f ./bin/console ]; then php -d memory_limit=-1 ./modules/ps_accounts/tests/install-module.php; fi"
 
 platform-fix-permissions:
-	@docker exec phpunit sh -c "if [ -d ./var ]; then chown -R www-data:www-data ./var; fi"
-	@docker exec phpunit sh -c "if [ -d ./cache ]; then chown -R www-data:www-data ./cache; fi" # PS1.6
-	@docker exec phpunit sh -c "if [ -d ./log ]; then chown -R www-data:www-data ./log; fi" # PS1.6
+	@docker exec -u root phpunit sh -c "if [ -d ./var ]; then chown -R www-data:www-data ./var; fi"
+	@docker exec -u root phpunit sh -c "if [ -d ./cache ]; then chown -R www-data:www-data ./cache; fi" # PS1.6
+	@docker exec -u root phpunit sh -c "if [ -d ./log ]; then chown -R www-data:www-data ./log; fi" # PS1.6
+	@docker exec -u root phpunit sh -c "chgrp -R www-data ${CONTAINER_INSTALL_DIR}"
+	@docker exec -u root phpunit sh -c "find ${CONTAINER_INSTALL_DIR} -type d -exec chmod g+r,g+w,g+x {} \;"
+	@docker exec -u root phpunit sh -c "find ${CONTAINER_INSTALL_DIR} -type f -exec chmod g+r,g+w {} \;"
 
 #phpunit-xdebug:
 #	-@docker exec phpunit sh -c "docker-php-ext-enable xdebug"
@@ -255,13 +258,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 config_module/config.yml 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_module/config.yml.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_module/config.yml.preprod build-front
 	@./scripts/bundle-module.sh "ps_accounts_preprod.zip" "preprod"
 
 define build_front
@@ -296,7 +299,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

_dev/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ps_accounts",
-  "version": "7.0.8",
+  "version": "7.0.9",
   "private": true,
   "scripts": {
     "dev": "vite",

composer.json

@@ -77,4 +77,4 @@
         ]
     },
     "author": "PrestaShop"
-}
+}

config.xml

@@ -2,7 +2,7 @@
 <module>
     <name>ps_accounts</name>
     <displayName><![CDATA[PrestaShop Account]]></displayName>
-    <version><![CDATA[7.0.8]]></version>
+    <version><![CDATA[7.0.9]]></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>

config/admin/services.yml

@@ -1,2 +1,2 @@
 imports:
-  - { resource: ../config.yml }
+  - { resource: ../services.yml }

config/front/services.yml

@@ -1,2 +1,2 @@
 imports:
-  - { resource: ../config.yml }
+  - { resource: ../services.yml }

config/routes.yml

@@ -0,0 +1,48 @@
+ps_accounts_oauth2:
+  path: ps_accounts/oauth2
+  methods: [GET]
+  defaults:
+    _controller: 'PrestaShop\Module\PsAccounts\Controller\Admin\OAuth2Controller::initOAuth2FlowAction'
+    _anonymous_controller: true
+    _legacy_controller: SfAdminOAuth2PsAccounts
+    _legacy_link: SfAdminOAuth2PsAccounts
+
+## override login (+ forward original login)
+#ps_accounts_login:
+#  path: /login
+#  methods: [GET]
+#  defaults:
+#    _controller: 'PrestaShop\Module\PsAccounts\Controller\Admin\OAuth2Controller::displayLogin'
+#    _anonymous_controller: true
+#    _legacy_controller: SfAdminLoginPsAccounts
+#    _legacy_link: SfAdminLoginPsAccounts
+#    _disable_module_prefix: true
+#
+#ps_accounts_local_login:
+#  path: /local-login
+#  methods: [GET]
+#  defaults:
+#    _controller: 'PrestaShop\Module\PsAccounts\Controller\Admin\OAuth2Controller::displayLocalLogin'
+#    _anonymous_controller: true
+#    _legacy_controller: SfAdminLocalLoginPsAccounts
+#    _legacy_link: SfAdminLocalLoginPsAccounts
+#    _disable_module_prefix: true
+
+ps_accounts_login:
+  path: ps_accounts/login
+  methods: [GET]
+  defaults:
+    _controller: 'PrestaShop\Module\PsAccounts\Controller\Admin\OAuth2Controller::displayLoginAction'
+    _anonymous_controller: true
+    _legacy_controller: SfAdminLoginPsAccounts
+    _legacy_link: SfAdminLoginPsAccounts
+
+# TODO: Or we preserve original legacy controller or we create a legacy sf route
+#ps_accounts_oauth2_legacy:
+#  path: ps_accounts/oauth2_legacy
+#  methods: [GET]
+#  defaults:
+#    _controller: 'PrestaShop\Module\PsAccounts\Controller\Admin\OAuth2Controller::initOAuth2FlowLegacy'
+#    _anonymous_controller: true
+#    _legacy_controller: AdminOAuth2PsAccounts
+#    _legacy_link: AdminOAuth2PsAccounts

config/services.yml

@@ -0,0 +1,11 @@
+services:
+  PrestaShop\Module\PsAccounts\Controller\Admin\OAuth2Controller:
+    class: PrestaShop\Module\PsAccounts\Controller\Admin\OAuth2Controller
+#    autowire: true
+#    autoconfigure: true
+
+  PrestaShop\Module\PsAccounts\EventListener\Admin\LogoutSubscriber:
+    class: PrestaShop\Module\PsAccounts\EventListener\Admin\LogoutSubscriber
+    tags:
+      - name: kernel.event_subscriber
+        dispatcher: security.event_dispatcher.main

config_module/admin/services.yml

@@ -0,0 +1,2 @@
+imports:
+  - { resource: ../config.yml }

config/common.yml → config_module/common.yml

@@ -141,6 +141,13 @@ services:
       - null
       - 10
 
+  PrestaShop\Module\PsAccounts\Api\Client\ExternalAssetsClient:
+    class: PrestaShop\Module\PsAccounts\Api\Client\ExternalAssetsClient
+    public: true
+    arguments:
+      - null
+      - 10
+
   PrestaShop\Module\PsAccounts\Api\Client\ServicesBillingClient:
     class: PrestaShop\Module\PsAccounts\Api\Client\ServicesBillingClient
     public: true

config_module/front/services.yml

@@ -0,0 +1,2 @@
+imports:
+  - { resource: ../config.yml }

controllers/admin/AdminLoginPsAccountsController.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\ExternalAssetsClient;
 use PrestaShop\Module\PsAccounts\Polyfill\Traits\AdminController\IsAnonymousAllowed;
 use PrestaShop\Module\PsAccounts\Provider\OAuth2\ShopProvider;
 
@@ -27,11 +28,20 @@ class AdminLoginPsAccountsController extends \AdminController
 
     const PARAM_MODE_LOCAL = 'local';
 
-    /** @var string */
+    /**
+     * @var string
+     */
     public $template = 'login.tpl';
 
-    /** @var Ps_accounts */
-    private $psAccounts;
+    /**
+     * @var Ps_accounts
+     */
+    public $module;
+
+    /**
+     * @var ExternalAssetsClient
+     */
+    private $externalAssetsClient;
 
     /**
      * @throws Exception
@@ -50,8 +60,9 @@ public function __construct()
 
         /** @var Ps_accounts $module */
         $module = Module::getInstanceByName('ps_accounts');
+        $this->module = $module;
 
-        $this->psAccounts = $module;
+        $this->externalAssetsClient = $this->module->getService(ExternalAssetsClient::class);
 
         if (!headers_sent()) {
             header('Login: true');
@@ -108,8 +119,8 @@ public function viewAccess($disable = false)
      */
     public function setMedia($isNewTheme = false)
     {
-        $this->addCss($this->psAccounts->getLocalPath() . '/views/css/login.css');
-        $this->addJS($this->psAccounts->getLocalPath() . '/views/js/login.js');
+        $this->addCss($this->module->getLocalPath() . '/views/css/login.css');
+        $this->addJS($this->module->getLocalPath() . '/views/js/login.js');
     }
 
     /**
@@ -122,11 +133,11 @@ public function setMedia($isNewTheme = false)
     public function createTemplate($tpl_name)
     {
         /** @var ShopProvider $provider */
-        $provider = $this->psAccounts->getService(ShopProvider::class);
+        $provider = $this->module->getService(ShopProvider::class);
 
         $testimonials = $this->getTestimonials();
 
-        $session = $this->psAccounts->getSession();
+        $session = $this->module->getSession();
 
         /* @phpstan-ignore-next-line */
         $isoCode = $this->context->currentLocale->getCode();
@@ -144,42 +155,25 @@ public function createTemplate($tpl_name)
             'testimonials' => $testimonials,
             'loginError' => $session->remove('loginError'),
             'meta_title' => '',
-            'ssoResendVerificationEmail' => $this->psAccounts->getParameter(
+            'ssoResendVerificationEmail' => $this->module->getParameter(
                 'ps_accounts.sso_resend_verification_email_url'
             ),
         ]);
 
         /* @phpstan-ignore-next-line */
         return $this->context->smarty->createTemplate(
-            $this->psAccounts->getLocalPath() . '/views/templates/admin/' . $this->template,
+            $this->module->getLocalPath() . '/views/templates/admin/' . $this->template,
             $this->context->smarty
         );
     }
 
     /**
      * @return array
-     *
-     * @throws Exception
      */
     private function getTestimonials()
     {
-        $verify = (bool) $this->psAccounts->getParameter('ps_accounts.check_api_ssl_cert');
-
-        return json_decode(
-            (string) Tools::file_get_contents(
-                $this->psAccounts->getParameter('ps_accounts.testimonials_url'),
-                false,
-                stream_context_create([
-                    'ssl' => [
-                        'verify_peer' => $verify,
-                        'verify_peer_name' => $verify,
-                    ],
-                    'http' => [
-                        'ignore_errors' => '1',
-                    ],
-                ])
-            ),
-            true
-        ) ?: [];
+        $res = $this->externalAssetsClient->getTestimonials();
+
+        return $res['status'] ? $res['body'] : [];
     }
 }