From 5854eefcce31ca923f1b592e4919d26382fd6e2c Mon Sep 17 00:00:00 2001
From: Eric Espie <eric.espie@combodo.com>
Date: Wed, 10 Aug 2022 15:27:25 +0200
Subject: [PATCH] =?UTF-8?q?N=C2=B05395=20-=20Errors=20from=20OAuth=20serve?=
 =?UTF-8?q?rs=20for=20email=20are=20not=20well=20handled=20(use=203.0=20co?=
 =?UTF-8?q?nstants)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/Controller/AjaxOauthClientController.php         | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/datamodels/2.x/itop-oauth-client/src/Controller/AjaxOauthClientController.php b/datamodels/2.x/itop-oauth-client/src/Controller/AjaxOauthClientController.php
index 65523046b1..002c8a8cb8 100644
--- a/datamodels/2.x/itop-oauth-client/src/Controller/AjaxOauthClientController.php
+++ b/datamodels/2.x/itop-oauth-client/src/Controller/AjaxOauthClientController.php
@@ -13,6 +13,7 @@ use Dict;
 use IssueLog;
 use MetaModel;
 use utils;
+use WebPage;
 
 class AjaxOauthClientController extends Controller
 {
@@ -52,9 +53,9 @@ class AjaxOauthClientController extends Controller
 		$aResult = [];
 		$aResult['status'] = 'error';
 		$aURL = parse_url($sRedirectUrl);
+		$aQuery = [];
 		if (isset($aURL['query'])) {
 			$sRedirectUrlQuery = $aURL['query'];
-			$aQuery = [];
 			parse_str($sRedirectUrlQuery, $aQuery);
 			if (isset($aQuery['error'])) {
 				$aResult['status'] = 'error';
@@ -84,7 +85,7 @@ class AjaxOauthClientController extends Controller
 					$sId,
 					"$sClass:$sId:TokenCreated",
 					$bIsCreation ? Dict::S('itop-oauth-client:Message:TokenCreated') : Dict::S('itop-oauth-client:Message:TokenRecreated'),
-					'ok',
+					WebPage::ENUM_SESSION_MESSAGE_SEVERITY_OK,
 					1,
 					true
 				);
@@ -101,11 +102,11 @@ class AjaxOauthClientController extends Controller
 					$sId,
 					"$sClass:$sId:TokenError",
 					$aResult['error_description'] ?? Dict::S('itop-oauth-client:Message:TokenError'),
-					'error',
+					WebPage::ENUM_SESSION_MESSAGE_SEVERITY_ERROR,
 					1,
 					true
 				);
-				IssueLog::Error("Token creation failed for $sClass:$sId", null, $aResult);
+				IssueLog::Error("Token creation failed for $sClass:$sId", null, empty($aQuery) ? $aResult : $aQuery);
 				break;
 		}