mirror of
https://github.com/Combodo/iTop.git
synced 2026-05-19 23:32:17 +02:00
5324-handle forgotten usecases
This commit is contained in:
@@ -41,19 +41,27 @@ class UserProfilesEventListener implements iEventServiceSetup
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
$callback = [$this, 'OnUserProfileLinkChange'];
|
|
||||||
$aEventSource = [\User::class, \UserExternal::class, \UserInternal::class];
|
$aEventSource = [\User::class, \UserExternal::class, \UserInternal::class];
|
||||||
|
|
||||||
EventService::RegisterListener(
|
EventService::RegisterListener(
|
||||||
EVENT_DB_BEFORE_WRITE,
|
EVENT_DB_BEFORE_WRITE,
|
||||||
$callback,
|
[$this, 'OnUserEdition'],
|
||||||
$aEventSource
|
$aEventSource
|
||||||
);
|
);
|
||||||
|
|
||||||
EventService::RegisterListener(
|
EventService::RegisterListener(
|
||||||
EVENT_DB_LINKS_CHANGED,
|
EVENT_DB_BEFORE_WRITE,
|
||||||
$callback,
|
[ $this, 'OnUserProfileEdition' ],
|
||||||
$aEventSource
|
[ \URP_UserProfile::class ],
|
||||||
|
[],
|
||||||
|
null
|
||||||
|
);
|
||||||
|
|
||||||
|
EventService::RegisterListener(
|
||||||
|
EVENT_DB_CHECK_TO_DELETE,
|
||||||
|
[ $this, 'OnUserProfileLinkDeletion' ],
|
||||||
|
[ \URP_UserProfile::class ],
|
||||||
|
[],
|
||||||
|
null
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -62,12 +70,13 @@ class UserProfilesEventListener implements iEventServiceSetup
|
|||||||
return $this->bIsRepairmentEnabled;
|
return $this->bIsRepairmentEnabled;
|
||||||
}
|
}
|
||||||
|
|
||||||
public function OnUserProfileLinkChange(EventData $oEventData): void {
|
|
||||||
|
public function OnUserEdition(EventData $oEventData): void {
|
||||||
/** @var \User $oObject */
|
/** @var \User $oObject */
|
||||||
$oUser = $oEventData->Get('object');
|
$oUser = $oEventData->Get('object');
|
||||||
|
|
||||||
try {
|
try {
|
||||||
$this->RepairProfiles($oUser);
|
$this->ValidateThenRepairOrWarn($oUser);
|
||||||
} catch (Exception $e) {
|
} catch (Exception $e) {
|
||||||
IssueLog::Error('Exception occurred on RepairProfiles', LogChannels::DM_CRUD, [
|
IssueLog::Error('Exception occurred on RepairProfiles', LogChannels::DM_CRUD, [
|
||||||
'user_class' => get_class($oUser),
|
'user_class' => get_class($oUser),
|
||||||
@@ -75,9 +84,119 @@ class UserProfilesEventListener implements iEventServiceSetup
|
|||||||
'exception_message' => $e->getMessage(),
|
'exception_message' => $e->getMessage(),
|
||||||
'exception_stacktrace' => $e->getTraceAsString(),
|
'exception_stacktrace' => $e->getTraceAsString(),
|
||||||
]);
|
]);
|
||||||
|
if ($e instanceof \CoreCannotSaveObjectException){
|
||||||
|
throw $e;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public function OnUserProfileEdition(EventData $oEventData): void {
|
||||||
|
$oURP_UserProfile = $oEventData->Get('object');
|
||||||
|
|
||||||
|
try {
|
||||||
|
$iUserId = $oURP_UserProfile->Get('userid');
|
||||||
|
$oUser = \MetaModel::GetReentranceObjectByChildClass(\User::class, $iUserId);
|
||||||
|
if (false !== $oUser){
|
||||||
|
//user edition: handled by other event
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
$oUser = \MetaModel::GetObject(\User::class, $iUserId);
|
||||||
|
$aChanges = $oURP_UserProfile->ListChanges();
|
||||||
|
if (array_key_exists('userid', $aChanges)) {
|
||||||
|
$iUserId = $oURP_UserProfile->GetOriginal('userid');
|
||||||
|
$oPreviousUser = \MetaModel::GetObject(\User::class, $iUserId);
|
||||||
|
|
||||||
|
$oProfileLinkSet = $oPreviousUser->Get('profile_list');
|
||||||
|
$oProfileLinkSet->Rewind();
|
||||||
|
$iCount = 0;
|
||||||
|
while ($oCurrentURP_UserProfile = $oProfileLinkSet->Fetch()) {
|
||||||
|
if ($oCurrentURP_UserProfile->Get('userid') !== $oCurrentURP_UserProfile->GetOriginal('userid')) {
|
||||||
|
$sRemovedProfileId = $oCurrentURP_UserProfile->GetOriginal('profileid');
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
$iCount++;
|
||||||
|
if ($iCount > 1){
|
||||||
|
//more than one profile: no repairment needed
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
$sSingleProfileName = $oCurrentURP_UserProfile->Get('profile');
|
||||||
|
}
|
||||||
|
$this->RepairProfileChangesOrWarn($oPreviousUser, $sSingleProfileName, $oURP_UserProfile, $sRemovedProfileId);
|
||||||
|
} else if (array_key_exists('profileid', $aChanges)){
|
||||||
|
$oCurrentUserProfileSet = $oUser->Get('profile_list');
|
||||||
|
if ($oCurrentUserProfileSet->Count() === 1){
|
||||||
|
$oProfile = $oCurrentUserProfileSet->Fetch();
|
||||||
|
|
||||||
|
$this->RepairProfileChangesOrWarn($oUser, $oProfile->Get('profile'), $oURP_UserProfile, $oProfile->GetOriginal("profileid"));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} catch (Exception $e) {
|
||||||
|
IssueLog::Error('OnUserProfileEdition Exception', LogChannels::DM_CRUD, [
|
||||||
|
'user_id' => $iUserId,
|
||||||
|
'lnk_id' => $oURP_UserProfile->GetKey(),
|
||||||
|
'exception_message' => $e->getMessage(),
|
||||||
|
'exception_stacktrace' => $e->getTraceAsString(),
|
||||||
|
]);
|
||||||
|
if ($e instanceof \CoreCannotSaveObjectException){
|
||||||
|
throw $e;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public function OnUserProfileLinkDeletion(EventData $oEventData): void {
|
||||||
|
$oURP_UserProfile = $oEventData->Get('object');
|
||||||
|
|
||||||
|
try {
|
||||||
|
$iUserId = $oURP_UserProfile->Get('userid');
|
||||||
|
$oUser = \MetaModel::GetReentranceObjectByChildClass(\User::class, $iUserId);
|
||||||
|
if (false !== $oUser){
|
||||||
|
//user edition: handled by other event
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
$oUser = \MetaModel::GetObject(\User::class, $iUserId);
|
||||||
|
|
||||||
|
/** @var \DeletionPlan $oDeletionPlan */
|
||||||
|
$oDeletionPlan = $oEventData->Get('deletion_plan');
|
||||||
|
$aDeletedURP_UserProfiles = [];
|
||||||
|
if (! is_null($oDeletionPlan)){
|
||||||
|
$aListDeletes = $oDeletionPlan->ListDeletes();
|
||||||
|
if (array_key_exists(\URP_UserProfile::class, $aListDeletes)) {
|
||||||
|
foreach ($aListDeletes[\URP_UserProfile::class] as $iId => $aDeletes) {
|
||||||
|
$aDeletedURP_UserProfiles []= $iId;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
$oProfileLinkSet = $oUser->Get('profile_list');
|
||||||
|
$oProfileLinkSet->Rewind();
|
||||||
|
$iCount = 0;
|
||||||
|
while ($oCurrentURP_UserProfile = $oProfileLinkSet->Fetch()) {
|
||||||
|
if (in_array($oCurrentURP_UserProfile->GetKey(), $aDeletedURP_UserProfiles)) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
$iCount++;
|
||||||
|
if ($iCount > 1){
|
||||||
|
//more than one profile: no repairment needed
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
$sSingleProfileName = $oCurrentURP_UserProfile->Get('profile');
|
||||||
|
}
|
||||||
|
|
||||||
|
$this->RepairProfileChangesOrWarn($oUser, $sSingleProfileName, $oURP_UserProfile, $oURP_UserProfile->Get('profileid'), true);
|
||||||
|
} catch (Exception $e) {
|
||||||
|
IssueLog::Error('OnUserProfileLinkDeletion Exception', LogChannels::DM_CRUD, [
|
||||||
|
'user_id' => $iUserId,
|
||||||
|
'profile_id' => $oURP_UserProfile->Get('profileid'),
|
||||||
|
'exception_message' => $e->getMessage(),
|
||||||
|
'exception_stacktrace' => $e->getTraceAsString(),
|
||||||
|
]);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @param $aPortalDispatcherData: passed only for testing purpose
|
* @param $aPortalDispatcherData: passed only for testing purpose
|
||||||
*
|
*
|
||||||
@@ -125,83 +244,113 @@ class UserProfilesEventListener implements iEventServiceSetup
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
$this->FetchRepairingProfileIds($aNonStandaloneProfiles);
|
||||||
|
}
|
||||||
|
|
||||||
|
public function FetchRepairingProfileIds(array $aNonStandaloneProfiles) : void {
|
||||||
|
$aProfiles = [];
|
||||||
try {
|
try {
|
||||||
$this->FetchRepairingProfileIds($aNonStandaloneProfiles);
|
$aProfilesToSearch = array_unique(array_values($aNonStandaloneProfiles));
|
||||||
|
if(($iIndex = array_search(null, $aProfilesToSearch)) !== false) {
|
||||||
|
unset($aProfilesToSearch[$iIndex]);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (1 === count($aProfilesToSearch)){
|
||||||
|
$sInCondition = sprintf('"%s"', array_pop($aProfilesToSearch));
|
||||||
|
} else {
|
||||||
|
$sInCondition = sprintf('"%s"', implode('","', $aProfilesToSearch));
|
||||||
|
}
|
||||||
|
|
||||||
|
$sOql = "SELECT URP_Profiles WHERE name IN ($sInCondition)";
|
||||||
|
$oSearch = \DBSearch::FromOQL($sOql);
|
||||||
|
$oSearch->AllowAllData();
|
||||||
|
$oSet = new \DBObjectSet($oSearch);
|
||||||
|
while(($oProfile = $oSet->Fetch()) != null) {
|
||||||
|
$sProfileName = $oProfile->Get('name');
|
||||||
|
$aProfiles[$sProfileName] = $oProfile->GetKey();
|
||||||
|
}
|
||||||
|
|
||||||
|
$this->aNonStandaloneProfilesMap = [];
|
||||||
|
foreach ($aNonStandaloneProfiles as $sNonStandaloneProfileName => $sRepairProfileName) {
|
||||||
|
if (is_null($sRepairProfileName)) {
|
||||||
|
$this->aNonStandaloneProfilesMap[$sNonStandaloneProfileName] = null;
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (! array_key_exists($sRepairProfileName, $aProfiles)) {
|
||||||
|
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->bIsRepairmentEnabled = true;
|
||||||
} catch (\Exception $e) {
|
} catch (\Exception $e) {
|
||||||
IssueLog::Error('Exception when searching user portal profile', LogChannels::DM_CRUD, [
|
IssueLog::Error('Exception when searching user portal profile', LogChannels::DM_CRUD, [
|
||||||
'exception_message' => $e->getMessage(),
|
'exception_message' => $e->getMessage(),
|
||||||
'exception_stacktrace' => $e->getTraceAsString(),
|
'exception_stacktrace' => $e->getTraceAsString(),
|
||||||
|
'aProfiles' => $aProfiles,
|
||||||
|
'aNonStandaloneProfiles' => $aNonStandaloneProfiles,
|
||||||
]);
|
]);
|
||||||
$this->bIsRepairmentEnabled = false;
|
$this->bIsRepairmentEnabled = false;
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
$this->bIsRepairmentEnabled = true;
|
|
||||||
}
|
|
||||||
|
|
||||||
public function FetchRepairingProfileIds(array $aNonStandaloneProfiles) : void {
|
|
||||||
$aProfilesToSearch = array_unique(array_values($aNonStandaloneProfiles));
|
|
||||||
if(($iIndex = array_search(null, $aProfilesToSearch)) !== false) {
|
|
||||||
unset($aProfilesToSearch[$iIndex]);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (1 === count($aProfilesToSearch)){
|
|
||||||
$sInCondition = sprintf('"%s"', array_pop($aProfilesToSearch));
|
|
||||||
} else {
|
|
||||||
$sInCondition = sprintf('"%s"', implode('","', $aProfilesToSearch));
|
|
||||||
}
|
|
||||||
|
|
||||||
$sOql = "SELECT URP_Profiles WHERE name IN ($sInCondition)";
|
|
||||||
$oSearch = \DBSearch::FromOQL($sOql);
|
|
||||||
$oSearch->AllowAllData();
|
|
||||||
$oSet = new \DBObjectSet($oSearch);
|
|
||||||
$aProfiles = [];
|
|
||||||
while(($oProfile = $oSet->Fetch()) != null) {
|
|
||||||
$sProfileName = $oProfile->Get('name');
|
|
||||||
$aProfiles[$sProfileName] = $oProfile->GetKey();
|
|
||||||
}
|
|
||||||
|
|
||||||
$this->aNonStandaloneProfilesMap = [];
|
|
||||||
foreach ($aNonStandaloneProfiles as $sNonStandaloneProfileName => $sRepairProfileName) {
|
|
||||||
if (is_null($sRepairProfileName)) {
|
|
||||||
$this->aNonStandaloneProfilesMap[$sNonStandaloneProfileName] = null;
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!array_key_exists($sRepairProfileName, $aProfiles)) {
|
|
||||||
throw new \Exception(sprintf("%s is badly configured. profile $sRepairProfileName does not exist.", self::USERPROFILE_REPAIR_ITOP_PARAM_NAME));
|
|
||||||
}
|
|
||||||
|
|
||||||
$this->aNonStandaloneProfilesMap[$sNonStandaloneProfileName] = $aProfiles[$sRepairProfileName];
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public function RepairProfiles(?\User $oUser) : void
|
public function ValidateThenRepairOrWarn(\User $oUser) : void
|
||||||
{
|
{
|
||||||
if (!is_null($oUser))
|
$oCurrentUserProfileSet = $oUser->Get('profile_list');
|
||||||
{
|
if ($oCurrentUserProfileSet->Count() === 1){
|
||||||
$oCurrentUserProfileSet = $oUser->Get('profile_list');
|
$oProfile = $oCurrentUserProfileSet->Fetch();
|
||||||
if ($oCurrentUserProfileSet->Count() === 1){
|
|
||||||
$oProfile = $oCurrentUserProfileSet->Fetch();
|
|
||||||
$sSingleProfileName = $oProfile->Get('profile');
|
|
||||||
|
|
||||||
if (array_key_exists($sSingleProfileName, $this->aNonStandaloneProfilesMap)) {
|
$this->RepairUserChangesOrWarn($oUser, $oProfile->Get('profile'));
|
||||||
$sRepairingProfileId = $this->aNonStandaloneProfilesMap[$sSingleProfileName];
|
}
|
||||||
if (is_null($sRepairingProfileId)){
|
}
|
||||||
//Notify current user via session messages that there will be an issue
|
|
||||||
//Without preventing from commiting
|
public function RepairUserChangesOrWarn(\User $oUser, string $sSingleProfileName) : void {
|
||||||
$sMessage = \Dict::Format("Class:User/NonStandaloneProfileWarning", $sSingleProfileName);
|
if (array_key_exists($sSingleProfileName, $this->aNonStandaloneProfilesMap)) {
|
||||||
$oUser::SetSessionMessage(get_class($oUser), $oUser->GetKey(), 1, $sMessage, 'WARNING', 1);
|
$sRepairingProfileId = $this->aNonStandaloneProfilesMap[$sSingleProfileName];
|
||||||
} else {
|
if (is_null($sRepairingProfileId)){
|
||||||
//Completing profiles profiles by adding repairing one : by default portal user to a power portal user
|
//Notify current user via session messages that there will be an issue
|
||||||
$oUserProfile = new \URP_UserProfile();
|
//Without preventing from commiting
|
||||||
$oUserProfile->Set('profileid', $sRepairingProfileId);
|
$sMessage = \Dict::Format("Class:User/NonStandaloneProfileWarning", $sSingleProfileName);
|
||||||
$oCurrentUserProfileSet->AddItem($oUserProfile);
|
//$oUser::SetSessionMessage(get_class($oUser), $oUser->GetKey(), 1, $sMessage, 'WARNING', 1);
|
||||||
$oUser->Set('profile_list', $oCurrentUserProfileSet);
|
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);
|
||||||
|
$oCurrentUserProfileSet = $oUser->Get('profile_list');
|
||||||
|
$oCurrentUserProfileSet->AddItem($oUserProfile);
|
||||||
|
$oUser->Set('profile_list', $oCurrentUserProfileSet);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public function RepairProfileChangesOrWarn(\User $oUser, string $sSingleProfileName, \URP_UserProfile $oURP_UserProfile, string $sRemovedProfileId, $bIsRemoval=false) : void {
|
||||||
|
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
|
||||||
|
){
|
||||||
|
//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);
|
||||||
|
if ($bIsRemoval){
|
||||||
|
$oURP_UserProfile->AddDeleteIssue($sMessage);
|
||||||
|
} else {
|
||||||
|
throw new \CoreCannotSaveObjectException(array('issues' => [$sMessage], 'class' => get_class($oURP_UserProfile), 'id' => $oURP_UserProfile->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);
|
||||||
|
$oCurrentUserProfileSet = $oUser->Get('profile_list');
|
||||||
|
$oCurrentUserProfileSet->AddItem($oUserProfile);
|
||||||
|
$oUser->Set('profile_list', $oCurrentUserProfileSet);
|
||||||
|
$oUser->DBWrite();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -65,14 +65,14 @@ class UserProfilesEventListenerTest extends ItopDataTestCase
|
|||||||
'Portal user',
|
'Portal user',
|
||||||
]
|
]
|
||||||
],
|
],
|
||||||
'Portal power user + Support Agent => profiles untouched' => [
|
'Portal power user + Configuration Manager => profiles untouched' => [
|
||||||
'aAssociatedProfilesBeforeUserCreation' => [
|
'aAssociatedProfilesBeforeUserCreation' => [
|
||||||
'Portal power user',
|
'Portal power user',
|
||||||
'Support Agent',
|
'Configuration Manager',
|
||||||
],
|
],
|
||||||
'aExpectedAssociatedProfilesAfterUserCreation'=> [
|
'aExpectedAssociatedProfilesAfterUserCreation'=> [
|
||||||
'Portal power user',
|
'Portal power user',
|
||||||
'Support Agent',
|
'Configuration Manager',
|
||||||
]
|
]
|
||||||
],
|
],
|
||||||
];
|
];
|
||||||
@@ -89,7 +89,7 @@ class UserProfilesEventListenerTest extends ItopDataTestCase
|
|||||||
$oUser->Set('login', $sLogin);
|
$oUser->Set('login', $sLogin);
|
||||||
$oUser->Set('password', 'ABCD1234@gabuzomeu');
|
$oUser->Set('password', 'ABCD1234@gabuzomeu');
|
||||||
$oUser->Set('language', 'EN US');
|
$oUser->Set('language', 'EN US');
|
||||||
$this->commonUserCreation($oUser, $aAssociatedProfilesBeforeUserCreation, $aExpectedAssociatedProfilesAfterUserCreation);
|
$this->commonUserCreationTest($oUser, $aAssociatedProfilesBeforeUserCreation, $aExpectedAssociatedProfilesAfterUserCreation);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -103,7 +103,7 @@ class UserProfilesEventListenerTest extends ItopDataTestCase
|
|||||||
$oUser->Set('login', $sLogin);
|
$oUser->Set('login', $sLogin);
|
||||||
$oUser->Set('password', 'ABCD1234@gabuzomeu');
|
$oUser->Set('password', 'ABCD1234@gabuzomeu');
|
||||||
$oUser->Set('language', 'EN US');
|
$oUser->Set('language', 'EN US');
|
||||||
$this->commonUserUpdate($oUser, $aAssociatedProfilesBeforeUserCreation, $aExpectedAssociatedProfilesAfterUserCreation);
|
$this->commonUserUpdateTest($oUser, $aAssociatedProfilesBeforeUserCreation, $aExpectedAssociatedProfilesAfterUserCreation);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -115,7 +115,7 @@ class UserProfilesEventListenerTest extends ItopDataTestCase
|
|||||||
$oUser = new \UserLDAP();
|
$oUser = new \UserLDAP();
|
||||||
$sLogin = 'testUserLDAPCreationWithPortalPowerUserProfile-'.uniqid();
|
$sLogin = 'testUserLDAPCreationWithPortalPowerUserProfile-'.uniqid();
|
||||||
$oUser->Set('login', $sLogin);
|
$oUser->Set('login', $sLogin);
|
||||||
$this->commonUserCreation($oUser, $aAssociatedProfilesBeforeUserCreation, $aExpectedAssociatedProfilesAfterUserCreation);
|
$this->commonUserCreationTest($oUser, $aAssociatedProfilesBeforeUserCreation, $aExpectedAssociatedProfilesAfterUserCreation);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -127,7 +127,7 @@ class UserProfilesEventListenerTest extends ItopDataTestCase
|
|||||||
$oUser = new \UserLDAP();
|
$oUser = new \UserLDAP();
|
||||||
$sLogin = 'testUserLDAPUpdateWithPortalPowerUserProfile-'.uniqid();
|
$sLogin = 'testUserLDAPUpdateWithPortalPowerUserProfile-'.uniqid();
|
||||||
$oUser->Set('login', $sLogin);
|
$oUser->Set('login', $sLogin);
|
||||||
$this->commonUserUpdate($oUser, $aAssociatedProfilesBeforeUserCreation, $aExpectedAssociatedProfilesAfterUserCreation);
|
$this->commonUserUpdateTest($oUser, $aAssociatedProfilesBeforeUserCreation, $aExpectedAssociatedProfilesAfterUserCreation);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -139,7 +139,7 @@ class UserProfilesEventListenerTest extends ItopDataTestCase
|
|||||||
$oUser = new \UserExternal();
|
$oUser = new \UserExternal();
|
||||||
$sLogin = 'testUserLDAPCreationWithPortalPowerUserProfile-'.uniqid();
|
$sLogin = 'testUserLDAPCreationWithPortalPowerUserProfile-'.uniqid();
|
||||||
$oUser->Set('login', $sLogin);
|
$oUser->Set('login', $sLogin);
|
||||||
$this->commonUserCreation($oUser, $aAssociatedProfilesBeforeUserCreation, $aExpectedAssociatedProfilesAfterUserCreation);
|
$this->commonUserCreationTest($oUser, $aAssociatedProfilesBeforeUserCreation, $aExpectedAssociatedProfilesAfterUserCreation);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -151,7 +151,7 @@ class UserProfilesEventListenerTest extends ItopDataTestCase
|
|||||||
$oUser = new \UserExternal();
|
$oUser = new \UserExternal();
|
||||||
$sLogin = 'testUserLDAPUpdateWithPortalPowerUserProfile-'.uniqid();
|
$sLogin = 'testUserLDAPUpdateWithPortalPowerUserProfile-'.uniqid();
|
||||||
$oUser->Set('login', $sLogin);
|
$oUser->Set('login', $sLogin);
|
||||||
$this->commonUserUpdate($oUser, $aAssociatedProfilesBeforeUserCreation, $aExpectedAssociatedProfilesAfterUserCreation);
|
$this->commonUserUpdateTest($oUser, $aAssociatedProfilesBeforeUserCreation, $aExpectedAssociatedProfilesAfterUserCreation);
|
||||||
}
|
}
|
||||||
|
|
||||||
public function CreateUserForProfileTesting(\User $oUserToCreate, array $aAssociatedProfilesBeforeUserCreation, $bDbInsert=true) : array
|
public function CreateUserForProfileTesting(\User $oUserToCreate, array $aAssociatedProfilesBeforeUserCreation, $bDbInsert=true) : array
|
||||||
@@ -189,16 +189,16 @@ class UserProfilesEventListenerTest extends ItopDataTestCase
|
|||||||
return [ $sId, $aProfiles];
|
return [ $sId, $aProfiles];
|
||||||
}
|
}
|
||||||
|
|
||||||
public function commonUserCreation($oUserToCreate, $aAssociatedProfilesBeforeUserCreation,
|
public function commonUserCreationTest($oUserToCreate, $aAssociatedProfilesBeforeUserCreation,
|
||||||
$aExpectedAssociatedProfilesAfterUserCreation, $bTestUserItopAccess=true)
|
$aExpectedAssociatedProfilesAfterUserCreation, $bTestUserItopAccess=true)
|
||||||
{
|
{
|
||||||
$sUserClass = get_class($oUserToCreate);
|
$sUserClass = get_class($oUserToCreate);
|
||||||
list ($sId, $aProfiles) = $this->CreateUserForProfileTesting($oUserToCreate, $aAssociatedProfilesBeforeUserCreation);
|
list ($sId, $aProfiles) = $this->CreateUserForProfileTesting($oUserToCreate, $aAssociatedProfilesBeforeUserCreation);
|
||||||
|
|
||||||
$this->CheckProfilesAreOk($sUserClass, $sId, $aExpectedAssociatedProfilesAfterUserCreation, $bTestUserItopAccess);
|
$this->CheckProfilesAreOkAndThenConnectToITop($sUserClass, $sId, $aExpectedAssociatedProfilesAfterUserCreation, $bTestUserItopAccess);
|
||||||
}
|
}
|
||||||
|
|
||||||
public function CheckProfilesAreOk($sUserClass, $sId, $aExpectedAssociatedProfilesAfterUserCreation, $bTestUserItopAccess=true){
|
public function CheckProfilesAreOkAndThenConnectToITop($sUserClass, $sId, $aExpectedAssociatedProfilesAfterUserCreation, $bTestItopConnection=true){
|
||||||
$oUser = \MetaModel::GetObject($sUserClass, $sId);
|
$oUser = \MetaModel::GetObject($sUserClass, $sId);
|
||||||
$oUserProfileList = $oUser->Get('profile_list');
|
$oUserProfileList = $oUser->Get('profile_list');
|
||||||
$aProfilesAfterCreation=[];
|
$aProfilesAfterCreation=[];
|
||||||
@@ -211,7 +211,7 @@ class UserProfilesEventListenerTest extends ItopDataTestCase
|
|||||||
"profile \'$sExpectedProfileName\' should be asociated to user after creation. " . var_export($aProfilesAfterCreation, true) );
|
"profile \'$sExpectedProfileName\' should be asociated to user after creation. " . var_export($aProfilesAfterCreation, true) );
|
||||||
}
|
}
|
||||||
|
|
||||||
if (! $bTestUserItopAccess){
|
if (! $bTestItopConnection){
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -233,7 +233,7 @@ class UserProfilesEventListenerTest extends ItopDataTestCase
|
|||||||
$_SESSION = [];
|
$_SESSION = [];
|
||||||
}
|
}
|
||||||
|
|
||||||
public function commonUserUpdate($oUserToCreate, $aAssociatedProfilesBeforeUserCreation,
|
public function commonUserUpdateTest($oUserToCreate, $aAssociatedProfilesBeforeUserCreation,
|
||||||
$aExpectedAssociatedProfilesAfterUserCreation)
|
$aExpectedAssociatedProfilesAfterUserCreation)
|
||||||
{
|
{
|
||||||
$sUserClass = get_class($oUserToCreate);
|
$sUserClass = get_class($oUserToCreate);
|
||||||
@@ -256,11 +256,14 @@ class UserProfilesEventListenerTest extends ItopDataTestCase
|
|||||||
$oUserToUpdate->Set('profile_list', $oProfileList);
|
$oUserToUpdate->Set('profile_list', $oProfileList);
|
||||||
$oUserToUpdate->DBWrite();
|
$oUserToUpdate->DBWrite();
|
||||||
|
|
||||||
$this->CheckProfilesAreOk($sUserClass, $sId, $aExpectedAssociatedProfilesAfterUserCreation);
|
$this->CheckProfilesAreOkAndThenConnectToITop($sUserClass, $sId, $aExpectedAssociatedProfilesAfterUserCreation);
|
||||||
}
|
}
|
||||||
|
|
||||||
public function testUpdateUserExternalProfilesViaLinks(){
|
/**
|
||||||
$aInitialProfiles = [ "Administrator", "Portal power user"];
|
* @dataProvider ProfilesLinksProvider
|
||||||
|
*/
|
||||||
|
public function testProfilesLinksDBDelete(string $sProfileNameToRemove, $bRaiseException=false){
|
||||||
|
$aInitialProfiles = [ $sProfileNameToRemove, "Portal power user"];
|
||||||
|
|
||||||
$oUser = new \UserExternal();
|
$oUser = new \UserExternal();
|
||||||
$sLogin = 'testUserLDAPUpdateWithPortalPowerUserProfile-'.uniqid();
|
$sLogin = 'testUserLDAPUpdateWithPortalPowerUserProfile-'.uniqid();
|
||||||
@@ -269,70 +272,66 @@ class UserProfilesEventListenerTest extends ItopDataTestCase
|
|||||||
$sUserClass = get_class($oUser);
|
$sUserClass = get_class($oUser);
|
||||||
list ($sId, $aProfiles) = $this->CreateUserForProfileTesting($oUser, $aInitialProfiles);
|
list ($sId, $aProfiles) = $this->CreateUserForProfileTesting($oUser, $aInitialProfiles);
|
||||||
|
|
||||||
|
if ($bRaiseException){
|
||||||
|
$this->expectException(\DeleteException::class);
|
||||||
|
}
|
||||||
|
|
||||||
$aURPUserProfileByUser = $this->GetURPUserProfileByUser($sId);
|
$aURPUserProfileByUser = $this->GetURPUserProfileByUser($sId);
|
||||||
$sProfileNameToRemove = "Administrator";
|
|
||||||
if (array_key_exists($sProfileNameToRemove, $aURPUserProfileByUser)){
|
if (array_key_exists($sProfileNameToRemove, $aURPUserProfileByUser)){
|
||||||
$oURPUserProfile = $aURPUserProfileByUser[$sProfileNameToRemove];
|
$oURPUserProfile = $aURPUserProfileByUser[$sProfileNameToRemove];
|
||||||
$oURPUserProfile->DBDelete();
|
$oURPUserProfile->DBDelete();
|
||||||
}
|
}
|
||||||
|
|
||||||
$aExpectedProfilesAfterUpdate = ["Portal power user", "Portal user"];
|
if (! $bRaiseException) {
|
||||||
$this->CheckProfilesAreOk($sUserClass, $sId, $aExpectedProfilesAfterUpdate);
|
$aExpectedProfilesAfterUpdate = ["Portal power user", "Portal user"];
|
||||||
|
$this->CheckProfilesAreOkAndThenConnectToITop($sUserClass, $sId, $aExpectedProfilesAfterUpdate);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public function BulkUpdateUserExternalProfilesViaLinksProvider(){
|
/**
|
||||||
|
* @dataProvider ProfilesLinksProvider
|
||||||
|
*/
|
||||||
|
public function testProfilesLinksEdit_ChangeProfileId(string $sInitialProfile, $bRaiseException=false){
|
||||||
|
$oUser = new \UserExternal();
|
||||||
|
$sLogin = 'testUserLDAPUpdateWithPortalPowerUserProfile-'.uniqid();
|
||||||
|
$oUser->Set('login', $sLogin);
|
||||||
|
|
||||||
|
$sUserClass = get_class($oUser);
|
||||||
|
list ($sId, $aProfiles) = $this->CreateUserForProfileTesting($oUser, [$sInitialProfile]);
|
||||||
|
|
||||||
|
$oURP_Profile = \MetaModel::GetObjectByColumn("URP_Profiles", "name", "Portal power user");
|
||||||
|
|
||||||
|
$aURPUserProfileByUser = $this->GetURPUserProfileByUser($sId);
|
||||||
|
|
||||||
|
if ($bRaiseException){
|
||||||
|
$this->expectException(\CoreCannotSaveObjectException::class);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (array_key_exists($sInitialProfile, $aURPUserProfileByUser)){
|
||||||
|
$oURPUserProfile = $aURPUserProfileByUser[$sInitialProfile];
|
||||||
|
$oURPUserProfile->Set('profileid', $oURP_Profile->GetKey());
|
||||||
|
$oURPUserProfile->DBWrite();
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!$bRaiseException) {
|
||||||
|
$aExpectedProfilesAfterUpdate = ["Portal power user", "Portal user"];
|
||||||
|
$this->CheckProfilesAreOkAndThenConnectToITop($sUserClass, $sId, $aExpectedProfilesAfterUpdate);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public function ProfilesLinksProvider() {
|
||||||
return [
|
return [
|
||||||
'user profiles REPAIR 1' => [
|
"Administrator" => [ "sProfileNameToMove" => "Administrator" ],
|
||||||
"aInitialProfiles" => [ "Administrator"],
|
"Portal user" => [ "sProfileNameToMove" => "Portal user", "bRaiseException" => true ],
|
||||||
"aOperation" => [
|
|
||||||
'-Administrator',
|
|
||||||
'+Portal power user',
|
|
||||||
],
|
|
||||||
"aExpectedProfilesAfterUpdate" => ["Portal power user", "Portal user"],
|
|
||||||
],
|
|
||||||
'user profiles REPAIR 2' => [
|
|
||||||
"aInitialProfiles" => [ "Administrator"],
|
|
||||||
"aOperation" => [
|
|
||||||
'+Portal power user',
|
|
||||||
'-Administrator',
|
|
||||||
],
|
|
||||||
"aExpectedProfilesAfterUpdate" => ["Portal power user", "Portal user"],
|
|
||||||
],
|
|
||||||
'user profiles REPAIR 3' => [
|
|
||||||
"aInitialProfiles" => [ "Administrator", "Portal power user"],
|
|
||||||
"aOperation" => [
|
|
||||||
'-Administrator',
|
|
||||||
],
|
|
||||||
"aExpectedProfilesAfterUpdate" => ["Portal power user", "Portal user"],
|
|
||||||
],
|
|
||||||
'NOTHING DONE with 1 profile' => [
|
|
||||||
"aInitialProfiles" => [ "Administrator", "Portal power user"],
|
|
||||||
"aOperation" => [
|
|
||||||
'-Portal power user',
|
|
||||||
],
|
|
||||||
"aExpectedProfilesAfterUpdate" => ["Administrator"],
|
|
||||||
],
|
|
||||||
'NOTHING DONE with 2 profiles including power...' => [
|
|
||||||
"aInitialProfiles" => [ "Administrator"],
|
|
||||||
"aOperation" => [
|
|
||||||
'+Portal power user',
|
|
||||||
],
|
|
||||||
"aExpectedProfilesAfterUpdate" => ["Administrator", "Portal power user"],
|
|
||||||
],
|
|
||||||
'NOTHING DONE with 2 profiles including power again ...' => [
|
|
||||||
"aInitialProfiles" => [ "Portal user"],
|
|
||||||
"aOperation" => [
|
|
||||||
'+Portal power user',
|
|
||||||
],
|
|
||||||
"aExpectedProfilesAfterUpdate" => ["Portal user", "Portal power user"],
|
|
||||||
],
|
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @dataProvider BulkUpdateUserExternalProfilesViaLinksProvider
|
* @dataProvider ProfilesLinksProvider
|
||||||
*/
|
*/
|
||||||
public function testBulkUpdateUserExternalProfilesViaLinks($aInitialProfiles, $aOperation, $aExpectedProfilesAfterUpdate){
|
public function testProfilesLinksEdit_ChangeUserId($sProfileNameToMove, $bRaiseException=false){
|
||||||
|
$aInitialProfiles = [ $sProfileNameToMove, "Portal power user"];
|
||||||
|
|
||||||
$oUser = new \UserExternal();
|
$oUser = new \UserExternal();
|
||||||
$sLogin = 'testUserLDAPUpdateWithPortalPowerUserProfile-'.uniqid();
|
$sLogin = 'testUserLDAPUpdateWithPortalPowerUserProfile-'.uniqid();
|
||||||
$oUser->Set('login', $sLogin);
|
$oUser->Set('login', $sLogin);
|
||||||
@@ -340,31 +339,29 @@ class UserProfilesEventListenerTest extends ItopDataTestCase
|
|||||||
$sUserClass = get_class($oUser);
|
$sUserClass = get_class($oUser);
|
||||||
list ($sId, $aProfiles) = $this->CreateUserForProfileTesting($oUser, $aInitialProfiles);
|
list ($sId, $aProfiles) = $this->CreateUserForProfileTesting($oUser, $aInitialProfiles);
|
||||||
|
|
||||||
\cmdbAbstractObject::SetEventDBLinksChangedBlocked(true);
|
$oUser = new \UserExternal();
|
||||||
|
$sLogin = 'testUserLDAPUpdateWithPortalPowerUserProfile-'.uniqid();
|
||||||
|
$oUser->Set('login', $sLogin);
|
||||||
|
list ($sAnotherUserId, $aProfiles) = $this->CreateUserForProfileTesting($oUser, ["Configuration Manager"]);
|
||||||
|
|
||||||
$aURPUserProfileByUser = $this->GetURPUserProfileByUser($sId);
|
if ($bRaiseException){
|
||||||
foreach ($aOperation as $sOperation){
|
$this->expectException(\CoreCannotSaveObjectException::class);
|
||||||
$sOp = substr($sOperation,0, 1);
|
|
||||||
$sProfileName = substr($sOperation,1);
|
|
||||||
|
|
||||||
if ($sOp === "-"){
|
|
||||||
if (array_key_exists($sProfileName, $aURPUserProfileByUser)){
|
|
||||||
$oURPUserProfile = $aURPUserProfileByUser[$sProfileName];
|
|
||||||
$oURPUserProfile->DBDelete();
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
$oAdminUrpProfile = new URP_UserProfile();
|
|
||||||
$oProfile = $aProfiles[$sProfileName];
|
|
||||||
$oAdminUrpProfile->Set('profileid', $oProfile->GetKey());
|
|
||||||
$oAdminUrpProfile->Set('userid', $sId);
|
|
||||||
$oAdminUrpProfile->DBInsert();
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
\cmdbAbstractObject::SetEventDBLinksChangedBlocked(false);
|
$aURPUserProfileByUser = $this->GetURPUserProfileByUser($sId);
|
||||||
\cmdbAbstractObject::FireEventDbLinksChangedForAllObjects();
|
if (array_key_exists($sProfileNameToMove, $aURPUserProfileByUser)){
|
||||||
|
$oURPUserProfile = $aURPUserProfileByUser[$sProfileNameToMove];
|
||||||
|
$oURPUserProfile->Set('userid', $sAnotherUserId);
|
||||||
|
$oURPUserProfile->DBWrite();
|
||||||
|
}
|
||||||
|
|
||||||
$this->CheckProfilesAreOk($sUserClass, $sId, $aExpectedProfilesAfterUpdate);
|
if (! $bRaiseException) {
|
||||||
|
$aExpectedProfilesAfterUpdate = [$sProfileNameToMove, "Configuration Manager"];
|
||||||
|
$this->CheckProfilesAreOkAndThenConnectToITop($sUserClass, $sAnotherUserId, $aExpectedProfilesAfterUpdate);
|
||||||
|
|
||||||
|
$aExpectedProfilesAfterUpdate = ["Portal power user", "Portal user"];
|
||||||
|
$this->CheckProfilesAreOkAndThenConnectToITop($sUserClass, $sId, $aExpectedProfilesAfterUpdate);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private function GetURPUserProfileByUser($iUserId) : array {
|
private function GetURPUserProfileByUser($iUserId) : array {
|
||||||
@@ -461,7 +458,7 @@ class UserProfilesEventListenerTest extends ItopDataTestCase
|
|||||||
|
|
||||||
public function testInit_ConfWithOneWarningProfile() {
|
public function testInit_ConfWithOneWarningProfile() {
|
||||||
\MetaModel::GetConfig()->Set(UserProfilesEventListener::USERPROFILE_REPAIR_ITOP_PARAM_NAME,
|
\MetaModel::GetConfig()->Set(UserProfilesEventListener::USERPROFILE_REPAIR_ITOP_PARAM_NAME,
|
||||||
['Change Supervisor' => 'Administrator', 'Portal power user' => null]
|
['Ticket Manager' => 'Administrator', 'Portal power user' => null]
|
||||||
);
|
);
|
||||||
$oUserProfilesEventListener = new UserProfilesEventListener();
|
$oUserProfilesEventListener = new UserProfilesEventListener();
|
||||||
$oUserProfilesEventListener->Init();
|
$oUserProfilesEventListener->Init();
|
||||||
@@ -470,7 +467,7 @@ class UserProfilesEventListenerTest extends ItopDataTestCase
|
|||||||
|
|
||||||
public function testInit_ConfWithFurtherWarningProfiles() {
|
public function testInit_ConfWithFurtherWarningProfiles() {
|
||||||
\MetaModel::GetConfig()->Set(UserProfilesEventListener::USERPROFILE_REPAIR_ITOP_PARAM_NAME,
|
\MetaModel::GetConfig()->Set(UserProfilesEventListener::USERPROFILE_REPAIR_ITOP_PARAM_NAME,
|
||||||
['Change Supervisor' => null, 'Portal power user' => null]
|
['Ticket Manager' => null, 'Portal power user' => null]
|
||||||
);
|
);
|
||||||
$oUserProfilesEventListener = new UserProfilesEventListener();
|
$oUserProfilesEventListener = new UserProfilesEventListener();
|
||||||
$oUserProfilesEventListener->Init();
|
$oUserProfilesEventListener->Init();
|
||||||
@@ -479,7 +476,7 @@ class UserProfilesEventListenerTest extends ItopDataTestCase
|
|||||||
|
|
||||||
public function testInit_ConfWithFurtherWarningProfilesAndOneRepairment() {
|
public function testInit_ConfWithFurtherWarningProfilesAndOneRepairment() {
|
||||||
\MetaModel::GetConfig()->Set(UserProfilesEventListener::USERPROFILE_REPAIR_ITOP_PARAM_NAME,
|
\MetaModel::GetConfig()->Set(UserProfilesEventListener::USERPROFILE_REPAIR_ITOP_PARAM_NAME,
|
||||||
['Portal power user' => null, 'Change Supervisor' => null, 'Administrator' => "REST Services User"]
|
['Portal power user' => null, 'Ticket Manager' => null, 'Administrator' => "Configuration Manager"]
|
||||||
);
|
);
|
||||||
$oUserProfilesEventListener = new UserProfilesEventListener();
|
$oUserProfilesEventListener = new UserProfilesEventListener();
|
||||||
$oUserProfilesEventListener->Init();
|
$oUserProfilesEventListener->Init();
|
||||||
@@ -495,14 +492,14 @@ class UserProfilesEventListenerTest extends ItopDataTestCase
|
|||||||
$oUser->Set('language', 'EN US');
|
$oUser->Set('language', 'EN US');
|
||||||
|
|
||||||
\MetaModel::GetConfig()->Set(UserProfilesEventListener::USERPROFILE_REPAIR_ITOP_PARAM_NAME,
|
\MetaModel::GetConfig()->Set(UserProfilesEventListener::USERPROFILE_REPAIR_ITOP_PARAM_NAME,
|
||||||
['Portal power user' => 'Change Supervisor']
|
['Portal power user' => 'Ticket Manager']
|
||||||
);
|
);
|
||||||
$oUserProfilesEventListener = new UserProfilesEventListener();
|
$oUserProfilesEventListener = new UserProfilesEventListener();
|
||||||
$oUserProfilesEventListener->Init();
|
$oUserProfilesEventListener->Init();
|
||||||
$this->assertTrue($oUserProfilesEventListener->IsRepairmentEnabled());
|
$this->assertTrue($oUserProfilesEventListener->IsRepairmentEnabled());
|
||||||
|
|
||||||
$this->CreateUserForProfileTesting($oUser, ['Portal power user'], false);
|
$this->CreateUserForProfileTesting($oUser, ['Portal power user'], false);
|
||||||
$oUserProfilesEventListener->RepairProfiles($oUser);
|
$oUserProfilesEventListener->ValidateThenRepairOrWarn($oUser);
|
||||||
|
|
||||||
$oUserProfileList = $oUser->Get('profile_list');
|
$oUserProfileList = $oUser->Get('profile_list');
|
||||||
$aProfilesAfterCreation=[];
|
$aProfilesAfterCreation=[];
|
||||||
@@ -510,7 +507,7 @@ class UserProfilesEventListenerTest extends ItopDataTestCase
|
|||||||
$aProfilesAfterCreation[] = $oProfile->Get('profile');
|
$aProfilesAfterCreation[] = $oProfile->Get('profile');
|
||||||
}
|
}
|
||||||
|
|
||||||
$this->assertContains('Change Supervisor', $aProfilesAfterCreation, var_export($aProfilesAfterCreation, true));
|
$this->assertContains('Ticket Manager', $aProfilesAfterCreation, var_export($aProfilesAfterCreation, true));
|
||||||
$this->assertContains('Portal power user', $aProfilesAfterCreation, var_export($aProfilesAfterCreation, true));
|
$this->assertContains('Portal power user', $aProfilesAfterCreation, var_export($aProfilesAfterCreation, true));
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -518,8 +515,8 @@ class UserProfilesEventListenerTest extends ItopDataTestCase
|
|||||||
{
|
{
|
||||||
\MetaModel::GetConfig()->Set(UserProfilesEventListener::USERPROFILE_REPAIR_ITOP_PARAM_NAME,
|
\MetaModel::GetConfig()->Set(UserProfilesEventListener::USERPROFILE_REPAIR_ITOP_PARAM_NAME,
|
||||||
[
|
[
|
||||||
'Administrator' => 'REST Services User',
|
'Administrator' => 'Configuration Manager',
|
||||||
'Portal power user' => 'Change Supervisor'
|
'Portal power user' => 'Ticket Manager'
|
||||||
]
|
]
|
||||||
);
|
);
|
||||||
$oUserProfilesEventListener = new UserProfilesEventListener();
|
$oUserProfilesEventListener = new UserProfilesEventListener();
|
||||||
@@ -532,7 +529,7 @@ class UserProfilesEventListenerTest extends ItopDataTestCase
|
|||||||
$oUser->Set('password', 'ABCD1234@gabuzomeu');
|
$oUser->Set('password', 'ABCD1234@gabuzomeu');
|
||||||
$oUser->Set('language', 'EN US');
|
$oUser->Set('language', 'EN US');
|
||||||
$this->CreateUserForProfileTesting($oUser, ['Portal power user'], false);
|
$this->CreateUserForProfileTesting($oUser, ['Portal power user'], false);
|
||||||
$oUserProfilesEventListener->RepairProfiles($oUser);
|
$oUserProfilesEventListener->ValidateThenRepairOrWarn($oUser);
|
||||||
|
|
||||||
$oUserProfileList = $oUser->Get('profile_list');
|
$oUserProfileList = $oUser->Get('profile_list');
|
||||||
$aProfilesAfterCreation=[];
|
$aProfilesAfterCreation=[];
|
||||||
@@ -540,7 +537,7 @@ class UserProfilesEventListenerTest extends ItopDataTestCase
|
|||||||
$aProfilesAfterCreation[] = $oProfile->Get('profile');
|
$aProfilesAfterCreation[] = $oProfile->Get('profile');
|
||||||
}
|
}
|
||||||
|
|
||||||
$this->assertContains('Change Supervisor', $aProfilesAfterCreation, var_export($aProfilesAfterCreation, true));
|
$this->assertContains('Ticket Manager', $aProfilesAfterCreation, var_export($aProfilesAfterCreation, true));
|
||||||
$this->assertContains('Portal power user', $aProfilesAfterCreation, var_export($aProfilesAfterCreation, true));
|
$this->assertContains('Portal power user', $aProfilesAfterCreation, var_export($aProfilesAfterCreation, true));
|
||||||
|
|
||||||
$oUser2 = new \UserLocal();
|
$oUser2 = new \UserLocal();
|
||||||
@@ -550,7 +547,7 @@ class UserProfilesEventListenerTest extends ItopDataTestCase
|
|||||||
$oUser2->Set('language', 'EN US');
|
$oUser2->Set('language', 'EN US');
|
||||||
|
|
||||||
$this->CreateUserForProfileTesting($oUser2, ['Administrator'], false);
|
$this->CreateUserForProfileTesting($oUser2, ['Administrator'], false);
|
||||||
$oUserProfilesEventListener->RepairProfiles($oUser2);
|
$oUserProfilesEventListener->ValidateThenRepairOrWarn($oUser2);
|
||||||
|
|
||||||
$oUserProfileList = $oUser2->Get('profile_list');
|
$oUserProfileList = $oUser2->Get('profile_list');
|
||||||
$aProfilesAfterCreation=[];
|
$aProfilesAfterCreation=[];
|
||||||
@@ -559,7 +556,7 @@ class UserProfilesEventListenerTest extends ItopDataTestCase
|
|||||||
}
|
}
|
||||||
|
|
||||||
$this->assertContains('Administrator', $aProfilesAfterCreation, var_export($aProfilesAfterCreation, true));
|
$this->assertContains('Administrator', $aProfilesAfterCreation, var_export($aProfilesAfterCreation, true));
|
||||||
$this->assertContains('REST Services User', $aProfilesAfterCreation, var_export($aProfilesAfterCreation, true));
|
$this->assertContains('Configuration Manager', $aProfilesAfterCreation, var_export($aProfilesAfterCreation, true));
|
||||||
}
|
}
|
||||||
|
|
||||||
public function testUserCreationWithWarningMessageConf()
|
public function testUserCreationWithWarningMessageConf()
|
||||||
@@ -571,11 +568,9 @@ class UserProfilesEventListenerTest extends ItopDataTestCase
|
|||||||
$oAdminUser->Set('password', 'ABCD1234@gabuzomeu');
|
$oAdminUser->Set('password', 'ABCD1234@gabuzomeu');
|
||||||
$oAdminUser->Set('language', 'EN US');
|
$oAdminUser->Set('language', 'EN US');
|
||||||
$aAssociatedProfilesBeforeUserCreation = ['Administrator'];
|
$aAssociatedProfilesBeforeUserCreation = ['Administrator'];
|
||||||
$this->commonUserCreation($oAdminUser, $aAssociatedProfilesBeforeUserCreation, $aAssociatedProfilesBeforeUserCreation, false);
|
$this->commonUserCreationTest($oAdminUser, $aAssociatedProfilesBeforeUserCreation, $aAssociatedProfilesBeforeUserCreation, false);
|
||||||
UserRights::Login($oAdminUser->Get('login'));
|
UserRights::Login($oAdminUser->Get('login'));
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
$aAssociatedProfilesBeforeUserCreation = [
|
$aAssociatedProfilesBeforeUserCreation = [
|
||||||
'Portal power user'
|
'Portal power user'
|
||||||
];
|
];
|
||||||
@@ -594,8 +589,11 @@ class UserProfilesEventListenerTest extends ItopDataTestCase
|
|||||||
$oUserProfilesEventListener = new UserProfilesEventListener();
|
$oUserProfilesEventListener = new UserProfilesEventListener();
|
||||||
$oUserProfilesEventListener->RegisterEventsAndListeners();
|
$oUserProfilesEventListener->RegisterEventsAndListeners();
|
||||||
|
|
||||||
$this->commonUserCreation($oUser, $aAssociatedProfilesBeforeUserCreation, $aAssociatedProfilesBeforeUserCreation, false);
|
$this->expectException(\CoreCannotSaveObjectException::class);
|
||||||
$aObjMessages = Session::Get('obj_messages');
|
|
||||||
|
$this->commonUserCreationTest($oUser, $aAssociatedProfilesBeforeUserCreation, $aAssociatedProfilesBeforeUserCreation, false);
|
||||||
|
|
||||||
|
/*$aObjMessages = Session::Get('obj_messages');
|
||||||
$this->assertNotEmpty($aObjMessages);
|
$this->assertNotEmpty($aObjMessages);
|
||||||
$sKey = sprintf("%s::%s", get_class($oUser), $oUser->GetKey());
|
$sKey = sprintf("%s::%s", get_class($oUser), $oUser->GetKey());
|
||||||
$this->assertTrue(array_key_exists($sKey, $aObjMessages));
|
$this->assertTrue(array_key_exists($sKey, $aObjMessages));
|
||||||
@@ -608,7 +606,7 @@ class UserProfilesEventListenerTest extends ItopDataTestCase
|
|||||||
]
|
]
|
||||||
];
|
];
|
||||||
$this->assertEquals($aExpectedMessages, array_values($aObjMessages[$sKey]), var_export($aObjMessages[$sKey], true));
|
$this->assertEquals($aExpectedMessages, array_values($aObjMessages[$sKey]), var_export($aObjMessages[$sKey], true));
|
||||||
|
*/
|
||||||
$_SESSION = [];
|
$_SESSION = [];
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user