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] );