major/v8

.dir-scoped

@@ -4,4 +4,3 @@ prestashopcorp/lightweight-container
 lcobucci
 monolog
 ramsey/uuid
-phpseclib/phpseclib/phpseclib

.gitignore

@@ -45,6 +45,8 @@ views/files/*
 /views/js/settings*.js.map
 /views/js/settingsOnBoarding*.js
 /views/js/settingsOnBoarding*.js.map
+/views/js/notifications*.js
+/views/js/notifications*.js.map
 /views/js/login*.js
 /views/js/login*.js.map
 /views/css/login*.css

.ver-scoped

@@ -0,0 +1 @@
+PsAccounts

Makefile

@@ -238,6 +238,10 @@ phpstan-8.1.5-7.4:    platform-8.1.5-7.4    phpstan
 PHP_SCOPER_VENDOR_DIRS = $(shell cat .dir-scoped)
 PHP_SCOPER_OUTPUT_DIR := vendor-scoped
 PHP_SCOPER_VERSION := 0.18.11
+PHP_SCOPER_VERSION_PREFIX = $(shell cat .ver-scoped)
+
+php-scoper-version-prefix:
+	@echo "${PHP_SCOPER_VERSION_PREFIX}"
 
 ${WORKDIR}/php-scoper.phar:
 	curl -s -f -L -O "https://github.com/humbug/php-scoper/releases/download/${PHP_SCOPER_VERSION}/php-scoper.phar"
@@ -258,13 +262,21 @@ php-scoper-add-prefix: scoper.inc.php vendor-clean vendor ${WORKDIR}/php-scoper.
 	$(foreach DIR,$(PHP_SCOPER_VENDOR_DIRS), rm -rf "./vendor/${DIR}" && mv "./${PHP_SCOPER_OUTPUT_DIR}/${DIR}" ./vendor/${DIR};)
 	if [ ! -z ${PHP_SCOPER_OUTPUT_DIR} ]; then rm -rf "./${PHP_SCOPER_OUTPUT_DIR}"; fi
 
+REGEX_UPDATE_PREFIX := "s/PrestaShop\\\\Module\\\\PsAccounts\([0-9]*\)\\\\Vendor/PrestaShop\\\\Module\\\\${PHP_SCOPER_VERSION_PREFIX}\\\\Vendor/"
+REGEX_UPDATE_PREFIX2 := "s/PrestaShop\\\\\\\\Module\\\\\\\\PsAccounts\([0-9]*\)\\\\\\\\Vendor/PrestaShop\\\\\\\\Module\\\\\\\\${PHP_SCOPER_VERSION_PREFIX}\\\\\\\\Vendor/"
+php-scoper-update-prefix:
+	@echo "updating prefix..."
+	find ./tests -type f -exec sed -i -e ${REGEX_UPDATE_PREFIX} {} \;
+	find ./src -type f -exec sed -i -e ${REGEX_UPDATE_PREFIX} {} \;
+	sed -i -e ${REGEX_UPDATE_PREFIX2} ./composer.json
 
 php-scoper-dump-autoload:
 	${COMPOSER} dump-autoload --classmap-authoritative
 
 php-scoper-fix-autoload:
 	php fix-autoload.php
 
+#php-scoper: php-scoper-add-prefix php-scoper-update-prefix php-scoper-dump-autoload php-scoper-fix-autoload
 php-scoper: php-scoper-add-prefix php-scoper-dump-autoload php-scoper-fix-autoload
 
 ##########

README.md

@@ -8,11 +8,11 @@
 # Context
 
 The module **ps_accounts** is the interface between your module and PrestaShop's services. It manages:
-- Shop association/dissociation process;
+- Shop **Identification** and **Verification** process;
 - Providing tokens to communicate safely with PrestaShop services;
 - Synchronize basic informations about the shops (ex: shop URLs, name, ...).
 
-This module is a basis for other modules using PrestaShop services.
+This module is a base component for other modules using PrestaShop services.
 
 # Installation
 
@@ -27,6 +27,7 @@ We aims to follow partially the Prestashop compatibility charts
 
 | ps_accounts version  | Prestashop Version   | PHP Version       |
 |----------------------|----------------------|-------------------|
+| ^8.0.0               | \>=1.6 && <= 9.x     | PHP 5.6 - 8       |
 | ^7.0.9               | \>=1.6 && <= 9.x     | PHP 5.6 - 8       |
 | 7.x                  | \>=1.6 && <9.x       | PHP 5.6 - 8       |
 | ~~6.x (deprecated)~~ | ~~\>=8.0.0~~         | ~~PHP 7.2 - 8~~   |
@@ -70,11 +71,10 @@ Media::addJsDef([
 
 return $this->display(__FILE__, 'views/templates/admin/app.tpl');
 ```
-Alternatively you can still use : [PrestaShop Accounts Installer](http://github.com/PrestaShopCorp/prestashop-accounts-installer) for more details on how to setup Installer.
 
 ### Load and init the component on your page
 
-For detailed usage you can follow the component's documentation : [prestashop_accounts_vue_components](https://github.com/PrestaShopCorp/prestashop_accounts_vue_components)
+For detailed usage you can follow the component's documentation : [vue-components](https://github.com/PrestaShopCorp/accounts/tree/main/packages/vue-components#readme)
 
 ## How to retrieve tokens with PsAccounts
 
@@ -91,6 +91,46 @@ This module provides the following tokens:
 - **ShopAccessToken** (provided by [Prestashop OpenId Connect Provider](https://oauth.prestashop.com/.well-known/openid-configuration))  
   For machine to machine calls. (also used to keep up to date legacy Shop and Owner tokens
 
+### How to get shop status
+
+#### Retrieving v8 Shop Status
+```php
+// /!\ TODO: Starting here you are responsible to check that the module is installed
+
+/** @var Ps_accounts $module */
+$module = \Module::getModuleIdByName('ps_accounts');
+
+/** @var \PrestaShop\Module\PsAccounts\Service\PsAccountsService $service */
+$service = $module->getService(\PrestaShop\Module\PsAccounts\Service\PsAccountsService::class);
+
+// Starting from v8 status has been split into 3 distinct information
+$service->isShopIdentityCreated();
+$service->isShopIdentityVerified();
+$service->isShopPointOfContactSet();
+```
+
+#### Shop status compatibility with v7
+```php
+
+// strictly equivalent to:
+//      service->isShopIdentityCreated() &&
+//      $service->isShopIdentityVerified() &&
+//      $service->isShopPointOfContactSet()
+$isShopLinked = $service->isAccountLinked();
+```
+
+#### Tokens availability with legacy compatibility table
+
+| Method Name             | PrestaShop AccessToken | Scopes        | **_Legacy_**<br/>Firebase Shop Id Token | **_Legacy_**<br/>Firebase User Id Token |
+|-------------------------|------------------------|---------------|-----------------------------------------|-----------------------------------------|
+| **_>= v8.0.0_**         |                        |               |                                         |                                         |
+| isShopIdentityCreated   | Yes                    |               | Yes                                     | No                                      |
+| isShopIdentityVerified  | Yes                    | shop.verified | Yes                                     | No                                      |
+| isShopPointOfContactSet | Yes                    | shop.verified | Yes                                     | Yes                                     |
+| **_< v8.0.0_**          |                        |               |                                         |                                         |
+| isAccountLinked         | Yes                    | shop.verified | Yes                                     | Yes                                     |
+
+
 ### How to get up-to-date JWT Shop Access Tokens
 
 ```php
@@ -176,8 +216,6 @@ Here are listed custom hooks provided with this module:
 
 | hook                              | params           | description                                  |
 |-----------------------------------|------------------|----------------------------------------------|
-| actionShopAccountLinkAfter        | shopId, shopUuid | Triggered after link shop acknowledged       |
-| actionShopAccountUnlinkAfter      | shopId, shopUuid | Triggered after unlink shop acknowledged     |
 | actionShopAccessTokenRefreshAfter | token            | Triggered after OAuth access token refreshed |
 
 # Building the module locally

_dev/apps/configuration/App.vue

@@ -17,53 +17,88 @@
  * International Registered Trademark & Property of PrestaShop SA
  *-->
 <template>
-  <div id="settingsApp">
-    <div class="onboarding">
-      <section class="onboarding-header">
-        <ConfigInformation />
-      </section>
-
-      <section class="onboarding-content">
-        <prestashop-accounts></prestashop-accounts>
-      </section>
-    </div>
-  </div>
+  <PuikTabNavigation :name="args.name" :default-position="args.defaultPosition">
+    <!-- <PuikTabNavigationGroupTitles :ariaLabel="args.ariaLabel">
+      <PuikTabNavigationTitle :position="1">
+        Configuration
+      </PuikTabNavigationTitle>
+      <PuikTabNavigationTitle :position="2"> Help </PuikTabNavigationTitle>
+    </PuikTabNavigationGroupTitles> -->
+    <PuikTabNavigationGroupPanels>
+      <PuikTabNavigationPanel :position="1">
+        <div class="panelContent">
+          <prestashop-accounts>
+            <template v-if="!cdnIsLoaded">
+              <puik-alert variant="danger">Failed to load PrestaShop Account</puik-alert>
+            </template>
+          </prestashop-accounts>
+        </div>
+      </PuikTabNavigationPanel>
+      <!-- <PuikTabNavigationPanel :position="2">
+        <div class="panelContent">
+          Content for Profile tab goes here.
+          <p>Profile content goes here.</p>
+          <p>More profile content can be added here.</p>
+        </div>
+      </PuikTabNavigationPanel> -->
+    </PuikTabNavigationGroupPanels>
+  </PuikTabNavigation>
 </template>
 
 <script setup lang="ts">
 import ConfigInformation from "@/configuration/components/ConfigInformation.vue";
-import { onMounted } from "vue";
-import { init } from "prestashop_accounts_vue_components"
+import {
+  PuikTabNavigation,
+  PuikTabNavigationGroupTitles,
+  PuikTabNavigationTitle,
+  PuikTabNavigationGroupPanels,
+  PuikTabNavigationPanel, PuikAlert,
+} from "@prestashopcorp/puik-components";
+import { onMounted, ref } from "vue";
+
+const args = {
+  name: "PS-Accounts",
+  defaultPosition: 1,
+  ariaLabel: "PS-Accounts tabs",
+};
+
+const cdnIsLoaded = ref(true);
 
 onMounted(async () => {
   if (window?.psaccountsVue) {
-    return window?.psaccountsVue?.init();
+    return window?.psaccountsVue?.init(
+      window.contextPsAccounts.component_params_init,
+      "Settings",
+    );
   }
-  init();
+  cdnIsLoaded.value = false;
 });
 </script>
 <style lang="scss">
-#settingsApp {
-  font-family: Open Sans, Helvetica, Arial, sans-serif;
-}
 .nobootstrap {
-  background-color: unset !important;
-  padding: 100px 10px 100px;
+  background-color: #ffffff;
+  padding-top: 100px;
+  padding-right: 10px;
+  padding-left: 10px;
   min-width: unset !important;
+  min-height: calc(100vh - 100px) !important;
+}
+
+#main {
+  background-color: #ffffff;
 }
 .page-sidebar.mobile #content.nobootstrap {
   @apply psacc-ml-0;
 }
-.onboarding {
+
+/* .puik-tab-navigation__group-titles {
+  border-bottom: rgb(221 221 221) 1px solid;
+}
+ */
+.panelContent {
   @apply psacc-pt-24 psacc-max-w-screen-lg psacc-mx-auto;
-  &-header {
-    @apply psacc-mb-2;
-  }
   @screen md {
     @apply psacc-pt-4;
-    &-header {
-      @apply psacc-mb-4;
-    }
   }
 }
 </style>

_dev/apps/configuration/types/window.d.ts

@@ -1,5 +1,19 @@
+type ContextParamsInit = {
+    mode: 1 | 2 | 4;
+    shopId: number;
+    groupId: number;
+    getContextUrl: string;
+    manageAccountUrl: string;
+    token: string;
+    psxName: string;
+}
+
 interface Window {
     psaccountsVue: any;
     signInComponent: any;
     storePsAccounts: any;
-}
+    contextPsAccounts: {
+      [key: string]: any;
+      component_params_init: ContextParamsInit;
+    };
+}

_dev/apps/notifications/index.ts

@@ -0,0 +1,53 @@
+document.addEventListener('DOMContentLoaded', async function() {
+  function getParams() {
+    const scriptFilename = 'ps_accounts/views/js/notifications.js';
+    const scripts = document.querySelectorAll('script');
+
+    let currentScript: HTMLScriptElement|null = null;
+    scripts.forEach(script => {
+      if (script.src.includes(scriptFilename)) {
+        currentScript = script;
+      }
+    });
+
+    if (currentScript) {
+      // Get the full URL of the script
+      const scriptSrc = currentScript['src'];
+      const url = new URL(scriptSrc);
+
+      return url.searchParams;
+    }
+    return null;
+  }
+
+  async function getNotifications(uri: string) {
+    return await fetch(uri, {
+      method: 'GET'
+    })
+      .then(response => response.json())
+      .then(data => {
+        return data;
+      })
+      .catch(error => {
+        console.error('Error:', error);
+        return null;
+      });
+  }
+
+  function injectNotifications(notifications: [], container: Element)
+  {
+    notifications.forEach((notif: any) => {
+      const alert = document.createElement('div');
+      alert.innerHTML = notif?.html;
+      container.prepend(alert);
+    });
+  }
+
+  const container = document.querySelector('#main-div .content-div, #main #content');
+  if (! container) return;
+
+  const params = getParams();
+  if (!params) return;
+
+  injectNotifications(await getNotifications(params.get('ctx') || ''), container);
+});

_dev/index.html

@@ -10,4 +10,4 @@
     <div id="app"></div>
     <script type="module" src="/src/main.js"></script>
   </body>
-</html>
+</html>

_dev/package.json

@@ -1,12 +1,13 @@
 {
   "name": "ps_accounts",
-  "version": "7.2.2",
+  "version": "8.0.0",
   "private": true,
   "scripts": {
     "dev": "vite",
-    "build": "vue-tsc --noEmit && vite build && vite build --config=vite.login.config.ts",
+    "build": "vue-tsc --noEmit && vite build && vite build --config=vite.login.config.ts && vite build --config=vite.notifications.config.ts",
     "build:vue": "vue-tsc --noEmit && vite build",
     "build:login": "vite build --config=vite.login.config.ts",
+    "build:notifications": "vite build --config=vite.notifications.config.ts",
     "lint": "eslint --ext .js,.ts,.vue .",
     "lint:fix": "eslint --ext .js,.ts,.vue . --fix"
   },
@@ -16,7 +17,6 @@
     "@prestashopcorp/puik-resolver": "^2.0.1",
     "@prestashopcorp/puik-tailwind-preset": "^2.2.0",
     "@splidejs/splide": "^4.1.4",
-    "prestashop_accounts_vue_components": "^5.3.0",
     "vue": "^3.5.13",
     "vue-i18n": "^11.1.0",
     "zoid": "9.0.86"