if a user is activated, deactivated by the module, and reactivated by an admin, reset their expiration period

Bumping the version so I can make a fork.

Also pushed a fix for the Drupal 7 version.

Maybe? A bit of a false start but in theory now sorted.

Updated the patch as it no longer applied with yesterday's release of 8.x-1.x

Adding a static patch file version against 8.x-1.1

Hi,

By when we can expect this change mereged to 2.x and a new release or if this is an expected behaviour and not a bug so good to use patch instead.

Thanks!!

*

Hi sahil.sharma@io-media.com I'll add this to the plan for the next release. Thanks! The patch looks ok to me, so feel free to use it until then.

The PHPUnit test introduced in this MR does not appear to adequately test this functionality.

I say this because the https://git.drupalcode.org/project/user_expire/-/jobs/5542470 test passed with or without the fix. Running the "Test Only Changes" test should fail but it does not.

I've added test for the changes please review

I've tested this, and it appears to work as expected.

I don't think the proposed solution is the best one. I can imagine that updating the LastAccess value for a user can be problematic in some scenarios. This way, we completely lose information that a particular user has never logged in to our system.

Thank you for your comment @rafal.sereda, should we also check if the user has ever logged in before setting the value?

Possibly like this?

/**
 * Implements hook_ENTITY_TYPE_presave() for user entities.
 *
 * If the account was blocked but is now active, update the expiry so it is
 * not re-blocked by the next cron run, but only if the user has logged in before.
 */
function user_expire_user_presave(User $account) {
  $original = $account->getOriginal();
  if (
    $original &&
    $original->isBlocked() &&
    $account->isActive() &&
    $account->getLastAccessedTime() > 0
  ) {
    $account->setLastAccessTime(\Drupal::time()->getRequestTime());
  }
}

If you agree, we can open a new issue, and add it to the release plan for the next bugfix release #3536705: [Meta] Release Plan for User Expire Patch Release 2.1.2 (bugfix)