From 7e9167ba821488621d2a360f4573639caba30d52 Mon Sep 17 00:00:00 2001 From: Jack Anderson Date: Fri, 16 Jun 2023 09:22:38 +0100 Subject: [PATCH] Fix #10091 - login parameter failing --- service/core/REST/SugarRestJSON.php | 3 +++ service/v4/SugarWebServiceImplv4.php | 8 ++++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/service/core/REST/SugarRestJSON.php b/service/core/REST/SugarRestJSON.php index 7facc460e0e..5a83ebda48c 100755 --- a/service/core/REST/SugarRestJSON.php +++ b/service/core/REST/SugarRestJSON.php @@ -91,6 +91,9 @@ function serve(){ $json = getJSONObj(); $data = $json->decode($json_data); if(!is_array($data))$data = array($data); + if (!isset($data['application_name']) && isset($data['application'])){ + $data['application_name'] = $data['application']; + } $res = call_user_func_array(array( $this->implementation, $method),$data); $GLOBALS['log']->info('End: SugarRestJSON->serve'); return $res; diff --git a/service/v4/SugarWebServiceImplv4.php b/service/v4/SugarWebServiceImplv4.php index 2f6ab1f44c6..4866a617188 100755 --- a/service/v4/SugarWebServiceImplv4.php +++ b/service/v4/SugarWebServiceImplv4.php @@ -70,9 +70,13 @@ public function __construct() * - user_default_team_id, user_is_admin, user_default_dateformat, user_default_timeformat * @exception 'SoapFault' -- The SOAP error, if any */ - public function login($user_auth, $application = null, $name_value_list = array()) + public function login($user_auth, $application = null, $name_value_list = array(), ...$args) { - $GLOBALS['log']->info("Begin: SugarWebServiceImpl->login({$user_auth['user_name']}, $application, ". print_r($name_value_list, true) .")"); + $application_name = $args['application_name'] ?? ''; + if ($application_name === '' && $application === null){ + $GLOBALS['log']->info("Application name not set. Please set using 'application_name' or 'application'. "); + } + $GLOBALS['log']->info("Begin: SugarWebServiceImpl->login({$user_auth['user_name']}, $application_name, ". print_r($name_value_list, true) .")"); global $sugar_config, $system_config; $error = new SoapError(); $user = BeanFactory::newBean('Users');