From 8141cbf3de46b97b9d4a4c70a9b1fbc7f98e0413 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Herv=C3=A9=20Schoenenberger?=
 <herve.schoenenberger@prestashop.com>
Date: Tue, 10 Oct 2023 10:51:59 +0200
Subject: [PATCH] fix: cherry pick fixes

---
 classes/Adapter/ConfigurationKeys.php         | 47 +++++++++++++++++
 src/Adapter/ConfigurationKeys.php             | 51 -------------------
 .../Api/v1/ShopLinkAccount/StoreTest.php      |  2 +-
 3 files changed, 48 insertions(+), 52 deletions(-)
 create mode 100644 classes/Adapter/ConfigurationKeys.php
 delete mode 100644 src/Adapter/ConfigurationKeys.php

diff --git a/classes/Adapter/ConfigurationKeys.php b/classes/Adapter/ConfigurationKeys.php
new file mode 100644
index 000000000..c6018ca4d
--- /dev/null
+++ b/classes/Adapter/ConfigurationKeys.php
@@ -0,0 +1,47 @@
+<?php
+
+namespace PrestaShop\Module\PsAccounts\Adapter;
+
+use ReflectionClass;
+
+class ConfigurationKeys
+{
+    const PSX_UUID_V4 = 'PSX_UUID_V4';
+
+    // PS Shop Account
+    const PS_ACCOUNTS_FIREBASE_ID_TOKEN = 'PS_ACCOUNTS_FIREBASE_ID_TOKEN';
+    const PS_ACCOUNTS_FIREBASE_REFRESH_TOKEN = 'PS_ACCOUNTS_FIREBASE_REFRESH_TOKEN';
+    const PS_ACCOUNTS_FIREBASE_REFRESH_TOKEN_FAILURE = 'PS_ACCOUNTS_FIREBASE_REFRESH_TOKEN_FAILURE';
+
+    // PS User Account
+    const PS_ACCOUNTS_FIREBASE_EMAIL = 'PS_ACCOUNTS_FIREBASE_EMAIL';
+    const PS_ACCOUNTS_FIREBASE_EMAIL_IS_VERIFIED = 'PS_ACCOUNTS_FIREBASE_EMAIL_IS_VERIFIED';
+    const PS_ACCOUNTS_USER_FIREBASE_UUID = 'PS_ACCOUNTS_USER_FIREBASE_UUID';
+    const PS_ACCOUNTS_USER_FIREBASE_ID_TOKEN = 'PS_ACCOUNTS_USER_FIREBASE_ID_TOKEN';
+    const PS_ACCOUNTS_USER_FIREBASE_REFRESH_TOKEN = 'PS_ACCOUNTS_USER_FIREBASE_REFRESH_TOKEN';
+    const PS_ACCOUNTS_USER_FIREBASE_REFRESH_TOKEN_FAILURE = 'PS_ACCOUNTS_USER_FIREBASE_REFRESH_TOKEN_FAILURE';
+    const PS_ACCOUNTS_SHOP_UNLINKED_AUTO = 'PS_ACCOUNTS_SHOP_UNLINKED_AUTO';
+
+    // PS Backend User
+    const PS_ACCOUNTS_EMPLOYEE_ID = 'PS_ACCOUNTS_EMPLOYEE_ID';
+
+    // API keys
+    const PS_ACCOUNTS_RSA_PUBLIC_KEY = 'PS_ACCOUNTS_RSA_PUBLIC_KEY';
+    const PS_ACCOUNTS_RSA_PRIVATE_KEY = 'PS_ACCOUNTS_RSA_PRIVATE_KEY';
+    const PS_ACCOUNTS_RSA_SIGN_DATA = 'PS_ACCOUNTS_RSA_SIGN_DATA';
+
+    // /!\ Compat with ps_checkout
+    const PS_CHECKOUT_SHOP_UUID_V4 = 'PS_CHECKOUT_SHOP_UUID_V4';
+    const PS_PSX_FIREBASE_ID_TOKEN = 'PS_PSX_FIREBASE_ID_TOKEN';
+    const PS_PSX_FIREBASE_REFRESH_TOKEN = 'PS_PSX_FIREBASE_REFRESH_TOKEN';
+    const PS_PSX_FIREBASE_REFRESH_DATE = 'PS_PSX_FIREBASE_REFRESH_DATE';
+    const PS_PSX_FIREBASE_EMAIL = 'PS_PSX_FIREBASE_EMAIL';
+
+    /**
+     * @return array
+     */
+    public static function getKeys()
+    {
+        return (new ReflectionClass(self::class))->getConstants();
+    }
+}
diff --git a/src/Adapter/ConfigurationKeys.php b/src/Adapter/ConfigurationKeys.php
deleted file mode 100644
index 82d3eee76..000000000
--- a/src/Adapter/ConfigurationKeys.php
+++ /dev/null
@@ -1,51 +0,0 @@
-<?php
-
-namespace PrestaShop\Module\PsAccounts\Adapter;
-
-use ReflectionClass;
-
-class ConfigurationKeys
-{
-    public const PSX_UUID_V4 = 'PSX_UUID_V4';
-
-    // PS Shop Account
-    public const PS_ACCOUNTS_FIREBASE_ID_TOKEN = 'PS_ACCOUNTS_FIREBASE_ID_TOKEN';
-    public const PS_ACCOUNTS_FIREBASE_REFRESH_TOKEN = 'PS_ACCOUNTS_FIREBASE_REFRESH_TOKEN';
-    public const PS_ACCOUNTS_FIREBASE_REFRESH_TOKEN_FAILURE = 'PS_ACCOUNTS_FIREBASE_REFRESH_TOKEN_FAILURE';
-
-    // PS User Account
-    public const PS_ACCOUNTS_FIREBASE_EMAIL = 'PS_ACCOUNTS_FIREBASE_EMAIL';
-    public const PS_ACCOUNTS_FIREBASE_EMAIL_IS_VERIFIED = 'PS_ACCOUNTS_FIREBASE_EMAIL_IS_VERIFIED';
-    public const PS_ACCOUNTS_USER_FIREBASE_UUID = 'PS_ACCOUNTS_USER_FIREBASE_UUID';
-    public const PS_ACCOUNTS_USER_FIREBASE_ID_TOKEN = 'PS_ACCOUNTS_USER_FIREBASE_ID_TOKEN';
-    public const PS_ACCOUNTS_USER_FIREBASE_REFRESH_TOKEN = 'PS_ACCOUNTS_USER_FIREBASE_REFRESH_TOKEN';
-    public const PS_ACCOUNTS_USER_FIREBASE_REFRESH_TOKEN_FAILURE = 'PS_ACCOUNTS_USER_FIREBASE_REFRESH_TOKEN_FAILURE';
-    public const PS_ACCOUNTS_SHOP_UNLINKED_AUTO = 'PS_ACCOUNTS_SHOP_UNLINKED_AUTO';
-
-    // PS Backend User
-    public const PS_ACCOUNTS_EMPLOYEE_ID = 'PS_ACCOUNTS_EMPLOYEE_ID';
-
-    // API keys
-    public const PS_ACCOUNTS_RSA_PUBLIC_KEY = 'PS_ACCOUNTS_RSA_PUBLIC_KEY';
-    public const PS_ACCOUNTS_RSA_PRIVATE_KEY = 'PS_ACCOUNTS_RSA_PRIVATE_KEY';
-    public const PS_ACCOUNTS_RSA_SIGN_DATA = 'PS_ACCOUNTS_RSA_SIGN_DATA';
-
-    // /!\ Compat with ps_checkout
-    public const PS_CHECKOUT_SHOP_UUID_V4 = 'PS_CHECKOUT_SHOP_UUID_V4';
-    public const PS_PSX_FIREBASE_ID_TOKEN = 'PS_PSX_FIREBASE_ID_TOKEN';
-    public const PS_PSX_FIREBASE_REFRESH_TOKEN = 'PS_PSX_FIREBASE_REFRESH_TOKEN';
-    public const PS_PSX_FIREBASE_REFRESH_DATE = 'PS_PSX_FIREBASE_REFRESH_DATE';
-    public const PS_PSX_FIREBASE_EMAIL = 'PS_PSX_FIREBASE_EMAIL';
-
-    // PsAccounts SSO login enabled
-    public const PS_ACCOUNTS_LOGIN_ENABLED = 'PS_ACCOUNTS_LOGIN_ENABLED';
-
-    // OAuth2 client setup
-    public const PS_ACCOUNTS_OAUTH2_CLIENT_ID = 'PS_ACCOUNTS_OAUTH2_CLIENT_ID';
-    public const PS_ACCOUNTS_OAUTH2_CLIENT_SECRET = 'PS_ACCOUNTS_OAUTH2_CLIENT_SECRET';
-
-    public static function getKeys(): array
-    {
-        return (new ReflectionClass(self::class))->getConstants();
-    }
-}
diff --git a/tests/Feature/Api/v1/ShopLinkAccount/StoreTest.php b/tests/Feature/Api/v1/ShopLinkAccount/StoreTest.php
index 12c25ba63..7006ddb5b 100644
--- a/tests/Feature/Api/v1/ShopLinkAccount/StoreTest.php
+++ b/tests/Feature/Api/v1/ShopLinkAccount/StoreTest.php
@@ -87,7 +87,7 @@ public function itShouldSucceedWithoutEmployeeId()
             ],
         ]);
 
-        $json = $this->getResponseJson($response);
+        $json = $response->json();
 
         $this->module->getLogger()->info(print_r($json, true));