Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-09 19:18:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix error management at wrong place

Browse Source
This commit is contained in:
Laurent Destailleur
2017-11-27 13:45:59 +01:00
parent cf274a7e3f
commit 43c60ec224
2 changed files with 36 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
htdocs/core/modules/oauth/github_oauthcallback.php
View File

@@ -94,18 +94,22 @@ $langs->load("oauth");
*/ */
if ($action == 'delete') if ($action == 'delete')
{ {
$storage->clearToken('GitHub'); $storage->clearToken('GitHub');
setEventMessages($langs->trans('TokenDeleted'), null, 'mesgs'); setEventMessages($langs->trans('TokenDeleted'), null, 'mesgs');
header('Location: ' . $backtourl); header('Location: ' . $backtourl);
exit(); exit();
} }
if (! empty($_GET['code'])) // We are coming from oauth provider page if (! empty($_GET['code'])) // We are coming from oauth provider page
{ {
// We should have
//$_GET=array('code' => string 'aaaaaaaaaaaaaa' (length=20), 'state' => string 'user,public_repo' (length=16))
dol_syslog("We are coming fr mthe oauth provider page");
//llxHeader('',$langs->trans("OAuthSetup")); //llxHeader('',$langs->trans("OAuthSetup"));
//$linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>'; //$linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
@@ -121,29 +125,29 @@ if (! empty($_GET['code'])) // We are coming from oauth provider page
//var_dump($_GET['code']); //var_dump($_GET['code']);
//var_dump($state); //var_dump($state);
//var_dump($apiService); // OAuth\OAuth2\Service\GitHub //var_dump($apiService); // OAuth\OAuth2\Service\GitHub
//$token = $apiService->requestAccessToken($_GET['code'], $state); //$token = $apiService->requestAccessToken($_GET['code'], $state);
$token = $apiService->requestAccessToken($_GET['code']); $token = $apiService->requestAccessToken($_GET['code']);
// Github is a service that does not need state yo be stored. // Github is a service that does not need state to be stored.
// Into constructor of GitHub, the call // Into constructor of GitHub, the call
// parent::__construct($credentials, $httpClient, $storage, $scopes, $baseApiUri) // parent::__construct($credentials, $httpClient, $storage, $scopes, $baseApiUri)
// has not the ending parameter to true like the Google class constructor. // has not the ending parameter to true like the Google class constructor.
setEventMessages($langs->trans('NewTokenStored'), null, 'mesgs'); // Stored into object managed by class DoliStorage so into table oauth_token setEventMessages($langs->trans('NewTokenStored'), null, 'mesgs'); // Stored into object managed by class DoliStorage so into table oauth_token
$backtourl = $_SESSION["backtourlsavedbeforeoauthjump"];
unset($_SESSION["backtourlsavedbeforeoauthjump"]);
header('Location: ' . $backtourl);
exit();
} catch (Exception $e) { } catch (Exception $e) {
print $e->getMessage(); print $e->getMessage();
} }
$backtourl = $_SESSION["backtourlsavedbeforeoauthjump"];
unset($_SESSION["backtourlsavedbeforeoauthjump"]);
header('Location: ' . $backtourl);
exit();
} }
else // If entry on page with no parameter, we arrive here else // If entry on page with no parameter, we arrive here
{ {
$_SESSION["backtourlsavedbeforeoauthjump"]=$backtourl; $_SESSION["backtourlsavedbeforeoauthjump"]=$backtourl;
// This may create record into oauth_state before the header redirect. // This may create record into oauth_state before the header redirect.
// Creation of record with state in this tables depend on the Provider used (see its constructor). // Creation of record with state in this tables depend on the Provider used (see its constructor).
if (GETPOST('state')) if (GETPOST('state'))
@@ -154,7 +158,7 @@ else // If entry on page with no parameter, we arrive here
{ {
$url = $apiService->getAuthorizationUri(); // Parameter state will be randomly generated $url = $apiService->getAuthorizationUri(); // Parameter state will be randomly generated
} }
// we go on oauth provider authorization page // we go on oauth provider authorization page
header('Location: ' . $url); header('Location: ' . $url);
exit(); exit();

31
htdocs/core/modules/oauth/google_oauthcallback.php
View File

@@ -97,19 +97,20 @@ $langs->load("oauth");
*/ */
if ($action == 'delete') if ($action == 'delete')
{ {
$storage->clearToken('Google'); $storage->clearToken('Google');
setEventMessages($langs->trans('TokenDeleted'), null, 'mesgs'); setEventMessages($langs->trans('TokenDeleted'), null, 'mesgs');
header('Location: ' . $backtourl); header('Location: ' . $backtourl);
exit(); exit();
} }
if (! empty($_GET['code'])) // We are coming from oauth provider page if (! empty($_GET['code'])) // We are coming from oauth provider page
{ {
//llxHeader('',$langs->trans("OAuthSetup")); dol_syslog("We are coming fr mthe oauth provider page");
//llxHeader('',$langs->trans("OAuthSetup"));
//$linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>'; //$linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
//print load_fiche_titre($langs->trans("OAuthSetup"),$linkback,'title_setup'); //print load_fiche_titre($langs->trans("OAuthSetup"),$linkback,'title_setup');
@@ -124,24 +125,24 @@ if (! empty($_GET['code'])) // We are coming from oauth provider page
//var_dump($_GET['code']); //var_dump($_GET['code']);
//var_dump($state); //var_dump($state);
//var_dump($apiService); // OAuth\OAuth2\Service\Google //var_dump($apiService); // OAuth\OAuth2\Service\Google
$token = $apiService->requestAccessToken($_GET['code'], $state); $token = $apiService->requestAccessToken($_GET['code'], $state);
setEventMessages($langs->trans('NewTokenStored'), null, 'mesgs'); // Stored into object managed by class DoliStorage so into table oauth_token setEventMessages($langs->trans('NewTokenStored'), null, 'mesgs'); // Stored into object managed by class DoliStorage so into table oauth_token
$backtourl = $_SESSION["backtourlsavedbeforeoauthjump"];
unset($_SESSION["backtourlsavedbeforeoauthjump"]);
header('Location: ' . $backtourl);
exit();
} catch (Exception $e) { } catch (Exception $e) {
print $e->getMessage(); print $e->getMessage();
} }
$backtourl = $_SESSION["backtourlsavedbeforeoauthjump"];
unset($_SESSION["backtourlsavedbeforeoauthjump"]);
header('Location: ' . $backtourl);
exit();
} }
else // If entry on page with no parameter, we arrive here else // If entry on page with no parameter, we arrive here
{ {
$_SESSION["backtourlsavedbeforeoauthjump"]=$backtourl; $_SESSION["backtourlsavedbeforeoauthjump"]=$backtourl;
// This may create record into oauth_state before the header redirect. // This may create record into oauth_state before the header redirect.
// Creation of record with state in this tables depend on the Provider used (see its constructor). // Creation of record with state in this tables depend on the Provider used (see its constructor).
if (GETPOST('state')) if (GETPOST('state'))
@@ -152,7 +153,7 @@ else // If entry on page with no parameter, we arrive here
{ {
$url = $apiService->getAuthorizationUri(); // Parameter state will be randomly generated $url = $apiService->getAuthorizationUri(); // Parameter state will be randomly generated
} }
// we go on oauth provider authorization page // we go on oauth provider authorization page
header('Location: ' . $url); header('Location: ' . $url);
exit(); exit();