From 33be595d79c5b76e2b5b239394170e6d5e4ae232 Mon Sep 17 00:00:00 2001
From: Matthieu <matthieu.beaudouin@gmail.com>
Date: Tue, 3 Nov 2020 12:31:36 +0100
Subject: [PATCH 1/2] Initiate config with array

---
 sdk/src/core/Auth/Token.php               | 14 ++++++++------
 sdk/src/public/ApiClient/CDSApiClient.php |  6 ++++--
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/sdk/src/core/Auth/Token.php b/sdk/src/core/Auth/Token.php
index 3990ac1..9af164b 100644
--- a/sdk/src/core/Auth/Token.php
+++ b/sdk/src/core/Auth/Token.php
@@ -75,11 +75,11 @@ public static function getInstance()
 
     #region Private methods
 
-    private function _generateNewToken()
+    private function _generateNewToken(array $config)
     {
-        $username = ConfigFileLoader::getInstance()->getConfAttribute('username');
-        $password = ConfigFileLoader::getInstance()->getConfAttribute('password');
-        $urlToken = ConfigFileLoader::getInstance()->getConfAttribute('urltoken');
+        $username = isset($config['username']) ? $config['username'] : ConfigFileLoader::getInstance()->getConfAttribute('username');
+        $password = isset($config['password']) ? $config['password'] : ConfigFileLoader::getInstance()->getConfAttribute('password');
+        $urlToken = isset($config['urlToken']) ? $config['urlToken'] : ConfigFileLoader::getInstance()->getConfAttribute('urltoken');
 
         $request = new CDSApiRequest($username, $password, $urlToken);
 
@@ -104,13 +104,15 @@ private function _generateNewToken()
 
     /**
      * Generate a new token or return the actual active token
+     * @param array $config
+     * @return string|null
      */
-    public function getToken()
+    public function getToken(array $config)
     {
         //TODO vérifier la date
 
         if (!$this->_isValid) {
-            $this->_generateNewToken();
+            $this->_generateNewToken($config);
         }
         return $this->_token;
     }
diff --git a/sdk/src/public/ApiClient/CDSApiClient.php b/sdk/src/public/ApiClient/CDSApiClient.php
index 4200d5d..926d7ee 100644
--- a/sdk/src/public/ApiClient/CDSApiClient.php
+++ b/sdk/src/public/ApiClient/CDSApiClient.php
@@ -155,10 +155,12 @@ public function getMailPoint()
 
     /**
      * Create and check the token
+     * @param array $config
+     * @return string|null
      */
-    public function init()
+    public function init(array $config)
     {
-        $token = Token::getInstance()->getToken();
+        $token = Token::getInstance()->getToken($config);
         return $token;
     }
 

From e5970409b63592941f8eced925f15d5beb69356e Mon Sep 17 00:00:00 2001
From: Matthieu <matthieu.beaudouin@gmail.com>
Date: Tue, 3 Nov 2020 12:42:26 +0100
Subject: [PATCH 2/2] Initiate config with array

---
 sdk/src/core/Auth/Token.php               | 4 ++--
 sdk/src/public/ApiClient/CDSApiClient.php | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/sdk/src/core/Auth/Token.php b/sdk/src/core/Auth/Token.php
index 9af164b..b563dc2 100644
--- a/sdk/src/core/Auth/Token.php
+++ b/sdk/src/core/Auth/Token.php
@@ -75,7 +75,7 @@ public static function getInstance()
 
     #region Private methods
 
-    private function _generateNewToken(array $config)
+    private function _generateNewToken(array $config = [])
     {
         $username = isset($config['username']) ? $config['username'] : ConfigFileLoader::getInstance()->getConfAttribute('username');
         $password = isset($config['password']) ? $config['password'] : ConfigFileLoader::getInstance()->getConfAttribute('password');
@@ -107,7 +107,7 @@ private function _generateNewToken(array $config)
      * @param array $config
      * @return string|null
      */
-    public function getToken(array $config)
+    public function getToken(array $config = [])
     {
         //TODO vérifier la date
 
diff --git a/sdk/src/public/ApiClient/CDSApiClient.php b/sdk/src/public/ApiClient/CDSApiClient.php
index 926d7ee..17d67b4 100644
--- a/sdk/src/public/ApiClient/CDSApiClient.php
+++ b/sdk/src/public/ApiClient/CDSApiClient.php
@@ -158,7 +158,7 @@ public function getMailPoint()
      * @param array $config
      * @return string|null
      */
-    public function init(array $config)
+    public function init(array $config = [])
     {
         $token = Token::getInstance()->getToken($config);
         return $token;