Merge branch 'feature/5324-powerportaluser-repairprofiles' into saas/3.1.0

core/cmdbsource.class.inc.php

@@ -3,7 +3,7 @@
 //
 //   This file is part of iTop.
 //
-//   iTop is free software; you can redistribute it and/or modify	
+//   iTop is free software; you can redistribute it and/or modify
 //   it under the terms of the GNU Affero General Public License as published by
 //   the Free Software Foundation, either version 3 of the License, or
 //   (at your option) any later version.
@@ -380,7 +380,7 @@ class CMDBSource
 	public static function GetDBVendor()
 	{
 		$sDBVendor = static::ENUM_DB_VENDOR_MYSQL;
-		
+
 		$sVersionComment = static::GetServerVariable('version') .  ' - ' . static::GetServerVariable('version_comment');
 		if(preg_match('/mariadb/i', $sVersionComment) === 1)
 		{
@@ -390,7 +390,7 @@ class CMDBSource
 		{
 			$sDBVendor = static::ENUM_DB_VENDOR_PERCONA;
 		}
-		
+
 		return $sDBVendor;
 	}
 
@@ -664,7 +664,7 @@ class CMDBSource
 		);
 		DeadLockLog::Info($sMessage, $iMySqlErrorNo, $aLogContext);
 
-		IssueLog::Error($sMessage, LogChannels::DEADLOCK, $e->getMessage());
+		IssueLog::Error($sMessage, LogChannels::DEADLOCK, [$e->getMessage()]);
 	}
 
 	/**
@@ -923,7 +923,7 @@ class CMDBSource
 		{
 			throw new MySQLException('Failed to issue SQL query', array('query' => $sSql));
 		}
-				
+
 		while ($aRow = $oResult->fetch_array($iMode))
 		{
 			$aData[] = $aRow;
@@ -1077,7 +1077,7 @@ class CMDBSource
 		if (!array_key_exists($iKey, $aTableInfo["Fields"])) return false;
 		$aFieldData = $aTableInfo["Fields"][$iKey];
 		if (!array_key_exists("Key", $aFieldData)) return false;
-		return ($aFieldData["Key"] == "PRI"); 
+		return ($aFieldData["Key"] == "PRI");
 	}
 
 	public static function IsAutoIncrement($sTable, $sField)
@@ -1088,7 +1088,7 @@ class CMDBSource
 		$aFieldData = $aTableInfo["Fields"][$sField];
 		if (!array_key_exists("Extra", $aFieldData)) return false;
 		//MyHelpers::debug_breakpoint($aFieldData);
-		return (strstr($aFieldData["Extra"], "auto_increment")); 
+		return (strstr($aFieldData["Extra"], "auto_increment"));
 	}
 
 	public static function IsField($sTable, $sField)
@@ -1355,13 +1355,13 @@ class CMDBSource
 	public static function GetTableFieldsList($sTable)
 	{
 		assert(!empty($sTable));
-		
+
 		$aTableInfo = self::GetTableInfo($sTable);
 		if (empty($aTableInfo)) return array(); // #@# or an error ?
 
 		return array_keys($aTableInfo["Fields"]);
 	}
-	
+
 	// Cache the information about existing tables, and their fields
 	private static $m_aTablesInfo = array();
 	private static function _TablesInfoCacheReset($sTableName = null)
@@ -1494,7 +1494,7 @@ class CMDBSource
 		{
 			throw new MySQLException('Failed to issue SQL query', array('query' => $sSql));
 		}
-		
+
 		$aRows = array();
 		while ($aRow = $oResult->fetch_array(MYSQLI_ASSOC))
 		{
@@ -1503,7 +1503,7 @@ class CMDBSource
 		$oResult->free();
 		return $aRows;
 	}
-	
+
 	/**
 	 * Returns the value of the specified server variable
 	 * @param string $sVarName Name of the server variable
@@ -1519,7 +1519,7 @@ class CMDBSource
 	/**
 	 * Returns the privileges of the current user
 	 * @return string privileges in a raw format
-	 */	   	
+	 */
 	public static function GetRawPrivileges()
 	{
 		try
@@ -1545,8 +1545,8 @@ class CMDBSource
 
 	/**
 	 * Determine the slave status of the server
-	 * @return bool true if the server is slave 
-	 */	   	
+	 * @return bool true if the server is slave
+	 */
 	public static function IsSlaveServer()
 	{
 		try

core/dbobject.class.php

@@ -3220,6 +3220,9 @@ abstract class DBObject implements iDisplay
 				$this->m_aOrigValues[$sAttCode] = $value;
 			}
 
+			// Prevent DBUpdate at this point (reentrance protection)
+			//MetaModel::StartReentranceProtection($this);
+
 			try {
 				$this->PostInsertActions();
 			}

datamodels/2.x/itop-profiles-itil/datamodel.itop-profiles-itil.xml

@@ -544,19 +544,6 @@
         <groups/>
       </profile>
     </profiles>
-  <dictionaries>
-    <dictionary id="EN US">
-      <entries>
-        <entry id="Class:User/NonStandaloneProfileWarning" _delta="define">User profile %1$s cannot be standalone. You should add
-          other profiles otherwise you may encounter access issue with this user.</entry>
-      </entries>
-    </dictionary>
-    <dictionary id="FR FR">
-      <entries>
-        <entry id="Class:User/NonStandaloneProfileWarning" _delta="define">Le profil %1$s ne peut être seul. Sans le rajout d'autres
-          profiles, l'utilisateur peut rencontrer des problèmes dans iTop.</entry>
-      </entries>
-    </dictionary>
-  </dictionaries>
+  <dictionaries/>
   </user_rights>
 </itop_design>

datamodels/2.x/itop-profiles-itil/dictionaries/en.dict.itop-profiles-itil.php

@@ -0,0 +1,13 @@
+<?php
+/**
+ * Localized data
+ *
+ * @copyright   Copyright (C) Combodo SARL 2022
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+Dict::Add('EN US', 'English', 'English', array(
+	'Class:User/NonStandaloneProfileWarning' => 'Profile %1$s cannot be standalone. You should add other profiles to user %2$s otherwise you may encounter access issue with this user.',
+	'Class:User/NonStandaloneProfileWarning-ReparationMessage' => 'Profile %1$s cannot be standalone. User %2$s has been completed with another profile: %3$s.',
+));
+

datamodels/2.x/itop-profiles-itil/dictionaries/fr.dict.itop-profiles-itil.php

@@ -0,0 +1,13 @@
+<?php
+/**
+ * Localized data
+ *
+ * @copyright   Copyright (C) Combodo SARL 2022
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+Dict::Add('FR FR', 'French', 'Français', array(
+	'Class:User/NonStandaloneProfileWarning' => 'Le profil %1$s ne peut être seul. Sans le rajout d\'autres profiles, l\'utilisateur %2$s peut rencontrer des problèmes dans iTop.',
+	'Class:User/NonStandaloneProfileWarning-ReparationMessage' => 'Le profil %1$s ne peut être seul. Le user %2$s a été complété par le profil %3$s.',
+));
+

datamodels/2.x/itop-profiles-itil/src/UserProfilesEventListener.php

@@ -38,6 +38,7 @@ class UserProfilesEventListener implements iEventServiceSetup
 		$this->Init();
 
 		if (false === $this->bIsRepairmentEnabled){
+			IssueLog::Debug('UserProfilesEventListener bIsRepairmentEnabled disabled', LogChannels::DM_CRUD);
 			return;
 		}
 
@@ -97,6 +98,7 @@ class UserProfilesEventListener implements iEventServiceSetup
 			$iUserId = $oURP_UserProfile->Get('userid');
 			$oUser = \MetaModel::GetReentranceObjectByChildClass(\User::class, $iUserId);
 			if (false !== $oUser){
+				IssueLog::Debug('OnUserProfileEdition user already being edited', LogChannels::DM_CRUD);
 				//user edition: handled by other event
 				return;
 			}
@@ -104,20 +106,31 @@ class UserProfilesEventListener implements iEventServiceSetup
 			$oUser = \MetaModel::GetObject(\User::class, $iUserId);
 			$aChanges = $oURP_UserProfile->ListChanges();
 			if (array_key_exists('userid', $aChanges)) {
+				IssueLog::Debug('OnUserProfileEdition userid changed', LogChannels::DM_CRUD);
 				$iUserId = $oURP_UserProfile->GetOriginal('userid');
 				$oPreviousUser = \MetaModel::GetObject(\User::class, $iUserId);
 
 				$oProfileLinkSet = $oPreviousUser->Get('profile_list');
 				$oProfileLinkSet->Rewind();
 				$iCount = 0;
+				$sSingleProfileName = null;
 				while ($oCurrentURP_UserProfile = $oProfileLinkSet->Fetch()) {
-					if ($oCurrentURP_UserProfile->Get('userid') !== $oCurrentURP_UserProfile->GetOriginal('userid')) {
+					$sNewUserId = $oCurrentURP_UserProfile->Get('userid');
+					$sOriginalUserId = $oCurrentURP_UserProfile->GetOriginal('userid');
+					if ($sNewUserId !== $sOriginalUserId) {
 						$sRemovedProfileId = $oCurrentURP_UserProfile->GetOriginal('profileid');
+						IssueLog::Debug('OnUserProfileEdition profile moved does not count', LogChannels::DM_CRUD, [
+							'URP_UserProfile' => $oURP_UserProfile->GetKey(),
+							'sRemovedProfileId' => $sRemovedProfileId,
+							'sNewUserId' => $sNewUserId,
+							'sOriginalUserId' => $sOriginalUserId,
+						]);
 						continue;
 					}
 
 					$iCount++;
 					if ($iCount  > 1){
+						IssueLog::Debug('OnUserProfileEdition more than one user', LogChannels::DM_CRUD);
 						//more than one profile: no repairment needed
 						return;
 					}
@@ -125,6 +138,7 @@ class UserProfilesEventListener implements iEventServiceSetup
 				}
 				$this->RepairProfileChangesOrWarn($oPreviousUser, $sSingleProfileName, $oURP_UserProfile, $sRemovedProfileId);
 			} else if (array_key_exists('profileid', $aChanges)){
+				IssueLog::Debug('OnUserProfileEdition profileid changed', LogChannels::DM_CRUD);
 				$oCurrentUserProfileSet = $oUser->Get('profile_list');
 				if ($oCurrentUserProfileSet->Count() === 1){
 					$oProfile = $oCurrentUserProfileSet->Fetch();
@@ -152,6 +166,7 @@ class UserProfilesEventListener implements iEventServiceSetup
 			$iUserId = $oURP_UserProfile->Get('userid');
 			$oUser = \MetaModel::GetReentranceObjectByChildClass(\User::class, $iUserId);
 			if (false !== $oUser){
+				IssueLog::Debug('OnUserProfileLinkDeletion user being deleted already', LogChannels::DM_CRUD);
 				//user edition: handled by other event
 				return;
 			}
@@ -172,6 +187,7 @@ class UserProfilesEventListener implements iEventServiceSetup
 
 			$oProfileLinkSet = $oUser->Get('profile_list');
 			$oProfileLinkSet->Rewind();
+			$sSingleProfileName = null;
 			$iCount = 0;
 			while ($oCurrentURP_UserProfile = $oProfileLinkSet->Fetch()) {
 				if (in_array($oCurrentURP_UserProfile->GetKey(), $aDeletedURP_UserProfiles)) {
@@ -179,6 +195,7 @@ class UserProfilesEventListener implements iEventServiceSetup
 				}
 				$iCount++;
 				if ($iCount  > 1){
+					IssueLog::Debug('OnUserProfileLinkDeletion more than one profile', LogChannels::DM_CRUD);
 					//more than one profile: no repairment needed
 					return;
 				}
@@ -215,6 +232,7 @@ class UserProfilesEventListener implements iEventServiceSetup
 		//In that case, itop administrator has to specify it via itop configuration. we dont use default profiles repairment otherwise
 		if (is_null($aNonStandaloneProfiles)){
 			if (count($aPortalDispatcherData) > 2){
+				IssueLog::Debug('Init repairment disabled as there are more than 2 portals (extended customer should decide on their own)', LogChannels::DM_CRUD);
 				$this->bIsRepairmentEnabled = false;
 				return;
 			}
@@ -222,6 +240,7 @@ class UserProfilesEventListener implements iEventServiceSetup
 			$aPortalNames = array_keys($aPortalDispatcherData);
 			sort($aPortalNames);
 			if ($aPortalNames !== ['backoffice', 'itop-portal']){
+				IssueLog::Debug('Init repairment disabled there is a custom portal', LogChannels::DM_CRUD, [$aPortalNames]);
 				$this->bIsRepairmentEnabled = false;
 				return;
 			}
@@ -233,13 +252,14 @@ class UserProfilesEventListener implements iEventServiceSetup
 		}
 
 		if (! is_array($aNonStandaloneProfiles)){
-			\IssueLog::Error(sprintf("%s is badly configured. it should be an array.", self::USERPROFILE_REPAIR_ITOP_PARAM_NAME), null, [self::USERPROFILE_REPAIR_ITOP_PARAM_NAME => $aNonStandaloneProfiles]);
+			\IssueLog::Error(sprintf("%s is badly configured. it should be an array.", self::USERPROFILE_REPAIR_ITOP_PARAM_NAME),LogChannels::DM_CRUD, [self::USERPROFILE_REPAIR_ITOP_PARAM_NAME => $aNonStandaloneProfiles]);
 			$this->bIsRepairmentEnabled = false;
 			return;
 		}
 
 		if (empty($aNonStandaloneProfiles)){
 			//Feature specifically disabled in itop configuration
+			IssueLog::Debug('Init repairment disabled by conf on purpose', LogChannels::DM_CRUD);
 			$this->bIsRepairmentEnabled = false;
 			return;
 		}
@@ -282,7 +302,7 @@ class UserProfilesEventListener implements iEventServiceSetup
 					throw new \Exception(sprintf("%s is badly configured. profile $sRepairProfileName does not exist.", self::USERPROFILE_REPAIR_ITOP_PARAM_NAME));
 				}
 
-				$this->aNonStandaloneProfilesMap[$sNonStandaloneProfileName] = $aProfiles[$sRepairProfileName];
+				$this->aNonStandaloneProfilesMap[$sNonStandaloneProfileName] = [ 'name' => $sRepairProfileName, 'id' => $aProfiles[$sRepairProfileName]];
 			}
 
 			$this->bIsRepairmentEnabled = true;
@@ -301,6 +321,7 @@ class UserProfilesEventListener implements iEventServiceSetup
 	{
 		$oCurrentUserProfileSet = $oUser->Get('profile_list');
 		if ($oCurrentUserProfileSet->Count() === 1){
+			IssueLog::Debug('ValidateThenRepairOrWarn one profile found', LogChannels::DM_CRUD);
 			$oProfile = $oCurrentUserProfileSet->Fetch();
 
 			$this->RepairUserChangesOrWarn($oUser, $oProfile->Get('profile'));
@@ -308,35 +329,49 @@ class UserProfilesEventListener implements iEventServiceSetup
 	}
 
 	public function RepairUserChangesOrWarn(\User $oUser, string $sSingleProfileName) : void {
+		IssueLog::Debug('RepairUserChangesOrWarn', LogChannels::DM_CRUD,
+			[
+				'aNonStandaloneProfilesMap' => $this->aNonStandaloneProfilesMap,
+				'sSingleProfileName' => $sSingleProfileName
+			]
+		);
+
 		if (array_key_exists($sSingleProfileName, $this->aNonStandaloneProfilesMap)) {
-			$sRepairingProfileId = $this->aNonStandaloneProfilesMap[$sSingleProfileName];
-			if (is_null($sRepairingProfileId)){
-				//Notify current user via session messages that there will be an issue
-				//Without preventing from commiting
-				$sMessage = \Dict::Format("Class:User/NonStandaloneProfileWarning", $sSingleProfileName);
-				//$oUser::SetSessionMessage(get_class($oUser), $oUser->GetKey(), 1, $sMessage, 'WARNING', 1);
+			$aRepairingProfileInfo = $this->aNonStandaloneProfilesMap[$sSingleProfileName];
+			if (is_null($aRepairingProfileInfo)){
+				$sMessage = \Dict::Format("Class:User/NonStandaloneProfileWarning", $sSingleProfileName, $oUser->Get('friendlyname'));
 				throw new \CoreCannotSaveObjectException(array('issues' => [$sMessage], 'class' => get_class($oUser), 'id' => $oUser->GetKey()));
 			} else {
 				//Completing profiles profiles by adding repairing one : by default portal user to a power portal user
 				$oUserProfile = new \URP_UserProfile();
-				$oUserProfile->Set('profileid', $sRepairingProfileId);
+				$oUserProfile->Set('profileid', $aRepairingProfileInfo['id']);
 				$oCurrentUserProfileSet = $oUser->Get('profile_list');
 				$oCurrentUserProfileSet->AddItem($oUserProfile);
 				$oUser->Set('profile_list', $oCurrentUserProfileSet);
+				$sMessage = \Dict::Format("Class:User/NonStandaloneProfileWarning-ReparationMessage", $sSingleProfileName, $oUser->Get('friendlyname'), $aRepairingProfileInfo['name']);
+				$oUser::SetSessionMessage(get_class($oUser), $oUser->GetKey(), 1, $sMessage, 'WARNING', 1);
 			}
 		}
 	}
 
-	public function RepairProfileChangesOrWarn(\User $oUser, string $sSingleProfileName, \URP_UserProfile $oURP_UserProfile, string $sRemovedProfileId, $bIsRemoval=false) : void {
+	public function RepairProfileChangesOrWarn(\User $oUser, ?string $sSingleProfileName, \URP_UserProfile $oURP_UserProfile, string $sRemovedProfileId, $bIsRemoval=false) : void {
+		IssueLog::Debug('RepairUserChangesOrWarn', LogChannels::DM_CRUD,
+			[
+				'aNonStandaloneProfilesMap' => $this->aNonStandaloneProfilesMap,
+				'sSingleProfileName' => $sSingleProfileName
+			]
+		);
+
+		if (is_null($sSingleProfileName)){
+			return;
+		}
+
 		if (array_key_exists($sSingleProfileName, $this->aNonStandaloneProfilesMap)) {
-			$sRepairingProfileId = $this->aNonStandaloneProfilesMap[$sSingleProfileName];
-			if (is_null($sRepairingProfileId)
-				|| ($sRepairingProfileId === $sRemovedProfileId) //cannot repair by readding same remove profile as it will raise uniqueness rule
+			$aRepairingProfileInfo = $this->aNonStandaloneProfilesMap[$sSingleProfileName];
+			if (is_null($aRepairingProfileInfo)
+				|| ($aRepairingProfileInfo['id'] === $sRemovedProfileId) //cannot repair by readding same remove profile as it will raise uniqueness rule
 			){
-				//Notify current user via session messages that there will be an issue
-				//Without preventing from commiting
-				$sMessage = \Dict::Format("Class:User/NonStandaloneProfileWarning", $sSingleProfileName);
-				//$oURP_UserProfile::SetSessionMessage(get_class($oURP_UserProfile), $oURP_UserProfile->GetKey(), 1, $sMessage, 'WARNING', 1);
+				$sMessage = \Dict::Format("Class:User/NonStandaloneProfileWarning", $sSingleProfileName, $oUser->Get('friendlyname'));
 				if ($bIsRemoval){
 					$oURP_UserProfile->AddDeleteIssue($sMessage);
 				} else {
@@ -345,11 +380,14 @@ class UserProfilesEventListener implements iEventServiceSetup
 			} else {
 				//Completing profiles profiles by adding repairing one : by default portal user to a power portal user
 				$oUserProfile = new \URP_UserProfile();
-				$oUserProfile->Set('profileid', $sRepairingProfileId);
+				$oUserProfile->Set('profileid', $aRepairingProfileInfo['id']);
 				$oCurrentUserProfileSet = $oUser->Get('profile_list');
 				$oCurrentUserProfileSet->AddItem($oUserProfile);
 				$oUser->Set('profile_list', $oCurrentUserProfileSet);
 				$oUser->DBWrite();
+
+				$sMessage = \Dict::Format("Class:User/NonStandaloneProfileWarning-ReparationMessage", $sSingleProfileName, $oUser->Get('friendlyname'), $aRepairingProfileInfo['name']);
+				$oURP_UserProfile::SetSessionMessage(get_class($oURP_UserProfile), $oURP_UserProfile->GetKey(), 1, $sMessage, 'WARNING', 1);
 			}
 		}
 	}

sources/Service/Events/EventService.php

@@ -134,8 +134,8 @@ final class EventService
 			return;
 		}
 
-		$oLastException = null;
-		$sLastExceptionMessage = null;
+		$oFirstException = null;
+		$sFirstExceptionMessage = null;
 		$bEventFired = false;
 		foreach (self::GetListeners($sEvent, $eventSource) as $aEventCallback) {
 			if (!self::MatchContext($aEventCallback['context'])) {
@@ -153,9 +153,12 @@ final class EventService
 				throw $e;
 			}
 			catch (Exception $e) {
-				$sLastExceptionMessage = "Event '$sLogEventName' for '$sName' id {$aEventCallback['id']} failed with non-blocking error: ".$e->getMessage();
-				EventServiceLog::Error($sLastExceptionMessage);
-				$oLastException = $e;
+				$sExceptionMessage = "Event '$sLogEventName' for '$sName' id {$aEventCallback['id']} failed with non-blocking error: ".$e->getMessage();
+				EventServiceLog::Error($sExceptionMessage);
+				if (is_null($oFirstException)){
+					$oFirstException = $e;
+					$sFirstExceptionMessage = $sExceptionMessage;
+				}
 			}
 		}
 		if ($bEventFired) {
@@ -163,9 +166,9 @@ final class EventService
 		}
 		$oKPI->ComputeStats('FireEvent', $sEvent);
 
-		if (!is_null($oLastException)) {
-			EventServiceLog::Error("Throwing the last exception caught: $sLastExceptionMessage");
-			throw $oLastException;
+		if (!is_null($oFirstException)) {
+			EventServiceLog::Error("Throwing the last exception caught: $sFirstExceptionMessage");
+			throw $oFirstException;
 		}
 	}
 

tests/php-unit-tests/unitary-tests/datamodels/2.x/itop-profiles-itil/UserProfilesEventListenerTest.php

@@ -63,7 +63,8 @@ class UserProfilesEventListenerTest extends ItopDataTestCase
 				'aExpectedAssociatedProfilesAfterUserCreation'=> [
 					'Portal power user',
 					'Portal user',
-				]
+				],
+				'bCheckSessionMessage' => true
 			],
 			'Portal power user + Configuration Manager => profiles untouched' => [
 				'aAssociatedProfilesBeforeUserCreation' => [
@@ -82,21 +83,47 @@ class UserProfilesEventListenerTest extends ItopDataTestCase
 	 * @dataProvider PortaPowerUserProvider
 	 */
 	public function testUserLocalCreation($aAssociatedProfilesBeforeUserCreation,
-		$aExpectedAssociatedProfilesAfterUserCreation)
+		$aExpectedAssociatedProfilesAfterUserCreation, $bCheckSessionMessage=false)
 	{
+		/*if ($bCheckSessionMessage){
+			$sLogin = "Admin-" . uniqid();
+			$oConnectedUser = $this->CreateContactlessUser($sLogin, 1,  "Iuytrez9876543ç_è-(");
+			$_SESSION = [];
+			\UserRights::Login($oConnectedUser->Get('login'));
+		}*/
+
 		$oUser = new \UserLocal();
 		$sLogin = 'testUserLocalCreationWithPortalPowerUserProfile-'.uniqid();
 		$oUser->Set('login', $sLogin);
 		$oUser->Set('password', 'ABCD1234@gabuzomeu');
 		$oUser->Set('language', 'EN US');
 		$this->commonUserCreationTest($oUser, $aAssociatedProfilesBeforeUserCreation, $aExpectedAssociatedProfilesAfterUserCreation);
+
+		/*if ($bCheckSessionMessage){
+			$aObjMessages = Session::Get('obj_messages');
+			$this->assertNotEmpty($aObjMessages);
+			$sKey = sprintf("%s::%s", get_class($oUser), $oUser->GetKey());
+			$this->assertTrue(array_key_exists($sKey, $aObjMessages));
+
+			$sMsg = <<<TXT
+User profile Portal power user cannot be standalone. User has been completed with profile Portal power user.
+TXT;
+			$aExpectedMessages = [
+				[
+					'rank' => 1,
+					'severity' => 'WARNING',
+					'message' => $sMsg
+				]
+			];
+			$this->assertEquals($aExpectedMessages, array_values($aObjMessages[$sKey]), var_export($aObjMessages[$sKey], true));
+		}*/
 	}
 
 	/**
 	 * @dataProvider PortaPowerUserProvider
 	 */
 	public function testUserLocalUpdate($aAssociatedProfilesBeforeUserCreation,
-		$aExpectedAssociatedProfilesAfterUserCreation)
+		$aExpectedAssociatedProfilesAfterUserCreation, $bCheckSessionMessage=false)
 	{
 		$oUser = new \UserLocal();
 		$sLogin = 'testUserLocalUpdateWithPortalPowerUserProfile-'.uniqid();
@@ -110,7 +137,7 @@ class UserProfilesEventListenerTest extends ItopDataTestCase
 	 * @dataProvider PortaPowerUserProvider
 	 */
 	public function testUserLDAPCreation($aAssociatedProfilesBeforeUserCreation,
-		$aExpectedAssociatedProfilesAfterUserCreation)
+		$aExpectedAssociatedProfilesAfterUserCreation, $bCheckSessionMessage=false)
 	{
 		$oUser = new \UserLDAP();
 		$sLogin = 'testUserLDAPCreationWithPortalPowerUserProfile-'.uniqid();
@@ -134,7 +161,7 @@ class UserProfilesEventListenerTest extends ItopDataTestCase
 	 * @dataProvider PortaPowerUserProvider
 	 */
 	public function testUserExternalCreation($aAssociatedProfilesBeforeUserCreation,
-		$aExpectedAssociatedProfilesAfterUserCreation)
+		$aExpectedAssociatedProfilesAfterUserCreation, $bCheckSessionMessage=false)
 	{
 		$oUser = new \UserExternal();
 		$sLogin = 'testUserLDAPCreationWithPortalPowerUserProfile-'.uniqid();
@@ -146,7 +173,7 @@ class UserProfilesEventListenerTest extends ItopDataTestCase
 	 * @dataProvider PortaPowerUserProvider
 	 */
 	public function testUserExternalUpdate($aAssociatedProfilesBeforeUserCreation,
-		$aExpectedAssociatedProfilesAfterUserCreation)
+		$aExpectedAssociatedProfilesAfterUserCreation, $bCheckSessionMessage=false)
 	{
 		$oUser = new \UserExternal();
 		$sLogin = 'testUserLDAPUpdateWithPortalPowerUserProfile-'.uniqid();
@@ -217,7 +244,6 @@ class UserProfilesEventListenerTest extends ItopDataTestCase
 
 		$_SESSION = [];
 
-		//$this->expectException(\Exception::class);
 		UserRights::Login($oUser->Get('login'));
 
 		if (! UserRights::IsPortalUser()) {
@@ -274,6 +300,11 @@ class UserProfilesEventListenerTest extends ItopDataTestCase
 
 		if ($bRaiseException){
 			$this->expectException(\DeleteException::class);
+			$sMessage = <<<TXT
+Profile Portal power user cannot be standalone. You should add other profiles to user $sLogin otherwise you may encounter access issue with this user.
+TXT;
+
+			$this->expectExceptionMessage($sMessage);
 		}
 
 		$aURPUserProfileByUser = $this->GetURPUserProfileByUser($sId);
@@ -316,7 +347,25 @@ class UserProfilesEventListenerTest extends ItopDataTestCase
 		if (!$bRaiseException) {
 			$aExpectedProfilesAfterUpdate = ["Portal power user", "Portal user"];
 			$this->CheckProfilesAreOkAndThenConnectToITop($sUserClass, $sId, $aExpectedProfilesAfterUpdate);
-		}
+
+			//check warning
+			/*$aObjMessages = Session::Get('obj_messages');
+			$this->assertNotEmpty($aObjMessages);
+			$sKey = sprintf("%s::%s", get_class($oURPUserProfile), $oURPUserProfile->GetKey());
+			$this->assertTrue(array_key_exists($sKey, $aObjMessages));
+
+			$sMsg = <<<TXT
+User profile Portal power user cannot be standalone. User has been completed with profile Portal power user.
+TXT;
+			$aExpectedMessages = [
+				[
+					'rank' => 1,
+					'severity' => 'WARNING',
+					'message' => $sMsg
+				]
+			];
+			$this->assertEquals($aExpectedMessages, array_values($aObjMessages[$sKey]), var_export($aObjMessages[$sKey], true));*/
+			}
 	}
 
 	public function ProfilesLinksProvider() {
@@ -333,19 +382,24 @@ class UserProfilesEventListenerTest extends ItopDataTestCase
 		$aInitialProfiles = [ $sProfileNameToMove, "Portal power user"];
 
 		$oUser = new \UserExternal();
-		$sLogin = 'testUserLDAPUpdateWithPortalPowerUserProfile-'.uniqid();
-		$oUser->Set('login', $sLogin);
+		$sLogin1 = 'testUserLDAPUpdateWithPortalPowerUserProfile-'.uniqid();
+		$oUser->Set('login', $sLogin1);
 
 		$sUserClass = get_class($oUser);
 		list ($sId, $aProfiles)  = $this->CreateUserForProfileTesting($oUser, $aInitialProfiles);
 
 		$oUser = new \UserExternal();
-		$sLogin = 'testUserLDAPUpdateWithPortalPowerUserProfile-'.uniqid();
-		$oUser->Set('login', $sLogin);
+		$sLogin2 = 'testUserLDAPUpdateWithPortalPowerUserProfile-'.uniqid();
+		$oUser->Set('login', $sLogin2);
 		list ($sAnotherUserId, $aProfiles) = $this->CreateUserForProfileTesting($oUser, ["Configuration Manager"]);
 
 		if ($bRaiseException){
 			$this->expectException(\CoreCannotSaveObjectException::class);
+			$sMessage = <<<TXT
+Profile Portal power user cannot be standalone. You should add other profiles to user $sLogin1 otherwise you may encounter access issue with this user.
+TXT;
+
+			$this->expectExceptionMessage($sMessage);
 		}
 
 		$aURPUserProfileByUser = $this->GetURPUserProfileByUser($sId);
@@ -458,7 +512,7 @@ class UserProfilesEventListenerTest extends ItopDataTestCase
 
 	public function testInit_ConfWithOneWarningProfile() {
 		\MetaModel::GetConfig()->Set(UserProfilesEventListener::USERPROFILE_REPAIR_ITOP_PARAM_NAME,
-			['Ticket Manager' => 'Administrator', 'Portal power user' => null]
+			['Configuration Manager' => 'Administrator', 'Portal power user' => null]
 		);
 		$oUserProfilesEventListener = new UserProfilesEventListener();
 		$oUserProfilesEventListener->Init();
@@ -467,7 +521,7 @@ class UserProfilesEventListenerTest extends ItopDataTestCase
 
 	public function testInit_ConfWithFurtherWarningProfiles() {
 		\MetaModel::GetConfig()->Set(UserProfilesEventListener::USERPROFILE_REPAIR_ITOP_PARAM_NAME,
-			['Ticket Manager' => null, 'Portal power user' => null]
+			['Configuration Manager' => null, 'Portal power user' => null]
 		);
 		$oUserProfilesEventListener = new UserProfilesEventListener();
 		$oUserProfilesEventListener->Init();
@@ -476,7 +530,7 @@ class UserProfilesEventListenerTest extends ItopDataTestCase
 
 	public function testInit_ConfWithFurtherWarningProfilesAndOneRepairment() {
 		\MetaModel::GetConfig()->Set(UserProfilesEventListener::USERPROFILE_REPAIR_ITOP_PARAM_NAME,
-			['Portal power user' => null, 'Ticket Manager' => null, 'Administrator' => "Configuration Manager"]
+			['Portal power user' => null, 'Configuration Manager' => null, 'Administrator' => "Configuration Manager"]
 		);
 		$oUserProfilesEventListener = new UserProfilesEventListener();
 		$oUserProfilesEventListener->Init();
@@ -492,7 +546,7 @@ class UserProfilesEventListenerTest extends ItopDataTestCase
 		$oUser->Set('language', 'EN US');
 
 		\MetaModel::GetConfig()->Set(UserProfilesEventListener::USERPROFILE_REPAIR_ITOP_PARAM_NAME,
-			['Portal power user' => 'Ticket Manager']
+			['Portal power user' => 'Configuration Manager']
 		);
 		$oUserProfilesEventListener = new UserProfilesEventListener();
 		$oUserProfilesEventListener->Init();
@@ -507,7 +561,7 @@ class UserProfilesEventListenerTest extends ItopDataTestCase
 			$aProfilesAfterCreation[] = $oProfile->Get('profile');
 		}
 
-		$this->assertContains('Ticket Manager', $aProfilesAfterCreation, var_export($aProfilesAfterCreation, true));
+		$this->assertContains('Configuration Manager', $aProfilesAfterCreation, var_export($aProfilesAfterCreation, true));
 		$this->assertContains('Portal power user', $aProfilesAfterCreation, var_export($aProfilesAfterCreation, true));
 	}
 
@@ -515,8 +569,8 @@ class UserProfilesEventListenerTest extends ItopDataTestCase
 	{
 		\MetaModel::GetConfig()->Set(UserProfilesEventListener::USERPROFILE_REPAIR_ITOP_PARAM_NAME,
 			[
-				'Administrator' => 'Configuration Manager',
-				'Portal power user' => 'Ticket Manager'
+				'Administrator' => 'Portal user',
+				'Portal power user' => 'Configuration Manager'
 			]
 		);
 		$oUserProfilesEventListener = new UserProfilesEventListener();
@@ -537,7 +591,7 @@ class UserProfilesEventListenerTest extends ItopDataTestCase
 			$aProfilesAfterCreation[] = $oProfile->Get('profile');
 		}
 
-		$this->assertContains('Ticket Manager', $aProfilesAfterCreation, var_export($aProfilesAfterCreation, true));
+		$this->assertContains('Configuration Manager', $aProfilesAfterCreation, var_export($aProfilesAfterCreation, true));
 		$this->assertContains('Portal power user', $aProfilesAfterCreation, var_export($aProfilesAfterCreation, true));
 
 		$oUser2 = new \UserLocal();
@@ -556,7 +610,7 @@ class UserProfilesEventListenerTest extends ItopDataTestCase
 		}
 
 		$this->assertContains('Administrator', $aProfilesAfterCreation, var_export($aProfilesAfterCreation, true));
-		$this->assertContains('Configuration Manager', $aProfilesAfterCreation, var_export($aProfilesAfterCreation, true));
+		$this->assertContains('Portal user', $aProfilesAfterCreation, var_export($aProfilesAfterCreation, true));
 	}
 
 	public function testUserCreationWithWarningMessageConf()
@@ -590,23 +644,14 @@ class UserProfilesEventListenerTest extends ItopDataTestCase
 		$oUserProfilesEventListener->RegisterEventsAndListeners();
 
 		$this->expectException(\CoreCannotSaveObjectException::class);
+		$sMessage = <<<TXT
+Profile Portal power user cannot be standalone. You should add other profiles to user $sLogin otherwise you may encounter access issue with this user.
+TXT;
+
+		$this->expectExceptionMessage($sMessage);
 
 		$this->commonUserCreationTest($oUser, $aAssociatedProfilesBeforeUserCreation, $aAssociatedProfilesBeforeUserCreation, false);
 
-		/*$aObjMessages = Session::Get('obj_messages');
-		$this->assertNotEmpty($aObjMessages);
-		$sKey = sprintf("%s::%s", get_class($oUser), $oUser->GetKey());
-		$this->assertTrue(array_key_exists($sKey, $aObjMessages));
-
-		$aExpectedMessages = [
-			[
-				'rank' => 1,
-				'severity' => 'WARNING',
-				'message' => \Dict::Format("Class:User/NonStandaloneProfileWarning", 'Portal power user')
-			]
-		];
-		$this->assertEquals($aExpectedMessages, array_values($aObjMessages[$sKey]), var_export($aObjMessages[$sKey], true));
-*/
 		$_SESSION = [];
 	}
 }