Commit 53afaac0 authored by Balint Pekker's avatar Balint Pekker
Browse files

Issue #3289642: Fixed drupal-check issues and tests

parent 62249551

simple_oauth.info.yml

+1 −1
Original line number Diff line number Diff line 
name: Simple OAuth & OpenID Connect

type: module

description: 'The OAuth 2.0 Authorization Framework'

core_version_requirement: '^8 || ^9'

core_version_requirement: '^8 || ^9 || ^10'

package: Authentication

configure: oauth2_token.settings

dependencies:

simple_oauth.install

+1 −0
Original line number Diff line number Diff line
@@ -94,6 +94,7 @@ function simple_oauth_update_8404() { 
  ];

  $entity_definition_update_manager = \Drupal::entityDefinitionUpdateManager();

  foreach ($field_names as $field_name) {

    /** @var \Drupal\Core\Field\BaseFieldDefinition $field_definition */

    $field_definition = $entity_definition_update_manager->getFieldStorageDefinition($field_name, 'consumer');

    // If simple_oauth_extras was installed, we need at least to update field provider.

    if ($field_definition && $deleted) {

simple_oauth.module

+4 −2
Original line number Diff line number Diff line
@@ -155,15 +155,17 @@ function simple_oauth_form_consumer_form_alter(array &$form, FormStateInterface 
  // Add a custom submit behavior.

  $form['#entity_builders'][] = 'simple_oauth_form_consumer_form_submit';



  /** @var \Drupal\Core\Entity\EntityTypeManagerInterface $entity_type_manager */

  $entity_type_manager = \Drupal::service('entity_type.manager');

  // Remove automatic roles and administrator roles.

  unset($form['roles']['widget']['#options'][RoleInterface::ANONYMOUS_ID]);

  unset($form['roles']['widget']['#options'][RoleInterface::AUTHENTICATED_ID]);

  // Get the admin role.

  $admin_roles = $entity_type_manager->getStorage('user_role')

  $admin_roles = $entity_type_manager

    ->getStorage('user_role')

    ->getQuery()

    ->accessCheck()

    ->condition('is_admin', TRUE)

    ->accessCheck()

    ->execute();

  $default_value = reset($admin_roles);

  unset($form['roles']['widget']['#options'][$default_value]);

simple_oauth_extras/simple_oauth_extras.info.yml

+1 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ name: Simple OAuth Extras (Deprecated) 
type: module

description: Deprecated. All functionality has been moved to simple_oauth.

core: 8.x

core_version_requirement: '^8 || ^9'

core_version_requirement: '^8 || ^9 || ^10'

package: Authentication

dependencies:

  - simple_oauth:simple_oauth

src/Authentication/Provider/SimpleOauthAuthenticationProvider.php

+1 −0
Original line number Diff line number Diff line
@@ -88,6 +88,7 @@ class SimpleOauthAuthenticationProvider implements AuthenticationProviderInterfa 
    $tokens = $this->entityTypeManager->getStorage('oauth2_token')->loadByProperties([

      'value' => $auth_request->get('oauth_access_token_id'),

    ]);

    /** @var \Drupal\simple_oauth\Entity\Oauth2Token $token */

    $token = reset($tokens);



    $account = new TokenAuthUser($token);