composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-02-13 07:24:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

Revert "N°5753 - exposer l'API Rest dans le SaaS - ugly way of passing API scope to rest.php during login"

Browse Source 
This reverts commit 49748a0374.
This commit is contained in:
odain
2022-12-21 14:38:45 +01:00
parent 1c3dfd6491
commit 973c435138
1 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
webservices/rest.php
View File

@@ -28,7 +28,7 @@ require_once(APPROOT.'core/restservices.class.inc.php');
/**
* Result structure that is specific to the hardcoded verb 'list_operations'
*/
*/
class RestResultListOperations extends RestResult
{
public $version;
@@ -94,12 +94,12 @@ $oKPI = new ExecutionKPI();
try
{
utils::UseParamFile();
$oKPI->ComputeAndReport('Data model loaded');
\Combodo\iTop\Application\Helper\Session::Set("ENDPOINT_CATEGORY", 'WEBSERVICE');
$iRet = LoginWebPage::DoLogin(false, false, LoginWebPage::EXIT_RETURN); // Starting with iTop 2.2.0 portal users are no longer allowed to access the REST/JSON API
$oKPI->ComputeAndReport('User login');
if ($iRet == LoginWebPage::EXIT_CODE_OK)
{
// Extra validation of the profile
@@ -116,23 +116,23 @@ try
case LoginWebPage::EXIT_CODE_MISSINGLOGIN:
throw new Exception("Missing parameter 'auth_user'", RestResult::MISSING_AUTH_USER);
break;
case LoginWebPage::EXIT_CODE_MISSINGPASSWORD:
throw new Exception("Missing parameter 'auth_pwd'", RestResult::MISSING_AUTH_PWD);
break;
case LoginWebPage::EXIT_CODE_WRONGCREDENTIALS:
throw new Exception("Invalid login", RestResult::UNAUTHORIZED);
break;
case LoginWebPage::EXIT_CODE_PORTALUSERNOTAUTHORIZED:
throw new Exception("Portal user is not allowed", RestResult::UNAUTHORIZED);
break;
case LoginWebPage::EXIT_CODE_NOTAUTHORIZED:
throw new Exception("This user is not authorized to use the web services. (The profile REST Services User is required to access the REST web services)", RestResult::UNAUTHORIZED);
break;
default:
throw new Exception("Unknown authentication error (retCode=$iRet)", RestResult::UNAUTHORIZED);
}
@@ -224,7 +224,7 @@ try
/** @var iRestServiceProvider $oRS */
$oRS = $aOpToRestService[$sOperation]['service_provider'];
$sProvider = get_class($oRS);
CMDBObject::SetTrackOrigin('webservice-rest');
$oResult = $oRS->ExecOperation($sVersion, $sOperation, $aJsonData);
}
@@ -293,4 +293,4 @@ if (MetaModel::GetConfig()->Get('log_rest_service'))
$oLog->SetTrim('json_output', $sResponse);
$oLog->DBInsertNoReload();
}
}