diff --git a/sdk/src/core/Auth/Token.php b/sdk/src/core/Auth/Token.php index 3990ac1..b563dc2 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..17d67b4 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; }