tokenExpired condition wrong for PasswordOAuth2AuthorizedClientProvider

[janzyka]

Summary

Condition to check whether token is about to expire is wrong in PasswordOAuth2AuthorizedClientProvider

Actual Behavior

When token will expire in skew the client won't be re-authorized

Expected Behavior

Token will be attempted to reauthorize if only skew time is left for token to expire

Configuration

There is plus/minus mistake

private boolean hasTokenExpired(AbstractOAuth2Token token) {
        return token.getExpiresAt().isBefore(Instant.now(this.clock).minus(this.clockSkew));
    }

Should become

private boolean hasTokenExpired(AbstractOAuth2Token token) {
        return token.getExpiresAt().isBefore(Instant.now(this.clock).plus(this.clockSkew));
    }

Version

5.2

Sample

[rwinch]

Thanks for the report. I believe this is a duplicate of gh-7511 which has been fixed in master via 1c53a78 Can you confirm @janzyka ?

cc @jgrandja

[janzyka]

Oh crap, sorry to add extra work. It's indeed a duplicate.

[janzyka]

@rwinch: maybe not ideal place to ask, but what is your position on the fact that all the classes around that functionality are final? I had to copy paste few classes already just for the sake of fixing small issues like this or tweak the functionality to fit my special use-case.