Refactoring the OAuth2 client code filter code, adapting it to OIDC