ClientRepository validateClient remaining method

Same problem in v4.3

possibly fixed it - can this please be verified??

simple_oauth-8.x-4.3/src/Repositories/ClientRepository.php

line 7, replace:
use League\OAuth2\Server\Grant\ClientCredentialsGrant;

line 10, REPLACE class ClientRepository implements ClientRepositoryInterface WITH:
class ClientRepository extends ClientCredentialsGrant {

no more error here, but is this correct??

Now I get consumer error, Field roles not found...

I think what we actually want to do (based on the docs here: https://oauth2.thephpleague.com/client-repository-interface/) is move some of the validation you see in the getClientEntity() method into the validateClient() method.

For example (btw, this is untested code):

/**
   * {@inheritdoc}
   */
  public function getClientEntity($clientIdentifier, $grantType = NULL, $clientSecret = NULL, $mustValidateSecret = TRUE) {
    $clientDrupalEntities = $this->entityTypeManager
      ->getStorage('consumer')
      ->loadByProperties(['uuid' => $clientIdentifier]);

    // Check if the client is registered.
    if (empty($clientDrupalEntities)) {
      return NULL;
    }

    if ($mustValidateSecret &&
      $this->validateClient($clientIdentifier, $clientSecret, $grantType) === FALSE
    ) {
      return NULL;
    }

    $clientDrupalEntity = reset($clientDrupalEntities);

    return new ClientEntity($clientDrupalEntity);
  }

  /**
   * @{inheritdoc}
   */
  public function validateClient($clientIdentifier, $clientSecret, $grantType) {
    $clientDrupalEntities = $this->entityTypeManager
      ->getStorage('consumer')
      ->loadByProperties(['uuid' => $clientIdentifier]);

    /** @var \Drupal\consumers\Entity\Consumer $client_drupal_entity */
    $clientDrupalEntity = reset($clientDrupalEntities);
    $secret = $clientDrupalEntity->get('secret')->value;

    // @todo check the grant type?

    if ($clientDrupalEntity->get('confidential')->value) {
      return $this->passwordChecker->check($clientSecret, $secret);
    } 

    return FALSE;
  }

In the original getClientEntity() method there is a validation of the secret. I think we just have to move that logic to its own method and call it.

Looking into this a bit further, it looks like the validateClient() method was introduced in league/oauth2-server v8.0. There is another issue for upgrading to 8.0: https://www.drupal.org/project/simple_oauth/issues/3083411

Related to dependency drift, marking duplicate and relating main issue.