Skip to content
Snippets Groups Projects

Feature upgrade to9 lts

Merged Feature upgrade to9 lts
feature_UpgradeTo9LTS into master
Merged Kevin Ditscheid requested to merge feature_UpgradeTo9LTS into master
Compare
and
Show latest version
5 files
+ 28
− 14
Compare changes
  • Side-by-side
  • Inline
Files
5
Classes/Controller/AccountController.php
+ 20
− 6
@@ -766,7 +766,11 @@ class AccountController extends ActionController {
$client->setClientSecret($appSecret);
$client->addScope(Google_Service_Plus::USERINFO_EMAIL);
$client->addScope(Google_Service_Plus::USERINFO_PROFILE);
$client->setRedirectUri($this->request->getBaseUri() . 'index.php?type=' . $callbackPageTypeNum);
$uri = $GLOBALS['TSFE']->cObj->typoLink_URL([
'parameter' => 't3://page?uid=' . $GLOBALS['TSFE']->id . '&type=' . $callbackPageTypeNum,
'forceAbsoluteUrl' => TRUE
]);
$client->setRedirectUri($uri);
$authenticationUrl = $client->createAuthUrl();
HttpUtility::redirect($authenticationUrl);
@@ -783,8 +787,12 @@ class AccountController extends ActionController {
]
);
$helper = $client->getRedirectLoginHelper();
$uri = $GLOBALS['TSFE']->cObj->typoLink_URL([
'parameter' => 't3://page?uid=' . $GLOBALS['TSFE']->id . '&type=' . $callbackPageTypeNum,
'forceAbsoluteUrl' => TRUE
]);
$authenticationUrl = $helper->getLoginUrl(
$this->request->getBaseUri() . 'index.php?type=' . $callbackPageTypeNum, ['email']
$uri, ['email']
);
HttpUtility::redirect($authenticationUrl);
break;
@@ -825,9 +833,11 @@ class AccountController extends ActionController {
$client = new Google_Client();
$client->setClientId($appId);
$client->setClientSecret($appSecret);
$client->setRedirectUri(
$this->request->getBaseUri() . 'index.php?type=' . $callbackPageTypeNum
);
$uri = $GLOBALS['TSFE']->cObj->typoLink_URL([
'parameter' => 't3://page?uid=' . $GLOBALS['TSFE']->id . '&type=' . $callbackPageTypeNum,
'forceAbsoluteUrl' => TRUE
]);
$client->setRedirectUri($uri);
$client->addScope(Google_Service_Plus::USERINFO_EMAIL);
$client->addScope(Google_Service_Plus::USERINFO_PROFILE);
$client->authenticate($_GET['code']);
@@ -889,8 +899,12 @@ class AccountController extends ActionController {
]
);
$helper = $client->getRedirectLoginHelper();
$uri = $GLOBALS['TSFE']->cObj->typoLink_URL([
'parameter' => 't3://page?uid=' . $GLOBALS['TSFE']->id . '&type=' . $callbackPageTypeNum,
'forceAbsoluteUrl' => TRUE
]);
$token = $helper->getAccessToken(
$this->request->getBaseUri() . 'index.php?type=' . $callbackPageTypeNum
$uri
);
if ($token) {
$oAuth2Client = $client->getOAuth2Client();