Merge branch 'master' into feature-69542/Composer_Dependencies_Update

- kingsquare/json-schema-form has been removed
- Removed testing tools from require-dev
- netcarver/textile updated to 4.1.3

application/libraries/AuthLib.php

@@ -64,7 +64,7 @@ class AuthLib
 		{
 			// - The uid must be NOT an empty string
 			// - The current user should NOT be already logged as the given uid
-			if (!isEmptyString($uid) && $this->getAuthObj()->{self::AO_USERNAME} != $uid)
+			if (!isEmptyString($uid) && $this->getAuthObj()->username != $uid)
 			{
 				$this->_ci->load->library('PermissionLib'); // Loads permissions library
 
@@ -75,28 +75,8 @@ class AuthLib
 					$loginAS = $this->_createAuthObjByPerson(array('uid' => $uid));
 					if (isSuccess($loginAS))
 					{
-						$authObj = getData($loginAS); // get the authenticate object
-
 						// Store the new authentication object in authentication session
-						setSessionElement(self::SESSION_NAME, self::SESSION_AUTH_OBJ, $authObj);
-
-						$authObjOrigin = getSessionElement(self::SESSION_NAME, self::SESSION_AUTH_OBJ_ORIGIN);
-
-						// Load the LogLib
-						$this->_ci->load->library('LogLib');
-						// Setup the LogLib
-						$this->_ci->loglib->setConfigs(
-							array(
-								'dbLogType' => 'API', // required
-								'dbExecuteUser' => $authObjOrigin->{self::AO_USERNAME}, // current logged user
-								'requestId' => 'API'
-							)
-						);
-						// Log into the database
-						$this->_ci->loglib->logInfoDB(
-							'The user "'.$authObjOrigin->{self::AO_USERNAME}.'" has changed identity with the user "'.$authObj->{self::AO_USERNAME}.
-							'" and person id '.$authObj->{self::AO_PERSON_ID}
-						);
+						setSessionElement(self::SESSION_NAME, self::SESSION_AUTH_OBJ, getData($loginAS));
 					}
 				}
 				else
@@ -125,7 +105,7 @@ class AuthLib
 		{
 			// - The person id must be a number
 			// - The current user should NOT be already logged as the given person id
-			if (is_numeric($person_id) && $this->getAuthObj()->{self::AO_PERSON_ID} != $person_id)
+			if (is_numeric($person_id) && $this->getAuthObj()->person_id != $person_id)
 			{
 				$this->_ci->load->library('PermissionLib'); // Loads permissions library
 
@@ -144,24 +124,6 @@ class AuthLib
 							{
 								// Store the new authentication object in authentication session
 								setSessionElement(self::SESSION_NAME, self::SESSION_AUTH_OBJ, $authObj);
-
-								$authObjOrigin = getSessionElement(self::SESSION_NAME, self::SESSION_AUTH_OBJ_ORIGIN);
-
-								// Load the LogLib
-								$this->_ci->load->library('LogLib');
-								// Setup the LogLib
-								$this->_ci->loglib->setConfigs(
-									array(
-										'dbLogType' => 'API', // required
-										'dbExecuteUser' => $authObjOrigin->{self::AO_USERNAME}, // current logged user
-										'requestId' => 'API'
-									)
-								);
-								// Log into the database
-								$this->_ci->loglib->logInfoDB(
-									'The user "'.$authObjOrigin->{self::AO_USERNAME}.'" has changed identity with the user "'.$authObj->{self::AO_USERNAME}.
-									'" and person id '.$authObj->{self::AO_PERSON_ID}
-								);
 							}
 							else // if does NOT have permissions
 							{
@@ -210,22 +172,6 @@ class AuthLib
 			// The LoginAs account is logged out
 			// The user is again connected with its real account
 			setSessionElement(self::SESSION_NAME, self::SESSION_AUTH_OBJ, $authObjOrigin);
-
-			// Load the LogLib
-			$this->_ci->load->library('LogLib');
-			// Setup the LogLib
-			$this->_ci->loglib->setConfigs(
-				array(
-					'dbLogType' => 'API', // required
-					'dbExecuteUser' => $authObjOrigin->{self::AO_USERNAME}, // current logged user
-					'requestId' => 'API'
-				)
-			);
-			// Log into the database
-			$this->_ci->loglib->logInfoDB(
-				'The user "'.$authObjOrigin->{self::AO_USERNAME}.'" has logout from the user "'.$authObj->{self::AO_USERNAME}.
-				'" and person id '.$authObj->{self::AO_PERSON_ID}
-			);
 		}
 	}
 
@@ -662,4 +608,3 @@ class AuthLib
 		return $finalUserBasicDataByUID;
 	}
 }
-

composer.json

@@ -468,8 +468,6 @@
 		"brutusin/json-forms": "1.4.0",
 		"josdejong/jsoneditor": "5.5.6",
 
-		"kingsquare/json-schema-form": "*",
-
 		"ludo/jquery-treetable": "3.2.0",
 
 		"michelf/php-markdown": "1.5.0",
@@ -479,7 +477,7 @@
 		"mottie/tablesorter": "2.*",
 
 		"nategood/httpful": "0.2.*",
-		"netcarver/textile": "3.7.*",
+		"netcarver/textile": "4.1.*",
 		"nicolaskruchten/pivottable": "2.23.0",
 		"npm-asset/primevue": "3.29.1",
 		"npm-asset/primeicons": "5.0.0",
@@ -513,11 +511,6 @@
 	},
 
 	"require-dev": {
-		"vuejs/vuejs3_dev": "3.3.8",
-		"squizlabs/php_codesniffer": "3.6.*",
-		"phpmd/phpmd": "2.*",
-		"phpmetrics/phpmetrics": "2.*",
-		"sebastian/phpcpd": "3.*",
-		"phpunit/phpunit": "^6"
+		"vuejs/vuejs3_dev": "3.3.8"
 	}
 }