Merge pull request #33 from City-of-Helsinki/UHF-9857

UHF-9857: Removed overridden ::authorize() method

helfi_tunnistamo.install

@@ -5,7 +5,7 @@
  * Contains installation tasks for 'helfi_tunnistamo' module.
  */
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 use Drupal\user\Entity\User;
 

helfi_tunnistamo.module

@@ -5,7 +5,7 @@
  * Contains alterations for the Hel.fi tunnistamo module.
  */
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 use Drupal\Component\Uuid\Uuid;
 use Drupal\Core\Form\FormStateInterface;

src/Event/RedirectUrlEvent.php

@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace Drupal\helfi_tunnistamo\Event;
 

src/EventSubscriber/HttpExceptionSubscriber.php

@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace Drupal\helfi_tunnistamo\EventSubscriber;
 

src/Plugin/DebugDataItem/Tunnistamo.php

@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace Drupal\helfi_tunnistamo\Plugin\DebugDataItem;
 

src/Plugin/OpenIDConnectClient/Tunnistamo.php

@@ -5,7 +5,6 @@
 namespace Drupal\helfi_tunnistamo\Plugin\OpenIDConnectClient;
 
 use Drupal\Core\Form\FormStateInterface;
-use Drupal\Core\Routing\TrustedRedirectResponse;
 use Drupal\Core\Session\AccountInterface;
 use Drupal\Core\Url;
 use Drupal\helfi_tunnistamo\Event\RedirectUrlEvent;
@@ -15,7 +14,6 @@
 use Psr\Log\LoggerInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
-use Symfony\Component\HttpFoundation\Response;
 
 /**
  * Implements OpenID Connect Client plugin for Tunnistamo.
@@ -113,34 +111,6 @@ protected function getRedirectUrl(
     return $urlEvent->getRedirectUrl();
   }
 
-  /**
-   * {@inheritdoc}
-   */
-  public function authorize(string $scope = 'openid email', array $additional_params = []): Response {
-    // @todo Remove this override once https://www.drupal.org/project/openid_connect/issues/3317308
-    // is merged.
-    $redirect_uri = $this->getRedirectUrl()->toString(TRUE);
-    $url_options = $this->getUrlOptions($scope, $redirect_uri);
-
-    if (!empty($additional_params)) {
-      $url_options['query'] = array_merge($url_options['query'], $additional_params);
-    }
-
-    $endpoints = $this->getEndpoints();
-    // Clear _GET['destination'] because we need to override it.
-    $this->requestStack->getCurrentRequest()->query->remove('destination');
-    $authorization_endpoint = Url::fromUri($endpoints['authorization'], $url_options)->toString(TRUE);
-
-    $this->loggerFactory->get('openid_connect_' . $this->pluginId)->debug('Send authorize request to @url', ['@url' => $authorization_endpoint->getGeneratedUrl()]);
-    $response = new TrustedRedirectResponse($authorization_endpoint->getGeneratedUrl());
-    // We can't cache the response, since this will prevent the state to be
-    // added to the session. The kill switch will prevent the page getting
-    // cached for anonymous users when page cache is active.
-    $this->pageCacheKillSwitch->trigger();
-
-    return $response;
-  }
-
   /**
    * {@inheritdoc}
    */

tests/src/Functional/LoginFormTest.php

@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace Drupal\Tests\helfi_tunnistamo\Functional;
 

tests/src/Kernel/HttpExceptionSubscriberTest.php

@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace Drupal\Tests\helfi_tunnistamo\Kernel;
 

tests/src/Kernel/KernelTestBase.php

@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace Drupal\Tests\helfi_tunnistamo\Kernel;
 

tests/src/Kernel/RedirectUrlEventTest.php

@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace Drupal\Tests\helfi_tunnistamo\Kernel;
 

tests/src/Kernel/RoleMapTest.php

@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace Drupal\Tests\helfi_tunnistamo\Kernel;
 

tests/src/Kernel/TunnistamoClientTest.php

@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace Drupal\Tests\helfi_tunnistamo\Kernel;
 

tests/src/Kernel/TunnistamoDebugDataPluginTest.php

@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace Drupal\Tests\helfi_tunnistamo\Kernel;
 

tests/src/Kernel/UserInfoAlterTest.php

@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace Drupal\Tests\helfi_tunnistamo\Kernel;