From 9077f7ba37947cefb97a64711b5fc133a87cdd6c Mon Sep 17 00:00:00 2001
From: Eric Espie <eric.espie@combodo.com>
Date: Fri, 2 Dec 2022 11:17:01 +0100
Subject: [PATCH] =?UTF-8?q?N=C2=B05430=20-=20OAuth=20authentication=20:=20?=
 =?UTF-8?q?customize=20redirect=20landing=20URL=20-=20remove=20unnecessary?=
 =?UTF-8?q?=20parameter=20to=20JS=20function=20OAuthConnect?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 datamodels/2.x/itop-oauth-client/assets/js/oauth_connect.js   | 3 +--
 .../2.x/itop-oauth-client/src/Service/PopupMenuExtension.php  | 4 +---
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/datamodels/2.x/itop-oauth-client/assets/js/oauth_connect.js b/datamodels/2.x/itop-oauth-client/assets/js/oauth_connect.js
index 1ce571112..4cc1c85d1 100644
--- a/datamodels/2.x/itop-oauth-client/assets/js/oauth_connect.js
+++ b/datamodels/2.x/itop-oauth-client/assets/js/oauth_connect.js
@@ -77,11 +77,10 @@ const oOpenSignInWindow = function (url, name) {
 };
 
 
-const OAuthConnect = function(sClass, sId, sAjaxUri, sReturnUri) {
+const OAuthConnect = function(sClass, sId, sAjaxUri) {
 	sOAuthAjaxURI = sAjaxUri;
 	sOAuthObjClass = sClass;
 	sOAuthObjKey = sId;
-	sOAuthReturnURI = sReturnUri;
 
 	$.post(
 		sOAuthAjaxURI,
diff --git a/datamodels/2.x/itop-oauth-client/src/Service/PopupMenuExtension.php b/datamodels/2.x/itop-oauth-client/src/Service/PopupMenuExtension.php
index 31189de73..3ed993ad4 100644
--- a/datamodels/2.x/itop-oauth-client/src/Service/PopupMenuExtension.php
+++ b/datamodels/2.x/itop-oauth-client/src/Service/PopupMenuExtension.php
@@ -7,7 +7,6 @@
 namespace Combodo\iTop\OAuthClient\Service;
 
 use ApplicationContext;
-use Combodo\iTop\Core\Authentication\Client\OAuth\OAuthClientProviderFactory;
 use Dict;
 use iPopupMenuExtension;
 use JSPopupMenuItem;
@@ -42,11 +41,10 @@ class PopupMenuExtension implements \iPopupMenuExtension
 					$sAjaxUri = utils::GetAbsoluteUrlModulePage(static::MODULE_CODE, 'ajax.php');
 					// Add a new menu item that triggers a custom JS function defined in our own javascript file: js/sample.js
 					$sJSFileUrl = utils::GetAbsoluteUrlModulesRoot().static::MODULE_CODE.'/assets/js/oauth_connect.js';
-					$sRedirectUri = OAuthClientProviderFactory::GetRedirectUri();
 					$aResult[] = new JSPopupMenuItem(
 						$sMenu.' from '.$sObjClass,
 						Dict::S($sMenu),
-						"OAuthConnect('$sClass', $sId, '$sAjaxUri', '$sRedirectUri')",
+						"OAuthConnect('$sClass', $sId, '$sAjaxUri')",
 						[$sJSFileUrl]
 					);