Merge pull request #11724 from ptibogxiv/patch-228

Fix stripelive_oauthcallback.php
This commit is contained in:
Laurent Destailleur 2019-08-26 16:34:40 +02:00 committed by GitHub
commit 2b8c57b714
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -17,7 +17,7 @@
*/ */
/** /**
* \file htdocs/core/modules/oauth/stripe_oauthcallback.php * \file htdocs/core/modules/oauth/stripelive_oauthcallback.php
* \ingroup oauth * \ingroup oauth
* \brief Page to get oauth callback * \brief Page to get oauth callback
*/ */
@ -45,7 +45,7 @@ $backtourl = GETPOST('backtourl', 'alpha');
$uriFactory = new \OAuth\Common\Http\Uri\UriFactory(); $uriFactory = new \OAuth\Common\Http\Uri\UriFactory();
//$currentUri = $uriFactory->createFromSuperGlobalArray($_SERVER); //$currentUri = $uriFactory->createFromSuperGlobalArray($_SERVER);
//$currentUri->setQuery(''); //$currentUri->setQuery('');
$currentUri = $uriFactory->createFromAbsolute($urlwithroot.'/core/modules/oauth/stripe_oauthcallback.php'); $currentUri = $uriFactory->createFromAbsolute($urlwithroot.'/core/modules/oauth/stripelive_oauthcallback.php');
/** /**
@ -65,7 +65,7 @@ $storage = new DoliStorage($db, $conf);
// Setup the credentials for the requests // Setup the credentials for the requests
$credentials = new Credentials( $credentials = new Credentials(
$conf->global->OAUTH_STRIPE_TEST_ID, $conf->global->OAUTH_STRIPE_LIVE_ID,
$conf->global->STRIPE_LIVE_SECRET_KEY, $conf->global->STRIPE_LIVE_SECRET_KEY,
$currentUri->getAbsoluteUri() $currentUri->getAbsoluteUri()
); );