From: Marcin Haba <marcin.haba@bacula.pl>
Date: Sat, 7 Dec 2019 10:24:28 +0000 (+0100)
Subject: baculum: Do not try to switch to new user in API and Web install wizards
X-Git-Tag: Release-9.6.0~39
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=76dd68ce5d4b9b9834e8e41f25fde7659829257d;p=thirdparty%2Fbacula.git

baculum: Do not try to switch to new user in API and Web install wizards
---

diff --git a/gui/baculum/protected/API/Pages/Panel/APIInstallWizard.php b/gui/baculum/protected/API/Pages/Panel/APIInstallWizard.php
index efad0169c..54882c222 100644
--- a/gui/baculum/protected/API/Pages/Panel/APIInstallWizard.php
+++ b/gui/baculum/protected/API/Pages/Panel/APIInstallWizard.php
@@ -283,10 +283,6 @@ class APIInstallWizard extends BaculumAPIPage {
 					true,
 					$_SERVER['PHP_AUTH_USER']
 				);
-
-				// Automatic login after finish wizard.
-				$this->switchToUser($this->APILogin->Text, $this->APIPassword->Text);
-				// here is exit
 			}
 			if (($this->first_run || $this->add_auth_params) && $this->AuthOAuth2->Checked) {
 				// save OAuth2 auth user on first run or when no OAuth2 client defined
@@ -300,8 +296,8 @@ class APIInstallWizard extends BaculumAPIPage {
 				$oauth2_cfg[$this->APIOAuth2ClientId->Text]['name'] = $this->APIOAuth2Name->Text;
 				$this->getModule('oauth2_config')->setConfig($oauth2_cfg);
 			}
+			$this->goToDefaultPage();
 		}
-		$this->goToDefaultPage();
 
 	}
 
diff --git a/gui/baculum/protected/Web/Pages/WebConfigWizard.php b/gui/baculum/protected/Web/Pages/WebConfigWizard.php
index 08f48a62e..8fccb699b 100644
--- a/gui/baculum/protected/Web/Pages/WebConfigWizard.php
+++ b/gui/baculum/protected/Web/Pages/WebConfigWizard.php
@@ -143,12 +143,8 @@ class WebConfigWizard extends BaculumWebPage
 					false,
 					$previous_user
 				);
-
-				// Automatic login after finish wizard.
-				$this->switchToUser($cfg_web['baculum']['login'], $this->WebPassword->Text);
-				// here is exit
-				exit();
 			}
+			$this->goToDefaultPage();
 		}
 	}