Skip to content
Snippets Groups Projects
Commit 5f69efed authored by David Pashaev's avatar David Pashaev
Browse files

Issue #3119946 by gvso, davps: Pass renderer service to controller constructor

parent 9ca218e4
No related branches found
No related tags found
No related merge requests found
......@@ -3,6 +3,7 @@
namespace Drupal\social_auth_vk\Controller;
use Drupal\Core\Messenger\MessengerInterface;
use Drupal\Core\Render\RendererInterface;
use Drupal\social_api\Plugin\NetworkManager;
use Drupal\social_auth\Controller\OAuth2ControllerBase;
use Drupal\social_auth\SocialAuthDataHandler;
......@@ -31,15 +32,20 @@ class VkontakteAuthController extends OAuth2ControllerBase {
* Used to access GET parameters.
* @param \Drupal\social_auth\SocialAuthDataHandler $data_handler
* The Social Auth data handler.
* @param \Drupal\Core\Render\RendererInterface $renderer
* Used to handle metadata for redirection to authentication URL.
*/
public function __construct(MessengerInterface $messenger,
NetworkManager $network_manager,
UserAuthenticator $user_authenticator,
VkontakteAuthManager $vk_manager,
RequestStack $request,
SocialAuthDataHandler $data_handler) {
SocialAuthDataHandler $data_handler,
RendererInterface $renderer) {
parent::__construct('Social Auth Vkontakte', 'social_auth_vk', $messenger, $network_manager, $user_authenticator, $vk_manager, $request, $data_handler);
parent::__construct('Social Auth Vkontakte', 'social_auth_vk', $messenger,
$network_manager, $user_authenticator, $vk_manager,
$request, $data_handler, $renderer);
}
/**
......@@ -52,7 +58,8 @@ class VkontakteAuthController extends OAuth2ControllerBase {
$container->get('social_auth.user_authenticator'),
$container->get('social_auth_vk.manager'),
$container->get('request_stack'),
$container->get('social_auth.data_handler')
$container->get('social_auth.data_handler'),
$container->get('renderer')
);
}
......@@ -69,14 +76,19 @@ class VkontakteAuthController extends OAuth2ControllerBase {
return $this->redirect('user.login');
}
/* @var array|null $profile */
/** @var array|null $profile */
$profile = $this->processCallback();
// If authentication was successful.
if ($profile !== NULL) {
$full_name = $profile['first_name'] . ' ' . $profile['last_name'];
return $this->userAuthenticator->authenticateUser($full_name, $profile['email'], $profile['id'], $this->providerManager->getAccessToken(), $profile['photo_max_orig'], NULL);
return $this->userAuthenticator->authenticateUser($full_name,
$profile['email'],
$profile['id'],
$this->providerManager->getAccessToken(),
$profile['photo_max_orig'],
NULL);
}
return $this->redirect('user.login');
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment