Commit 62249551 authored by Balint Pekker's avatar Balint Pekker
Browse files

Issue #3289642: Drupal 10 compatibility, applied rector patch

parent a0622c1d

simple_oauth.api.php

+4 −2
Original line number Diff line number Diff line 
<?php



use Drupal\simple_oauth\Entities\AccessTokenEntity;

use Drupal\user\Entity\User;

/**

 * @file

 * Hooks specific to the Simple OAuth module.
@@ -21,9 +23,9 @@ use Drupal\user\UserInterface; 
 *

 * @see \Drupal\simple_oauth\Entities\AccessTokenEntity::convertToJWT()

 */

function hook_simple_oauth_private_claims_alter(&$private_claims, \Drupal\simple_oauth\Entities\AccessTokenEntity $access_token_entity) {

function hook_simple_oauth_private_claims_alter(&$private_claims, AccessTokenEntity $access_token_entity) {

  $user_id = $access_token_entity->getUserIdentifier();

  $user = \Drupal\user\Entity\User::load($user_id);

  $user = User::load($user_id);

  $private_claims = [

    'mail' => $user->getEmail(),

    'username' => $user->getAccountName(),

simple_oauth.install

+1 −1
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ function simple_oauth_update_8403() { 
function simple_oauth_update_8404() {

  $use_implicit = \Drupal::config('simple_oauth_extras.settings')->get('use_implicit');

  if ($use_implicit === NULL) {

    $config_path = drupal_get_path('module', 'simple_oauth') . '/config/install';

    $config_path = \Drupal::service('extension.list.module')->getPath('simple_oauth') . '/config/install';

    // Because of custom config_path, we don't call service here.

    $source = new FileStorage($config_path);

    $config_default = $source->read('simple_oauth.settings');

src/Authentication/TokenAuthUser.php

+2 −2
Original line number Diff line number Diff line
@@ -314,7 +314,7 @@ class TokenAuthUser implements TokenAuthUserInterface { 
   * {@inheritdoc}

   */

  public function urlInfo($rel = 'canonical', array $options = []) {

    return $this->subject->urlInfo($rel, $options);

    return $this->subject->toUrl($rel, $options);

  }



  /**
@@ -328,7 +328,7 @@ class TokenAuthUser implements TokenAuthUserInterface { 
   * {@inheritdoc}

   */

  public function link($text = NULL, $rel = 'canonical', array $options = []) {

    return $this->subject->link($text, $rel, $options);

    return $this->subject->toLink($text, $rel, $options)->toString();

  }



  /**

tests/src/Functional/AuthCodeFunctionalTest.php

+4 −0
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ 


namespace Drupal\Tests\simple_oauth\Functional;



use function GuzzleHttp\Psr7\parse_query;

use Drupal\Core\Url;

use Drupal\user\Entity\Role;

use Drupal\user\RoleInterface;
@@ -102,6 +103,9 @@ class AuthCodeFunctionalTest extends TokenBearerFunctionalTestBase { 
      'query' => $valid_params,

    ]);

    $this->assertGrantForm();

    $this->drupalGet($this->authorizeUrl, [

      'query' => $valid_params,

    ]);



    // 3. Grant access by submitting the form and get the code back.

    $this->submitForm([], 'Grant');

tests/src/Functional/ImplicitFunctionalTest.php

+3 −0
Original line number Diff line number Diff line
@@ -83,6 +83,9 @@ class ImplicitFunctionalTest extends TokenBearerFunctionalTestBase { 
    $assert_session->titleEquals('Grant Access to Client | Drupal');

    $assert_session->buttonExists('Grant');

    $assert_session->responseContains('Permissions');

    $this->drupalGet($this->authorizeUrl, [

      'query' => $valid_params,

    ]);



    // 3. Grant access by submitting the form and get the token back.

    $this->submitForm([], 'Grant');