#346 remove job token

LDAPAccountManager · Oct 14, 2024 · 6320430 · 6320430
1 parent 6612dde
commit 6320430
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 24 deletions.
diff --git a/lam/docs/manual-sources/chapter-installation.xml b/lam/docs/manual-sources/chapter-installation.xml
@@ -608,6 +608,19 @@
       version. Unless explicitly noticed there is no need to install an
       intermediate release.</para>
 
+      <section>
+        <title>8.9 -&gt; 9.0</title>
+
+        <para>LAM Pro:</para>
+
+        <itemizedlist>
+          <listitem>
+            <para>Cron jobs of server profiles no longer use the job token
+            parameter</para>
+          </listitem>
+        </itemizedlist>
+      </section>
+
       <section>
         <title>8.8 -&gt; 8.9</title>
 

diff --git a/lam/lib/config.inc b/lam/lib/config.inc
@@ -694,7 +694,6 @@ class ServerProfilePersistenceStrategyFiles implements ServerProfilePersistenceS
 			$file_array[] = "\n" . "jobsDBUser: " . $profile->getJobsDBUser() . "\n";
 			$file_array[] = "\n" . "jobsDBPassword: " . $profile->getJobsDBPassword() . "\n";
 			$file_array[] = "\n" . "jobsDBName: " . $profile->getJobsDBName() . "\n";
-			$file_array[] = "\n" . "jobToken: " . $profile->getJobToken() . "\n";
 			$file_array[] = "\n" . "pwdResetAllowSpecificPassword: " . $profile->getPwdResetAllowSpecificPassword() . "\n";
 			$file_array[] = "\n" . "pwdResetAllowScreenPassword: " . $profile->getPwdResetAllowScreenPassword() . "\n";
 			$file_array[] = "\n" . "pwdResetForcePasswordChange: " . $profile->getPwdResetForcePasswordChange() . "\n";
@@ -1124,8 +1123,6 @@ class LAMConfig {
 	private $jobsDBPassword;
 	/** name of job database */
 	private $jobsDBName;
-	/** random job token */
-	private $jobToken;
 	/** job configuration */
 	private $jobSettings = [];
 
@@ -1157,7 +1154,7 @@ class LAMConfig {
 		"modules", "activeTypes", "types", "tools", "accessLevel", 'loginMethod', 'loginSearchSuffix',
 		'loginSearchFilter', 'searchLimit', 'lamProMailFrom', 'lamProMailReplyTo', 'lamProMailSubject',
 		'lamProMailText', 'lamProMailIsHTML', 'lamProMailAllowAlternateAddress', 'httpAuthentication', 'loginSearchDN',
-		'loginSearchPassword', 'timeZone', 'jobsBindUser', 'jobsBindPassword', 'jobsDatabase', 'jobToken', 'jobs',
+		'loginSearchPassword', 'timeZone', 'jobsBindUser', 'jobsBindPassword', 'jobsDatabase', 'jobs',
 		'jobsDBHost', 'jobsDBPort', 'jobsDBUser', 'jobsDBPassword', 'jobsDBName', 'pwdResetAllowSpecificPassword',
 		'pwdResetAllowScreenPassword', 'pwdResetForcePasswordChange', 'pwdResetDefaultPasswordOutput',
 		'scriptUserName', 'scriptSSHKey', 'scriptSSHKeyPassword', 'twoFactorAuthentication', 'twoFactorAuthenticationURL',
@@ -2529,18 +2526,6 @@ class LAMConfig {
 		return $this->jobSettings;
 	}
 
-	/**
-	 * Returns the job token.
-	 *
-	 * @return String job token
-	 */
-	public function getJobToken() {
-		if (empty($this->jobToken)) {
-			$this->jobToken = generateRandomText();
-		}
-		return $this->jobToken;
-	}
-
 	/**
 	 * Returns if setting a specific password is allowed on password reset page.
 	 *

diff --git a/lam/tests/lib/LAMConfigTest.php b/lam/tests/lib/LAMConfigTest.php
@@ -889,14 +889,6 @@ public function testPwdResetPageSettings() {
 		$this->assertEquals($val, $this->lAMConfig->getPwdResetDefaultPasswordOutput());
 	}
 
-	/**
-	 * Tests LAMConfig->getJobToken()
-	 */
-	public function testGetJobToken() {
-		$token = $this->lAMConfig->getJobToken();
-		$this->assertFalse(empty($token));
-	}
-
 	/**
 	 * Tests the password policy options.
 	 */