From: Marcin Haba <marcin.haba@bacula.pl>
Date: Fri, 12 Nov 2021 20:20:17 +0000 (+0100)
Subject: baculum: Tweak fix getting users in basic user endpoint
X-Git-Tag: Release-11.0.6~35
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=41c74700235664c325cc881e986b581ef31982f8;p=thirdparty%2Fbacula.git

baculum: Tweak fix getting users in basic user endpoint
---

diff --git a/gui/baculum/protected/API/Pages/API/BasicUser.php b/gui/baculum/protected/API/Pages/API/BasicUser.php
index a9e87cd32..3d0afe0f1 100644
--- a/gui/baculum/protected/API/Pages/API/BasicUser.php
+++ b/gui/baculum/protected/API/Pages/API/BasicUser.php
@@ -31,11 +31,16 @@ class BasicUser extends BaculumAPIServer {
 
 	public function get() {
 		$user = $this->Request->contains('id') ? $this->Request['id'] : 0;
-		$username = $this->getModule('basic_apiuser')->validateUsername($user) ? $user : null;
+		$basic_apiuser = $this->getModule('basic_apiuser');
+		$username = $basic_apiuser->validateUsername($user) ? $user : null;
 		if (is_string($username)) {
 			$basic_config = $this->getModule('basic_config')->getConfig($username);
-			if (count($basic_config) > 0) {
-				$this->output = array_merge($basic_config, ['username' => $username]);
+			$basic_cfg = $basic_apiuser->getUserCfg($username);
+			if (count($basic_cfg) > 0) {
+				$this->output = array_merge([
+					'username' => $username,
+					'bconsole_cfg_path' => ''
+				], $basic_config);
 				$this->error = BasicUserError::ERROR_NO_ERRORS;
 			} else {
 				$this->output = BasicUserError::MSG_ERROR_BASIC_USER_DOES_NOT_EXIST;