Do not call userLogin() at __construct()

confirm · Jan 22, 2020 · ed3c8f5 · ed3c8f5
1 parent a5944bb
commit ed3c8f5
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 5 deletions.
diff --git a/build/templates/abstract.tpl.php b/build/templates/abstract.tpl.php
@@ -62,6 +62,16 @@ abstract class <CLASSNAME_ABSTRACT>
      */
     private $defaultParams = array();
 
+    /**
+     * @var string
+     */
+    private $user;
+
+    /**
+     * @var string
+     */
+    private $password;
+
     /**
      * Auth string.
      *
@@ -144,7 +154,8 @@ public function __construct($apiUrl = '', $user = '', $password = '', $httpUser
         if ($authToken) {
             $this->setAuthToken($authToken);
         } elseif ($user && $password) {
-            $this->userLogin(array('user' => $user, 'password' => $password));
+            $this->user = $user;
+            $this->password = $password;
         }
     }
 
@@ -277,6 +288,10 @@ public function printCommunication($print = true)
      */
     public function request($method, $params = null, $resultArrayKey = '', $auth = true)
     {
+        if (!$this->authToken && $auth && $this->user && $this->password) {
+            $this->userLogin(array('user' => $this->user, 'password' => $this->password));
+        }
+
         // sanity check and conversion for params array
         if (!$params) {
             $params = array();

diff --git a/tests/ZabbixApiTest.php b/tests/ZabbixApiTest.php
@@ -57,9 +57,7 @@ public function testZabbixApiClass()
 
     public function testZabbixApiConnectionNotTriggered()
     {
-        $zabbix = new ZabbixApi('http://localhost/json_rpc.php');
-        $zabbix = new ZabbixApi('http://localhost/json_rpc.php', 'zabbix');
-        $zabbix = new ZabbixApi('http://localhost/json_rpc.php', '', 'very_secret');
+        $zabbix = new ZabbixApi('http://localhost/json_rpc.php', 'zabbix', 'very_secret');
 
         $this->assertSame('http://localhost/json_rpc.php', $zabbix->getApiUrl());
     }
@@ -70,6 +68,8 @@ public function testZabbixApiConnectionNotTriggered()
      */
     public function testZabbixApiConnectionError()
     {
-        new ZabbixApi('http://not.found.tld/json_rpc.php', 'zabbix', 'very_secret_pass');
+        $zabbix = new ZabbixApi('http://not.found.tld/json_rpc.php', 'zabbix', 'very_secret_pass');
+
+        $zabbix->userGet();
     }
 }